Cleanup: Move files to ridljar
These files are now part of ridl.jar instead of jurt.jar,
so move them accordingly.
Follow-up cleanup for ae855bf481
Change-Id: I01df60d99f5296b6252b260f52160c3e62f4b8dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88007
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
@@ -13,7 +13,7 @@ odk_JAVAPACKAGES := com.sun.star.comp.helper \
|
||||
com.sun.star.lib.uno.helper \
|
||||
com.sun.star.lib.unoloader \
|
||||
com.sun.star.uno \
|
||||
$(SRCDIR)/jurt/com/sun/star/lib/util/UrlToFileMapper.java
|
||||
$(SRCDIR)/ridljar/com/sun/star/lib/util/UrlToFileMapper.java
|
||||
|
||||
$(eval $(call gb_CustomTarget_register_targets,odk/docs/java/ref,\
|
||||
javadoc_log.txt \
|
||||
|
||||
+54
-54
@@ -33,6 +33,51 @@ $(eval $(call gb_Jar_add_packagedirs,ridl,\
|
||||
))
|
||||
|
||||
$(eval $(call gb_Jar_add_sourcefiles,ridl,\
|
||||
ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \
|
||||
ridljar/com/sun/star/comp/connections/Acceptor \
|
||||
ridljar/com/sun/star/comp/connections/Connector \
|
||||
ridljar/com/sun/star/comp/connections/ConstantInstanceProvider \
|
||||
ridljar/com/sun/star/comp/connections/Implementation \
|
||||
ridljar/com/sun/star/comp/connections/PipedConnection \
|
||||
ridljar/com/sun/star/comp/loader/FactoryHelper \
|
||||
ridljar/com/sun/star/comp/loader/JavaLoader \
|
||||
ridljar/com/sun/star/comp/loader/JavaLoaderFactory \
|
||||
ridljar/com/sun/star/comp/loader/RegistrationClassFinder \
|
||||
ridljar/com/sun/star/comp/servicemanager/ServiceManager \
|
||||
ridljar/com/sun/star/comp/urlresolver/UrlResolver \
|
||||
ridljar/com/sun/star/lib/connections/pipe/PipeConnection \
|
||||
ridljar/com/sun/star/lib/connections/pipe/pipeAcceptor \
|
||||
ridljar/com/sun/star/lib/connections/pipe/pipeConnector \
|
||||
ridljar/com/sun/star/lib/connections/socket/ConnectionDescriptor \
|
||||
ridljar/com/sun/star/lib/connections/socket/SocketConnection \
|
||||
ridljar/com/sun/star/lib/connections/socket/socketAcceptor \
|
||||
ridljar/com/sun/star/lib/connections/socket/socketConnector \
|
||||
ridljar/com/sun/star/lib/uno/Proxy \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \
|
||||
ridljar/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \
|
||||
ridljar/com/sun/star/lib/uno/environments/java/java_environment \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/IProtocol \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/IReceiver \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/IThreadPool \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPool \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/Job \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/JobQueue \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/Message \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/NativeThreadPool \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/ThreadId \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \
|
||||
ridljar/com/sun/star/lib/uno/environments/remote/remote_environment \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/Cache \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/Marshal \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/PendingRequests \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/UrpMessage \
|
||||
ridljar/com/sun/star/lib/uno/protocols/urp/urp \
|
||||
ridljar/com/sun/star/lib/uno/typedesc/FieldDescription \
|
||||
ridljar/com/sun/star/lib/uno/typedesc/MemberDescriptionHelper \
|
||||
ridljar/com/sun/star/lib/uno/typedesc/MethodDescription \
|
||||
@@ -43,71 +88,26 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
|
||||
ridljar/com/sun/star/lib/uno/typeinfo/MethodTypeInfo \
|
||||
ridljar/com/sun/star/lib/uno/typeinfo/ParameterTypeInfo \
|
||||
ridljar/com/sun/star/lib/uno/typeinfo/TypeInfo \
|
||||
ridljar/com/sun/star/lib/util/AsynchronousFinalizer \
|
||||
ridljar/com/sun/star/lib/util/DisposeListener \
|
||||
ridljar/com/sun/star/lib/util/DisposeNotifier \
|
||||
ridljar/com/sun/star/lib/util/NativeLibraryLoader \
|
||||
ridljar/com/sun/star/lib/util/StringHelper \
|
||||
ridljar/com/sun/star/lib/util/UrlToFileMapper \
|
||||
ridljar/com/sun/star/lib/util/WeakMap \
|
||||
ridljar/com/sun/star/uno/Any \
|
||||
ridljar/com/sun/star/uno/AnyConverter \
|
||||
ridljar/com/sun/star/uno/Ascii \
|
||||
ridljar/com/sun/star/uno/AsciiString \
|
||||
ridljar/com/sun/star/uno/Enum \
|
||||
ridljar/com/sun/star/uno/IBridge \
|
||||
ridljar/com/sun/star/uno/IEnvironment \
|
||||
ridljar/com/sun/star/uno/IMapping \
|
||||
ridljar/com/sun/star/uno/IQueryInterface \
|
||||
ridljar/com/sun/star/uno/MappingException \
|
||||
ridljar/com/sun/star/uno/Type \
|
||||
ridljar/com/sun/star/uno/UnoRuntime \
|
||||
jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
|
||||
jurt/com/sun/star/comp/connections/Acceptor \
|
||||
jurt/com/sun/star/comp/connections/Connector \
|
||||
jurt/com/sun/star/comp/connections/ConstantInstanceProvider \
|
||||
jurt/com/sun/star/comp/connections/Implementation \
|
||||
jurt/com/sun/star/comp/connections/PipedConnection \
|
||||
jurt/com/sun/star/comp/loader/FactoryHelper \
|
||||
jurt/com/sun/star/comp/loader/JavaLoader \
|
||||
jurt/com/sun/star/comp/loader/JavaLoaderFactory \
|
||||
jurt/com/sun/star/comp/loader/RegistrationClassFinder \
|
||||
jurt/com/sun/star/comp/servicemanager/ServiceManager \
|
||||
jurt/com/sun/star/comp/urlresolver/UrlResolver \
|
||||
jurt/com/sun/star/lib/connections/pipe/PipeConnection \
|
||||
jurt/com/sun/star/lib/connections/pipe/pipeAcceptor \
|
||||
jurt/com/sun/star/lib/connections/pipe/pipeConnector \
|
||||
jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor \
|
||||
jurt/com/sun/star/lib/connections/socket/SocketConnection \
|
||||
jurt/com/sun/star/lib/connections/socket/socketAcceptor \
|
||||
jurt/com/sun/star/lib/connections/socket/socketConnector \
|
||||
jurt/com/sun/star/lib/uno/Proxy \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \
|
||||
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \
|
||||
jurt/com/sun/star/lib/uno/environments/java/java_environment \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/IProtocol \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/IReceiver \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/IThreadPool \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/Job \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/JobQueue \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/Message \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/ThreadId \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \
|
||||
jurt/com/sun/star/lib/uno/environments/remote/remote_environment \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/Cache \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/Marshal \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage \
|
||||
jurt/com/sun/star/lib/uno/protocols/urp/urp \
|
||||
jurt/com/sun/star/lib/util/AsynchronousFinalizer \
|
||||
jurt/com/sun/star/lib/util/NativeLibraryLoader \
|
||||
jurt/com/sun/star/lib/util/StringHelper \
|
||||
jurt/com/sun/star/lib/util/UrlToFileMapper \
|
||||
jurt/com/sun/star/uno/AnyConverter \
|
||||
jurt/com/sun/star/uno/Ascii \
|
||||
jurt/com/sun/star/uno/AsciiString \
|
||||
jurt/com/sun/star/uno/MappingException \
|
||||
jurt/com/sun/star/uno/WeakReference \
|
||||
ridljar/com/sun/star/uno/WeakReference \
|
||||
))
|
||||
|
||||
# vim:set noet sw=4 ts=4:
|
||||
|
||||
+1
@@ -150,3 +150,4 @@ public final class Acceptor implements XAcceptor {
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
||||
+2
@@ -32,6 +32,8 @@ import com.sun.star.lib.util.NativeLibraryLoader;
|
||||
* and is uses by the <code>PipeConnector</code> and the <code>PipeAcceptor</code>.
|
||||
* This class is not part of the provided <code>api</code>.
|
||||
*
|
||||
* The native implementation is in jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c
|
||||
*
|
||||
* @see com.sun.star.lib.connections.pipe.pipeAcceptor
|
||||
* @see com.sun.star.lib.connections.pipe.pipeConnector
|
||||
* @see com.sun.star.connection.XConnection
|
||||
Reference in New Issue
Block a user