56 files changed, 58 insertions, 55 deletions
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 9bc62e0887d2..f4562f092d50 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -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 \
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 9cb3bbd2aaa3..6fc4688f0eab 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -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:
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/ridljar/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 031e60d3f1dc..031e60d3f1dc 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/ridljar/com/sun/star/comp/bridgefactory/BridgeFactory.java
diff --git a/jurt/com/sun/star/comp/connections/Acceptor.java b/ridljar/com/sun/star/comp/connections/Acceptor.java
index 44d8ef3e34f1..996eaeb858d7 100644
--- a/jurt/com/sun/star/comp/connections/Acceptor.java
+++ b/ridljar/com/sun/star/comp/connections/Acceptor.java
@@ -150,3 +150,4 @@ public final class Acceptor implements XAcceptor {
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/jurt/com/sun/star/comp/connections/Connector.java b/ridljar/com/sun/star/comp/connections/Connector.java
index 6ffab9eea86b..6ffab9eea86b 100644
--- a/jurt/com/sun/star/comp/connections/Connector.java
+++ b/ridljar/com/sun/star/comp/connections/Connector.java
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/ridljar/com/sun/star/comp/connections/ConstantInstanceProvider.java
index 6c2fcb2d85ee..6c2fcb2d85ee 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/ridljar/com/sun/star/comp/connections/ConstantInstanceProvider.java
diff --git a/jurt/com/sun/star/comp/connections/Implementation.java b/ridljar/com/sun/star/comp/connections/Implementation.java
index 94cabe253a33..94cabe253a33 100644
--- a/jurt/com/sun/star/comp/connections/Implementation.java
+++ b/ridljar/com/sun/star/comp/connections/Implementation.java
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/ridljar/com/sun/star/comp/connections/PipedConnection.java
index 631cfae40ee0..631cfae40ee0 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/ridljar/com/sun/star/comp/connections/PipedConnection.java
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/ridljar/com/sun/star/comp/loader/FactoryHelper.java
index fe56f594f2bd..fe56f594f2bd 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/ridljar/com/sun/star/comp/loader/FactoryHelper.java
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/ridljar/com/sun/star/comp/loader/JavaLoader.java
index 8bc0ae228593..8bc0ae228593 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/ridljar/com/sun/star/comp/loader/JavaLoader.java
diff --git a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java b/ridljar/com/sun/star/comp/loader/JavaLoaderFactory.java
index edf4f7a3a4c7..edf4f7a3a4c7 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
+++ b/ridljar/com/sun/star/comp/loader/JavaLoaderFactory.java
diff --git a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java b/ridljar/com/sun/star/comp/loader/RegistrationClassFinder.java
index e7679da1670a..e7679da1670a 100644
--- a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java
+++ b/ridljar/com/sun/star/comp/loader/RegistrationClassFinder.java
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/ridljar/com/sun/star/comp/servicemanager/ServiceManager.java
index 574983f1e238..574983f1e238 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/ridljar/com/sun/star/comp/servicemanager/ServiceManager.java
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/ridljar/com/sun/star/comp/urlresolver/UrlResolver.java
index 7585dabf6d2f..7585dabf6d2f 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/ridljar/com/sun/star/comp/urlresolver/UrlResolver.java
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/ridljar/com/sun/star/lib/connections/pipe/PipeConnection.java
index 63baaaf2246c..b3a686f179b6 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/ridljar/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -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
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/ridljar/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index 983eb32659c0..983eb32659c0 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/ridljar/com/sun/star/lib/connections/pipe/pipeAcceptor.java
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java b/ridljar/com/sun/star/lib/connections/pipe/pipeConnector.java
index 192d350071bf..192d350071bf 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
+++ b/ridljar/com/sun/star/lib/connections/pipe/pipeConnector.java
diff --git a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java b/ridljar/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
index 5a88d41baf00..5a88d41baf00 100644
--- a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
+++ b/ridljar/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/ridljar/com/sun/star/lib/connections/socket/SocketConnection.java
index a906496f2c75..a906496f2c75 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/ridljar/com/sun/star/lib/connections/socket/SocketConnection.java
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/ridljar/com/sun/star/lib/connections/socket/socketAcceptor.java
index 4000a1d0a463..4000a1d0a463 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/ridljar/com/sun/star/lib/connections/socket/socketAcceptor.java
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/ridljar/com/sun/star/lib/connections/socket/socketConnector.java
index 484ffd135e92..484ffd135e92 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/ridljar/com/sun/star/lib/connections/socket/socketConnector.java
diff --git a/jurt/com/sun/star/lib/uno/Proxy.java b/ridljar/com/sun/star/lib/uno/Proxy.java
index 7d3612758fc5..7d3612758fc5 100644
--- a/jurt/com/sun/star/lib/uno/Proxy.java
+++ b/ridljar/com/sun/star/lib/uno/Proxy.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
index 0a724f059382..0a724f059382 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index 1b3848983554..1b3848983554 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
index d5246bf26c21..d5246bf26c21 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index 8d660e88cacd..8d660e88cacd 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index ac198f8fdd77..ac198f8fdd77 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/ridljar/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 392e031e3063..392e031e3063 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/ridljar/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/ridljar/com/sun/star/lib/uno/environments/java/java_environment.java
index 89e4b10880ca..89e4b10880ca 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/ridljar/com/sun/star/lib/uno/environments/java/java_environment.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java b/ridljar/com/sun/star/lib/uno/environments/remote/IProtocol.java
index c2ecbf9a09c2..c2ecbf9a09c2 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/IProtocol.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java b/ridljar/com/sun/star/lib/uno/environments/remote/IReceiver.java
index e39ae3d4d50c..e39ae3d4d50c 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/IReceiver.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/ridljar/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index 1de31ad04c4c..1de31ad04c4c 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/IThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index 332306be0e3d..332306be0e3d 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java b/ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
index 181a3e17e40a..181a3e17e40a 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/ridljar/com/sun/star/lib/uno/environments/remote/Job.java
index 8ec4492c4c01..8ec4492c4c01 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/Job.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/ridljar/com/sun/star/lib/uno/environments/remote/JobQueue.java
index b71525ba5dd8..b71525ba5dd8 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/JobQueue.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Message.java b/ridljar/com/sun/star/lib/uno/environments/remote/Message.java
index b34295ae33be..b34295ae33be 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Message.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/Message.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java b/ridljar/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
index f77bbb466d64..f77bbb466d64 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java b/ridljar/com/sun/star/lib/uno/environments/remote/ThreadId.java
index f8dacc78cc48..f8dacc78cc48 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/ThreadId.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java b/ridljar/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
index 2014f51674d6..2014f51674d6 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java b/ridljar/com/sun/star/lib/uno/environments/remote/remote_environment.java
index 09259c8cb0f5..09259c8cb0f5 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java
+++ b/ridljar/com/sun/star/lib/uno/environments/remote/remote_environment.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java b/ridljar/com/sun/star/lib/uno/protocols/urp/Cache.java
index 26c2d449d617..26c2d449d617 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/Cache.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/ridljar/com/sun/star/lib/uno/protocols/urp/Marshal.java
index 106a8736cb31..106a8736cb31 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/Marshal.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java b/ridljar/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
index 928cdcd63176..928cdcd63176 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index c16d19291356..c16d19291356 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java b/ridljar/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
index 34cdf7073902..34cdf7073902 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java b/ridljar/com/sun/star/lib/uno/protocols/urp/urp.java
index 0ce9d35be75f..0ce9d35be75f 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/urp.java
diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java b/ridljar/com/sun/star/lib/util/AsynchronousFinalizer.java
index 588b8fe388f6..588b8fe388f6 100644
--- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
+++ b/ridljar/com/sun/star/lib/util/AsynchronousFinalizer.java
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/ridljar/com/sun/star/lib/util/NativeLibraryLoader.java
index eb5c6af34e90..eb5c6af34e90 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/ridljar/com/sun/star/lib/util/NativeLibraryLoader.java
diff --git a/jurt/com/sun/star/lib/util/StringHelper.java b/ridljar/com/sun/star/lib/util/StringHelper.java
index de8b5253aaf4..de8b5253aaf4 100644
--- a/jurt/com/sun/star/lib/util/StringHelper.java
+++ b/ridljar/com/sun/star/lib/util/StringHelper.java
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/ridljar/com/sun/star/lib/util/UrlToFileMapper.java
index 131890f54f7c..131890f54f7c 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/ridljar/com/sun/star/lib/util/UrlToFileMapper.java
diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/ridljar/com/sun/star/uno/AnyConverter.java
index d36542e1a67a..d36542e1a67a 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/ridljar/com/sun/star/uno/AnyConverter.java
diff --git a/jurt/com/sun/star/uno/Ascii.java b/ridljar/com/sun/star/uno/Ascii.java
index ce510889351a..ce510889351a 100644
--- a/jurt/com/sun/star/uno/Ascii.java
+++ b/ridljar/com/sun/star/uno/Ascii.java
diff --git a/jurt/com/sun/star/uno/AsciiString.java b/ridljar/com/sun/star/uno/AsciiString.java
index 8b744c5a2213..8b744c5a2213 100644
--- a/jurt/com/sun/star/uno/AsciiString.java
+++ b/ridljar/com/sun/star/uno/AsciiString.java
diff --git a/jurt/com/sun/star/uno/MappingException.java b/ridljar/com/sun/star/uno/MappingException.java
index 7670a790ad93..7670a790ad93 100644
--- a/jurt/com/sun/star/uno/MappingException.java
+++ b/ridljar/com/sun/star/uno/MappingException.java
diff --git a/jurt/com/sun/star/uno/WeakReference.java b/ridljar/com/sun/star/uno/WeakReference.java
index a6b171ac2e8b..a6b171ac2e8b 100644
--- a/jurt/com/sun/star/uno/WeakReference.java
+++ b/ridljar/com/sun/star/uno/WeakReference.java