94 files changed, 798 insertions, 61 deletions

diff --git a/Module_ooo.mk b/Module_ooo.mk
index bec3c6d60e4e..ad9bdbb29561 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     idl \
     io \
     javaunohelper \
+    jurt \
     jvmaccess \
     lingucomponent \
     linguistic \
diff --git a/Repository.mk b/Repository.mk
index 1aadac0059c6..ce8467fe768d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -177,6 +177,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    jpipe \
+    jpipx \
     xmlreader \
 ))
 
diff --git a/jurt/Ant_jurt.mk b/jurt/Ant_jurt.mk
new file mode 100644
index 000000000000..318ddd26acbf
--- /dev/null
+++ b/jurt/Ant_jurt.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,jurt,$(SRCDIR)/jurt/java/jurt/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
new file mode 100644
index 000000000000..acbb5a951cb2
--- /dev/null
+++ b/jurt/Library_jpipe.mk
@@ -0,0 +1,38 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+$(eval $(call gb_Library_Library,$(JPIPE_NAME)))
+
+$(eval $(call gb_Library_set_include,$(JPIPE_NAME),\
+        $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,$(JPIPE_NAME),\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_cobjects,$(JPIPE_NAME),\
+	jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jurt/Library_wrapper.mk b/jurt/Library_wrapper.mk
new file mode 100644
index 000000000000..62b80c38e788
--- /dev/null
+++ b/jurt/Library_wrapper.mk
@@ -0,0 +1,38 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+$(eval $(call gb_Library_Library,jpipe))
+
+$(eval $(call gb_Library_set_include,jpipe,\
+        $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jpipe,\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_cobjects,jpipe,\
+	jurt/source/pipe/wrapper/wrapper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jurt/Makefile b/jurt/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/jurt/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
new file mode 100644
index 000000000000..c367409909fc
--- /dev/null
+++ b/jurt/Module_jurt.mk
@@ -0,0 +1,52 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,jurt))
+
+
+
+ifeq ($(GUIBASE),WIN)
+	JPIPE_NAME := jpipx
+else
+	JPIPE_NAME := jpipe
+endif
+
+
+
+$(eval $(call gb_Module_add_targets,jurt,\
+	Ant_jurt \
+	Library_jpipe \
+	Zip_jurt-src \
+))
+
+
+
+ifeq ($(GUIBASE),WIN)
+$(eval $(call gb_Module_add_targets,jurt,\
+	Library_wrapper \
+))
+endif
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/jurt/Zip_jurt-src.mk b/jurt/Zip_jurt-src.mk
new file mode 100644
index 000000000000..fe31c049cb5a
--- /dev/null
+++ b/jurt/Zip_jurt-src.mk
@@ -0,0 +1,83 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Zip_Zip,jurt_src,$(SRCDIR)/jurt/java/jurt/src/main/java))
+
+$(eval $(call gb_Zip_add_files,jurt_src,\
+	com/sun/star/comp/loader/RegistrationClassFinder.java \
+	com/sun/star/comp/loader/FactoryHelper.java \
+	com/sun/star/comp/loader/JavaLoaderFactory.java \
+	com/sun/star/comp/loader/JavaLoader.java \
+	com/sun/star/comp/bridgefactory/BridgeFactory.java \
+	com/sun/star/comp/connections/ConstantInstanceProvider.java \
+	com/sun/star/comp/connections/Implementation.java \
+	com/sun/star/comp/connections/PipedConnection.java \
+	com/sun/star/comp/connections/Connector.java \
+	com/sun/star/comp/connections/Acceptor.java \
+	com/sun/star/comp/urlresolver/UrlResolver.java \
+	com/sun/star/comp/servicemanager/ServiceManager.java \
+	com/sun/star/uno/MappingException.java \
+	com/sun/star/uno/AsciiString.java \
+	com/sun/star/uno/Ascii.java \
+	com/sun/star/uno/WeakReference.java \
+	com/sun/star/uno/AnyConverter.java \
+	com/sun/star/lib/util/UrlToFileMapper.java \
+	com/sun/star/lib/util/AsynchronousFinalizer.java \
+	com/sun/star/lib/util/StringHelper.java \
+	com/sun/star/lib/util/NativeLibraryLoader.java \
+	com/sun/star/lib/connections/socket/socketAcceptor.java \
+	com/sun/star/lib/connections/socket/SocketConnection.java \
+	com/sun/star/lib/connections/socket/ConnectionDescriptor.java \
+	com/sun/star/lib/connections/socket/socketConnector.java \
+	com/sun/star/lib/connections/pipe/pipeAcceptor.java \
+	com/sun/star/lib/connections/pipe/pipeConnector.java \
+	com/sun/star/lib/connections/pipe/PipeConnection.java \
+	com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java \
+	com/sun/star/lib/uno/environments/remote/IProtocol.java \
+	com/sun/star/lib/uno/environments/remote/Job.java \
+	com/sun/star/lib/uno/environments/remote/IReceiver.java \
+	com/sun/star/lib/uno/environments/remote/remote_environment.java \
+	com/sun/star/lib/uno/environments/remote/IThreadPool.java \
+	com/sun/star/lib/uno/environments/remote/Message.java \
+	com/sun/star/lib/uno/environments/remote/JavaThreadPool.java \
+	com/sun/star/lib/uno/environments/remote/JobQueue.java \
+	com/sun/star/lib/uno/environments/remote/ThreadId.java \
+	com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java \
+	com/sun/star/lib/uno/environments/remote/NativeThreadPool.java \
+	com/sun/star/lib/uno/environments/java/java_environment.java \
+	com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java \
+	com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java \
+	com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java \
+	com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java \
+	com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java \
+	com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java \
+	com/sun/star/lib/uno/Proxy.java \
+	com/sun/star/lib/uno/protocols/urp/PendingRequests.java \
+	com/sun/star/lib/uno/protocols/urp/UrpMessage.java \
+	com/sun/star/lib/uno/protocols/urp/Cache.java \
+	com/sun/star/lib/uno/protocols/urp/Unmarshal.java \
+	com/sun/star/lib/uno/protocols/urp/Marshal.java \
+	com/sun/star/lib/uno/protocols/urp/urp.java \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jurt/java/jurt/build.xml b/jurt/java/jurt/build.xml
new file mode 100644
index 000000000000..2c1c05a08112
--- /dev/null
+++ b/jurt/java/jurt/build.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="jurt" default="main">
+
+    <property file="../../../ant.properties"/>
+    <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+    <target name="init-project">
+
+        <property name="jar.classpath" value="ridl.jar unoloader.jar ../../lib/ ../bin/"/>
+        <property name="jar.manifest" value="${SRC_ROOT}/jurt/util/manifest"/>
+
+        <path id="main.classpath">
+            <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+            <pathelement location="${OUTDIR}/bin/unoloader.jar"/>
+        </path>
+
+        <filelist id="idl.files">
+            <file name="${test.src.dir}/com/sun/star/lib/uno/protocols/urp/interfaces.idl"/>
+        </filelist>
+
+    </target>
+
+</project>
+
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/BridgeFactory.java
index 45d4efaef286..45d4efaef286 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/BridgeFactory.java
diff --git a/jurt/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk
index a16a581fe942..a16a581fe942 100644
--- a/jurt/com/sun/star/comp/bridgefactory/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/bridgefactory/makefile.mk
diff --git a/jurt/com/sun/star/comp/connections/Acceptor.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Acceptor.java
index 883eb5b74fa5..883eb5b74fa5 100644
--- a/jurt/com/sun/star/comp/connections/Acceptor.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Acceptor.java
diff --git a/jurt/com/sun/star/comp/connections/Connector.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Connector.java
index b41b01ccab2b..b41b01ccab2b 100644
--- a/jurt/com/sun/star/comp/connections/Connector.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Connector.java
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/ConstantInstanceProvider.java
index 63ec50ad9a7f..63ec50ad9a7f 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/ConstantInstanceProvider.java
diff --git a/jurt/com/sun/star/comp/connections/Implementation.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Implementation.java
index 2b7075eb98ac..2b7075eb98ac 100644
--- a/jurt/com/sun/star/comp/connections/Implementation.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/Implementation.java
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/PipedConnection.java
index 7f23f8c588ec..7f23f8c588ec 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/PipedConnection.java
diff --git a/jurt/com/sun/star/comp/connections/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk
index 5b56bdb3f486..5b56bdb3f486 100644
--- a/jurt/com/sun/star/comp/connections/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/connections/makefile.mk
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/FactoryHelper.java
index 95e923eba3b2..35232211b662 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/FactoryHelper.java
@@ -340,7 +340,7 @@ public class FactoryHelper {
             return createInstanceWithContext( null );
         }
 
-         /**
+        /**
          * Creates an instance of the desired service.
          * <p>
          * @return  returns an instance of the desired service
@@ -354,7 +354,7 @@ public class FactoryHelper {
             return createInstanceWithArgumentsAndContext( args, null );
         }
 
-         /**
+        /**
          * Gives the supported services
          * <p>
          * @return  returns an array of supported services
@@ -364,7 +364,7 @@ public class FactoryHelper {
             return new String[]{_serviceName};
         }
 
-         /**
+        /**
          * Gives the implementation name
          * <p>
          * @return  returns the implementation name
@@ -374,7 +374,7 @@ public class FactoryHelper {
             return _implName;
         }
 
-         /**
+        /**
          * Indicates if the given service is supported.
          * <p>
          * @return  returns true if the given service is supported
@@ -507,16 +507,16 @@ public class FactoryHelper {
     static public boolean writeRegistryServiceInfo(String implName, String serviceName, XRegistryKey regKey) {
         boolean result = false;
 
-          try {
+        try {
             XRegistryKey newKey = regKey.createKey("/" + implName + "/UNO/SERVICES");
 
             newKey.createKey(serviceName);
 
             result = true;
-          }
-          catch (Exception ex) {
-              System.err.println(">>>Connection_Impl.writeRegistryServiceInfo " + ex);
-          }
+        }
+        catch (Exception ex) {
+            System.err.println(">>>Connection_Impl.writeRegistryServiceInfo " + ex);
+        }
 
         return result;
     }
@@ -532,7 +532,7 @@ public class FactoryHelper {
     public static boolean writeRegistryServiceInfo(
         String impl_name, String supported_services [], XRegistryKey xKey )
     {
-          try
+        try
         {
             XRegistryKey xNewKey = xKey.createKey( "/" + impl_name + "/UNO/SERVICES" );
             for ( int nPos = 0; nPos < supported_services.length; ++nPos )
@@ -540,8 +540,8 @@ public class FactoryHelper {
                 xNewKey.createKey( supported_services[ nPos ] );
             }
             return true;
-          }
-          catch (com.sun.star.registry.InvalidRegistryException exc)
+        }
+        catch (com.sun.star.registry.InvalidRegistryException exc)
         {
             if (DEBUG)
             {
@@ -549,7 +549,7 @@ public class FactoryHelper {
                     "##### " + Factory.class.getName() + ".writeRegistryServiceInfo -- exc: " +
                     exc.toString() );
             }
-          }
+        }
         return false;
     }
 
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java
index 67c2e78ebbf5..1757c92c4d01 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoader.java
@@ -320,7 +320,7 @@ public class JavaLoader implements XImplementationLoader,
         Method compfac_method = null;
         try
         {
-             compfac_method = clazz.getMethod(
+            compfac_method = clazz.getMethod(
                 "__getComponentFactory", new Class [] { String.class } );
         }
         catch ( NoSuchMethodException noSuchMethodEx) {}
@@ -429,7 +429,7 @@ public class JavaLoader implements XImplementationLoader,
         }
         catch (Exception e) {
             throw new CannotRegisterImplementationException( e.getMessage());
-         }
+        }
 
         return success;
     }
diff --git a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoaderFactory.java
index c326d29e9cdb..c326d29e9cdb 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoaderFactory.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/JavaLoaderFactory.java
diff --git a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/RegistrationClassFinder.java
index 26c02f208296..26c02f208296 100644
--- a/jurt/com/sun/star/comp/loader/RegistrationClassFinder.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/RegistrationClassFinder.java
diff --git a/jurt/com/sun/star/comp/loader/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk
index cec99e2b5f09..cec99e2b5f09 100644
--- a/jurt/com/sun/star/comp/loader/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/loader/makefile.mk
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/ServiceManager.java
index 35addc2fafcf..0c915ffa5256 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -122,7 +122,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * @param      multiFactory references of the <code>MultiServiceFactory</code>. This parameter will be ignored.
      * @param      regKey       the root key of the registry. This parameter will be ignored.
      */
-      public static XSingleServiceFactory getServiceFactory( String implName,
+    public static XSingleServiceFactory getServiceFactory( String implName,
                                                            XMultiServiceFactory multiFactory,
                                                            XRegistryKey regKey)
     {
@@ -141,7 +141,7 @@ public class ServiceManager implements XMultiServiceFactory,
      */
     private XImplementationLoader getLoader()
                 throws  com.sun.star.uno.Exception,
-                          com.sun.star.uno.RuntimeException
+                        com.sun.star.uno.RuntimeException
     {
         Object[] param = { this };
         DEBUG("make loader");
@@ -480,10 +480,10 @@ public class ServiceManager implements XMultiServiceFactory,
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException("Listener must not be null");
 
-          if ( eventListener.contains(xListener) )
-              throw new com.sun.star.uno.RuntimeException("Listener already registred.");
+        if ( eventListener.contains(xListener) )
+            throw new com.sun.star.uno.RuntimeException("Listener already registred.");
 
-           eventListener.addElement(xListener);
+        eventListener.addElement(xListener);
     }
 
     /**
@@ -500,8 +500,8 @@ public class ServiceManager implements XMultiServiceFactory,
         if (xListener == null)
             throw new com.sun.star.uno.RuntimeException("Listener must not be null");
 
-          if ( !eventListener.contains(xListener) )
-              throw new com.sun.star.uno.RuntimeException("Listener is not registered.");
+        if ( !eventListener.contains(xListener) )
+            throw new com.sun.star.uno.RuntimeException("Listener is not registered.");
 
         eventListener.removeElement(xListener);
     }
@@ -828,7 +828,7 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * Supplies the implementation name of the <code>ServiceManager</code>.
      * <p>
      * @return      <code>ServiceManager</code> class name.
-      * @see         com.sun.star.lang.XServiceInfo
+     * @see         com.sun.star.lang.XServiceInfo
      */
     public String getImplementationName()
             throws com.sun.star.uno.RuntimeException
@@ -841,7 +841,7 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * <p>
      * @return      true - if the service is supported, otherwise false.
      * @param       serviceName     the name of the service that should be checked.
-      * @see         com.sun.star.lang.XServiceInfo
+     * @see         com.sun.star.lang.XServiceInfo
      */
     public boolean supportsService( String serviceName )
             throws com.sun.star.uno.RuntimeException
@@ -857,7 +857,7 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * Returns all service names which are supported by <code>ServiceManager</code>.
      * <p>
      * @return      a list aof all supported service names.
-      * @see         com.sun.star.lang.XServiceInfo
+     * @see         com.sun.star.lang.XServiceInfo
      */
     public String[] getSupportedServiceNames()
             throws com.sun.star.uno.RuntimeException
@@ -869,7 +869,7 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * Creates a new instance of the <code>ServiceManager</code>.
      * <p>
      * @return      newly created <code>ServiceManager</code> object.
-      * @see         com.sun.star.lang.XSingleServiceFactory
+     * @see         com.sun.star.lang.XSingleServiceFactory
      */
     public java.lang.Object createInstance()
             throws com.sun.star.uno.Exception,
@@ -886,7 +886,7 @@ class ServiceManagerFactory implements  XServiceInfo, XSingleComponentFactory, X
      * <p>
      * @return      null - always throws an exception
      * @param       aArguments arguments for new instance.
-      * @see         com.sun.star.lang.XSingleServiceFactory
+     * @see         com.sun.star.lang.XSingleServiceFactory
      */
     public java.lang.Object createInstanceWithArguments( java.lang.Object[] aArguments )
             throws com.sun.star.uno.Exception,
diff --git a/jurt/com/sun/star/comp/servicemanager/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk
index 2d4bafed0120..2d4bafed0120 100644
--- a/jurt/com/sun/star/comp/servicemanager/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/servicemanager/makefile.mk
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/UrlResolver.java
index a80ef46df016..fd3e981893c1 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -142,7 +142,7 @@ public class UrlResolver {
     {
         XSingleServiceFactory xSingleServiceFactory = null;
 
-          if (implName.equals(UrlResolver.class.getName()) )
+        if (implName.equals(UrlResolver.class.getName()) )
             xSingleServiceFactory = FactoryHelper.getServiceFactory(_UrlResolver.class,
                                                                     _UrlResolver.__serviceName,
                                                                     multiFactory,
diff --git a/jurt/com/sun/star/comp/urlresolver/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk
index bbb91aa09d77..bbb91aa09d77 100644
--- a/jurt/com/sun/star/comp/urlresolver/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/comp/urlresolver/makefile.mk
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/PipeConnection.java
index faf6d51ab5d6..22bfdb45d2f1 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -90,7 +90,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
             if ( !aPipeNameParam.substring( 0, 5 ).equals( "name=" ) )
                 throw new RuntimeException( "invalid pipe descriptor: no 'name=' parameter found" );
             aPipeName = aPipeNameParam.substring( 5 );
-             }
+            }
         else
             throw new RuntimeException( "invalid or empty pipe descriptor" );
 
@@ -218,7 +218,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * Gives a description of the connection.
      * <p>
      * @return  the description
-      * @see       com.sun.star.connections.XConnection#getDescription
+     * @see       com.sun.star.connections.XConnection#getDescription
      */
     public String getDescription() throws com.sun.star.uno.RuntimeException {
         return _aDescription;
diff --git a/jurt/com/sun/star/lib/connections/pipe/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk
index 4d3ec91e9524..4d3ec91e9524 100644
--- a/jurt/com/sun/star/lib/connections/pipe/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/makefile.mk
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index 6bf0fb5c3118..6bf0fb5c3118 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/pipeAcceptor.java
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/pipeConnector.java
index cc032a9073c4..cc032a9073c4 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/pipe/pipeConnector.java
diff --git a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
index 2f2f9dd11906..2f2f9dd11906 100644
--- a/jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/ConnectionDescriptor.java
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/SocketConnection.java
index 90837a3d8b51..90837a3d8b51 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/SocketConnection.java
diff --git a/jurt/com/sun/star/lib/connections/socket/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk
index 7df24d8b56c9..7df24d8b56c9 100644
--- a/jurt/com/sun/star/lib/connections/socket/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/makefile.mk
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/socketAcceptor.java
index 112c2d9926fa..112c2d9926fa 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/socketAcceptor.java
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/socketConnector.java
index 433ce6f5b4b3..433ce6f5b4b3 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/connections/socket/socketConnector.java
diff --git a/jurt/com/sun/star/lib/uno/Proxy.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/Proxy.java
index b1cef7d12889..b1cef7d12889 100644
--- a/jurt/com/sun/star/lib/uno/Proxy.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/Proxy.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
index 8c22be9bbaf4..8c22be9bbaf4 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
+++ b/jurt/java/jurt/src/main/java/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/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
index db2281dfb796..db2281dfb796 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java
+++ b/jurt/java/jurt/src/main/java/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/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
index 456fd0c3d3a8..456fd0c3d3a8 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler.java
+++ b/jurt/java/jurt/src/main/java/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/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
index c4709da8de72..c4709da8de72 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter.java
+++ b/jurt/java/jurt/src/main/java/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/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
index 4b44921b734e..4b44921b734e 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter.java
+++ b/jurt/java/jurt/src/main/java/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/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 65decd770ca1..65decd770ca1 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
index 6b1ed1a3dea3..6b1ed1a3dea3 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/java_environment.java
index c0eea24116e5..c0eea24116e5 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/java_environment.java
diff --git a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk
index b2b6f0a9b70f..b2b6f0a9b70f 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/java/makefile.mk
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IProtocol.java
index 464595e2e7b9..464595e2e7b9 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IProtocol.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IReceiver.java
index ee7c02e5fada..ee7c02e5fada 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IReceiver.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index d24385c4236d..d24385c4236d 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/IThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index 27eb34afeeaa..27eb34afeeaa 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
index 97f7dca95d06..97f7dca95d06 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/Job.java
index 265330bd876a..265330bd876a 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/Job.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 0ffc99131a11..09ddc0d0d25b 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -87,7 +87,7 @@ public class JobQueue {
             if(DEBUG) System.err.println("ThreadPool$JobDispatcher.run: " + Thread.currentThread());
 
             try {
-                  enter(2000, _disposeId);
+                enter(2000, _disposeId);
             }
             catch(Throwable throwable) {
                 if(_head != null || _active) { // there was a job in progress, so give a stack
@@ -219,7 +219,7 @@ public class JobQueue {
                     wait(waitTime);
                 }
                 catch(InterruptedException interruptedException) {
-                      throw new com.sun.star.uno.RuntimeException(getClass().getName() + ".removeJob - unexpected:" + interruptedException);
+                    throw new com.sun.star.uno.RuntimeException(getClass().getName() + ".removeJob - unexpected:" + interruptedException);
                 }
 
                 // signal that we have already waited once
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Message.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/Message.java
index 9e05d680e0df..9e05d680e0df 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Message.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/Message.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
index 695bc4da55fc..695bc4da55fc 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/NativeThreadPool.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java
index 5e1913b453b3..5e1913b453b3 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadId.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
index c03b0a1a2740..c03b0a1a2740 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/ThreadPoolManager.java
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk
index f586ddef4e0a..f586ddef4e0a 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/makefile.mk
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/remote_environment.java
index 9ff3753a2160..9ff3753a2160 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/remote_environment.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/environments/remote/remote_environment.java
diff --git a/jurt/com/sun/star/lib/uno/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk
index 3b5bb92df9ea..3b5bb92df9ea 100644
--- a/jurt/com/sun/star/lib/uno/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/makefile.mk
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Cache.java
index 9f00af5ba4ec..9f00af5ba4ec 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Cache.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Cache.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Marshal.java
index 34eb852683ff..34eb852683ff 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Marshal.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
index 0702a66123d8..0702a66123d8 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/PendingRequests.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index 02e8d69cfc40..02e8d69cfc40 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
index 41de569f5cc2..41de569f5cc2 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/UrpMessage.java
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
index 9162a1f7485f..9162a1f7485f 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/urp.java
index ad347717e994..ad347717e994 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/uno/protocols/urp/urp.java
diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/AsynchronousFinalizer.java
index 2213275b34b7..2213275b34b7 100644
--- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/AsynchronousFinalizer.java
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/NativeLibraryLoader.java
index 9bec01a49dad..9bec01a49dad 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/NativeLibraryLoader.java
diff --git a/jurt/com/sun/star/lib/util/StringHelper.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java
index baaeb03e7fb6..baaeb03e7fb6 100644
--- a/jurt/com/sun/star/lib/util/StringHelper.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/StringHelper.java
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java
index 35b65694de76..35b65694de76 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/UrlToFileMapper.java
diff --git a/jurt/com/sun/star/lib/util/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk
index 6c4ab6850aa6..6c4ab6850aa6 100644
--- a/jurt/com/sun/star/lib/util/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/lib/util/makefile.mk
diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/java/jurt/src/main/java/com/sun/star/uno/AnyConverter.java
index 391f270fb394..391f270fb394 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/AnyConverter.java
diff --git a/jurt/com/sun/star/uno/Ascii.java b/jurt/java/jurt/src/main/java/com/sun/star/uno/Ascii.java
index c742de073b32..c742de073b32 100644
--- a/jurt/com/sun/star/uno/Ascii.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/Ascii.java
diff --git a/jurt/com/sun/star/uno/AsciiString.java b/jurt/java/jurt/src/main/java/com/sun/star/uno/AsciiString.java
index b37539c8fb90..b37539c8fb90 100644
--- a/jurt/com/sun/star/uno/AsciiString.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/AsciiString.java
diff --git a/jurt/com/sun/star/uno/MappingException.java b/jurt/java/jurt/src/main/java/com/sun/star/uno/MappingException.java
index d22aad373537..d22aad373537 100644
--- a/jurt/com/sun/star/uno/MappingException.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/MappingException.java
diff --git a/jurt/com/sun/star/uno/WeakReference.java b/jurt/java/jurt/src/main/java/com/sun/star/uno/WeakReference.java
index 95629ada814c..95629ada814c 100644
--- a/jurt/com/sun/star/uno/WeakReference.java
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/WeakReference.java
diff --git a/jurt/com/sun/star/uno/makefile.mk b/jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk
index 38387b28ecc2..38387b28ecc2 100644
--- a/jurt/com/sun/star/uno/makefile.mk
+++ b/jurt/java/jurt/src/main/java/com/sun/star/uno/makefile.mk
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
index 6bf32cffb5b6..6bf32cffb5b6 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
index c706619ba749..c706619ba749 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
index 1191d5961330..1191d5961330 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/TestBridge.java
index bc5ca7fca24e..bc5ca7fca24e 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/TestBridge.java
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/TestObject.java
index 1adf091bb7ae..1adf091bb7ae 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/TestObject.java
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
index 4cbb33695093..4cbb33695093 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/interfaces.idl
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
index 53d4f7d2680b..53d4f7d2680b 100644
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ b/jurt/java/jurt/src/test/java/com/sun/star/lib/uno/protocols/urp/makefile.mk
diff --git a/jurt/prj/build.lst b/jurt/prj/build.lst
index 6ba92a9ec6b6..8924dff2ad18 100644
--- a/jurt/prj/build.lst
+++ b/jurt/prj/build.lst
@@ -1,20 +1,2 @@
-ju  jurt : ridljar sal NULL
-ju	jurt									usr1	-	all	ju_mkout NULL
-ju	jurt\com\sun\star\lib\util				nmake	-	all	ju_libutil NULL
-ju	jurt\com\sun\star\uno					nmake	-	all	ju_uno NULL
-ju	jurt\com\sun\star\comp\loader			nmake	-	all	ju_co_loader ju_uno ju_libutil NULL
-ju	jurt\com\sun\star\comp\bridgefactory	nmake	-	all	ju_co_bfactr ju_co_loader NULL
-ju  jurt\com\sun\star\lib\uno               nmake   -   all ju_cssl_uno NULL
-ju	jurt\com\sun\star\lib\uno\environments\java			nmake	-	all	ju_env_java ju_cssl_uno NULL
-ju	jurt\com\sun\star\lib\uno\environments\remote		nmake	-	all	ju_env_remote ju_env_java NULL
-ju	jurt\com\sun\star\lib\uno\protocols\urp	nmake	-	all	ju_prot_urp ju_env_remote NULL
-ju	jurt\com\sun\star\lib\uno\bridges\java_remote		nmake	-	all	ju_brid_jrm ju_co_loader ju_cssl_uno ju_env_remote NULL
-ju	jurt\com\sun\star\lib\connections\socket			nmake	-	all	ju_con_sock ju_co_loader NULL
-ju	jurt\com\sun\star\lib\connections\pipe			nmake	-	all	ju_con_pipe ju_co_loader ju_libutil NULL
-ju	jurt\com\sun\star\comp\connections		nmake	-	all	ju_con ju_co_loader NULL
-ju	jurt\com\sun\star\comp\servicemanager	nmake	-	all	ju_servman NULL
-ju	jurt\com\sun\star\comp\urlresolver		nmake	-	all	ju_urlres ju_co_loader NULL
-ju	jurt\source\pipe			nmake	-	all	ju_src_pipe NULL
-ju  jurt\source\pipe\wrapper nmake - w ju_src_pipe_wrapper NULL
-ju	jurt\util								nmake	-	all	ju_ut ju_brid_jrm ju_co_bfactr ju_con ju_con_sock ju_con_pipe ju_cssl_uno ju_env_java ju_prot_urp ju_servman ju_urlres ju_src_pipe ju_libutil ju_uno NULL
-ju jurt\test\com\sun\star\lib\uno\protocols\urp nmake - all ju_test_css_lib_uno_protocols_urp NULL
+ju  jurt : ridljar offapi sal NULL
+ju	jurt\prj								nmake	-	all	ju_prj NULL
diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst
index 74f5b60d7748..e69de29bb2d1 100644
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar
-..\%__SRC%\bin\jpipe.dll %_DEST%\bin%_EXT%\jpipe.dll
-..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
-..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
-..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
-..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
-
-..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 4024dedc8951..ba8ff2c8cf0e 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -99,7 +99,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
     -rm $(@:d:d)$/cpp.css
     $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
 
-$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/jurt_src.zip $(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip $(SOLARCOMMONPCKDIR)$/juh_src.zip
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/jurt_src.zip $(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip $(SOLARCOMMONPCKDIR)$/juh_src.zip
     -$(MKDIRHIER) $(@:d)        
     $(MY_COPY) $^ $(JAVA_SRC_DIR)
     cd $(JAVA_SRC_DIR) && unzip -qu jurt_src.zip && unzip -qu ridl_src.zip && unzip -qu unoloader_src.zip && unzip -qu juh_src.zip
diff --git a/solenv/ant/aoo-ant.xml b/solenv/ant/aoo-ant.xml
new file mode 100644
index 000000000000..7e9b79e7b38f
--- /dev/null
+++ b/solenv/ant/aoo-ant.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="aoo-ant" default="main" xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+    <!-- ================================================================= -->
+    <!-- settings                                                          -->
+    <!-- ================================================================= -->
+
+    <dirname property="aoo-ant.basedir" file="${ant.file.aoo-ant}"/>
+
+    <!-- global properties -->
+    <property file="${aoo-ant.basedir}/../../ant.properties"/>
+    <!-- RSCREVISION: -->
+    <property file="${aoo-ant.basedir}/../inc/minor.mk"/>
+
+    <property name="build.base.dir" location="${WORKDIR}/Ant/${ant.project.name}"/>
+    <property name="main.src.dir" location="src/main/java"/>
+    <property name="main.build.dir" location="${build.base.dir}/main"/>
+    <property name="test.src.dir" location="src/test/java"/>
+    <property name="test.build.dir" location="${build.base.dir}/test"/>
+    <property name="test.reports.dir" location="${build.base.dir}/test-reports"/>
+    <property name="jar.dir" location="${WORKDIR}/Ant"/>
+
+    <property name="main.debug" value="true"/>
+    <property name="main.deprecation" value="false"/>
+    <property name="test.debug" value="true"/>
+    <property name="test.deprecation" value="false"/>
+
+    <import file="${aoo-ant.basedir}/externals.xml"/>
+    <import file="${aoo-ant.basedir}/idl.xml"/>
+
+    <target name="init-project"/>
+
+    <target name="prepare" depends="init-project">
+        <property name="jar.enabled" value="true"/>
+        <property name="jar.name" value="${ant.project.name}"/>
+        <property name="jar.classpath" value=""/>
+        <property name="jar.manifest" value ="${aoo-ant.basedir}/manifest.empty"/>
+
+        <local name="has.main.classpath"/>
+        <condition property="has.main.classpath">
+            <isreference refid="main.classpath"/>
+        </condition>
+        <path id="main.classpath" unless:set="has.main.classpath"/>
+
+        <local name="has.test.classpath"/>
+        <condition property="has.test.classpath">
+            <isreference refid="test.classpath"/>
+        </condition>
+        <path id="internal.test.classpath">
+            <pathelement location="${main.build.dir}"/>
+            <pathelement location="${test.build.dir}"/>
+            <path refid="main.classpath"/>
+            <path refid="test.classpath" if:set="has.test.classpath"/>
+            <pathelement location="${idl.classes.build.dir}"/>
+            <pathelement location="${OOO_JUNIT_JAR}"/>
+        </path>
+
+        <local name="has.idl.files"/>
+        <condition property="has.idl.files">
+            <isreference refid="idl.files"/>
+        </condition>
+        <filelist id="idl.files" unless:set="has.idl.files">
+            <filelist refid="idl.files"/>
+        </filelist>
+    </target>
+
+    <target name="res" depends="prepare">
+        <mkdir dir="${main.build.dir}"/>
+        <copy todir="${main.build.dir}">
+             <fileset dir="${main.src.dir}">
+                 <include name="**/*.properties"/>
+                 <include name="**/*.css"/>
+                 <include name="**/*.dtd"/>
+                 <include name="**/*.form"/>
+                 <include name="**/*.gif "/>
+                 <include name="**/*.htm"/>
+                 <include name="**/*.html"/>
+                 <include name="**/*.js"/>
+                 <include name="**/*.mod"/>
+                 <include name="**/*.sql"/>
+                 <include name="**/*.xml"/>
+                 <include name="**/*.xsl"/>
+                 <include name="**/*.map"/>
+             </fileset>
+        </copy>
+    </target>
+
+    <target name="compile" depends="prepare,res">
+        <mkdir dir="${main.build.dir}"/>
+        <javac srcdir="${main.src.dir}"
+               destdir="${main.build.dir}"
+               debug="${main.debug}"
+               debuglevel="lines,vars,source"
+               deprecation="${main.deprecation}"
+               classpathref="main.classpath"
+               includeantruntime="false"/>
+    </target>
+
+    <target name="test-compile" depends="compile,idl">
+        <property property="test.skip" value="true" if:blank="${OOO_JUNIT_JAR}"/>
+        <echo message="No junit, skipping tests" if:blank="${OOO_JUNIT_JAR}"/>
+
+        <mkdir dir="${test.build.dir}" unless:blank="${OOO_JUNIT_JAR}"/>
+        <javac srcdir="${test.src.dir}"
+               destdir="${test.build.dir}"
+               debug="${test.debug}"
+               debuglevel="lines,vars,source"
+               deprecation="${test.deprecation}"
+               classpathref="internal.test.classpath"
+               includeantruntime="false"
+               unless:blank="${OOO_JUNIT_JAR}"/>
+    </target>
+
+    <!-- fork="true" is sadly necessary on Ubuntu due to multiple versions of junit confusing Ant,
+         see https://github.com/real-logic/simple-binary-encoding/issues/96 -->
+    <target name="test" depends="test-compile" unless:set="${test.skip}">
+        <mkdir dir="${test.reports.dir}"/>
+        <junit printsummary="yes" haltonfailure="yes" showoutput="true" filtertrace="false" fork="true">
+            <classpath refid="internal.test.classpath"/>
+            <formatter type="plain"/>
+            <batchtest todir="${test.reports.dir}">
+                <fileset dir="${test.src.dir}">
+                    <include name="**/*_Test.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="jar" depends="compile" if="${jar.enabled}">
+        <jar destfile="${jar.dir}/${jar.name}.jar"
+             basedir="${main.build.dir}"
+             manifest="${jar.manifest}">
+            <manifest>
+                <attribute name="Class-Path" value="${jar.classpath}" unless:blank="${jar.classpath}"/>
+                <attribute name="Solar-Version" value="${RSCREVISION}"/>
+            </manifest>
+            <include name="**/*.class"/>
+            <include name="**/*.properties"/>
+            <include name="**/*.css"/>
+            <include name="**/*.dtd"/>
+            <include name="**/*.form"/>
+            <include name="**/*.gif "/>
+            <include name="**/*.htm"/>
+            <include name="**/*.html"/>
+            <include name="**/*.js"/>
+            <include name="**/*.mod"/>
+            <include name="**/*.sql"/>
+            <include name="**/*.xml"/>
+            <include name="**/*.xsl"/>
+            <include name="**/*.map"/>
+        </jar>
+    </target>
+
+    <target name="clean" depends="prepare">
+        <delete dir="${build.base.dir}"/>
+        <delete file="${jar.dir}/${jar.name}.jar"/>
+    </target>
+
+    <target name="main" depends="test,jar"/>
+
+</project>
+
diff --git a/solenv/ant/externals.xml b/solenv/ant/externals.xml
new file mode 100644
index 000000000000..8965778e6875
--- /dev/null
+++ b/solenv/ant/externals.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+<project name="externals">
+
+    <!-- Each external has 3 properties set, for example for "commons-lang":
+         external.commons-lang.internalfilename - the filename when built internally, eg. commons-lang3-3.3.jar
+         external.commons-lang.jarclasspath - the path to be placed in the "Class-Path:" entry in JAR files linking to this JAR
+         external.commons-lang.path - the full path to the JAR
+      -->
+
+    <dirname property="externals.basedir" file="${ant.file.externals}"/>
+
+    <!-- global properties -->
+    <property file="${externals.basedir}/../../ant.properties"/>
+
+    <macrodef name="define-external">
+        <attribute name="name"/>
+        <attribute name="system-test"/>
+        <attribute name="system-path"/>
+        <attribute name="internal-filename"/>
+        <sequential>
+            <property name="external.@{name}.internalfilename" value="@{internal-filename}"/>
+            <condition property="external.@{name}.jarclasspath" value="@{system-path}" else="${external.@{name}.internalfilename}">
+                <equals arg1="@{system-test}" arg2="YES"/>
+            </condition>
+            <condition property="external.@{name}.path" value="@{system-path}" else="${OUTDIR}/bin/${external.@{name}.internalfilename}">
+                <equals arg1="@{system-test}" arg2="YES"/>
+            </condition>
+        </sequential>
+    </macrodef>
+
+    <define-external
+        name="commons-codec"
+        system-test="${SYSTEM_APACHE_COMMONS}"
+        system-path="${COMMONS_CODEC_JAR}"
+        internal-filename="commons-codec-1.9.jar"/>
+
+    <define-external
+        name="commons-httpclient"
+        system-test="${SYSTEM_APACHE_COMMONS}"
+        system-path="${COMMONS_HTTPCLIENT_JAR}"
+        internal-filename="commons-httpclient-3.1.jar"/>
+
+    <define-external
+        name="commons-lang"
+        system-test="${SYSTEM_APACHE_COMMONS}"
+        system-path="${COMMONS_LANG_JAR}"
+        internal-filename="commons-lang3-3.3.jar"/>
+
+    <define-external
+        name="commons-logging"
+        system-test="${SYSTEM_APACHE_COMMONS}"
+        system-path="${COMMONS_LOGGING_JAR}"
+        internal-filename="commons-logging-1.1.3.jar"/>
+
+</project>
diff --git a/solenv/ant/idl.xml b/solenv/ant/idl.xml
new file mode 100644
index 000000000000..0325c9a7a722
--- /dev/null
+++ b/solenv/ant/idl.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="idl" xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+    <dirname property="idl.basedir" file="${ant.file.idl}"/>
+
+    <!-- global properties -->
+    <property file="${idl.basedir}/../../ant.properties"/>
+
+
+
+    <property name="idl.build.dir" location="${build.base.dir}/idl"/>
+    <property name="idl.urd.build.dir" location="${idl.build.dir}/urd"/>
+    <property name="idl.rdb.build.dir" location="${idl.build.dir}/rdb"/>
+    <property name="idl.classes.build.dir" location="${idl.build.dir}/classes"/>
+    <property name="idl.javamaker.flag" location="${idl.build.dir}/idl.javamaker.flag"/>
+
+    <target name="idl" depends="idl-check,idl-javamaker"/>
+
+    <target name="idl-check">
+        <local name="idl.files.exist"/>
+        <condition property="idl.files.exist">
+            <resourcecount refid="idl.files" when="greater" count="0"/>
+        </condition>
+
+        <local name="idl.files.union"/>
+        <union id="idl.files.union" if:set="idl.files.exist">
+            <filelist refid="idl.files"/>
+        </union>
+        <uptodate property="idl.uptodate" targetfile="${idl.javamaker.flag}" if:set="idl.files.exist">
+            <srcresources refid="idl.files.union"/>
+        </uptodate>
+        <property name="idl.uptodate" value="true" unless:set="idl.files.exist"/>
+    </target>
+
+    <target name="idl-javamaker" depends="idl-regmerge" unless="idl.uptodate">
+        <mkdir dir="${idl.classes.build.dir}"/>
+        <exec executable="${OUTDIR}/bin/javamaker" failonerror="true">
+            <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <arg value="-O${idl.classes.build.dir}"/>
+            <arg value="-BUCR"/>
+            <arg value="-nD"/>
+            <arg value="${idl.rdb.build.dir}/registry.rdb"/>
+            <arg value="-X${OUTDIR}/bin/types.rdb"/>
+        </exec>
+        <touch file="${idl.javamaker.flag}"/>
+    </target>
+
+    <target name="idl-regmerge" depends="idl-idlc" unless="idl.uptodate">
+        <mkdir dir="${idl.rdb.build.dir}"/>
+        <delete file="${idl.rdb.build.dir}/registry.rdb"/>
+        <apply executable="${OUTDIR}/bin/regmerge" failonerror="true">
+            <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <arg value="${idl.rdb.build.dir}/registry.rdb"/>
+            <arg value="/UCR"/>
+            <fileset dir="${idl.urd.build.dir}" includes="**/*.urd"/>
+        </apply>
+    </target>
+
+    <target name="idl-idlc" unless="idl.uptodate">
+        <mkdir dir="${idl.urd.build.dir}"/>
+        <apply executable="${OUTDIR}/bin/idlc" failonerror="true">
+            <env key="LD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <env key="DYLD_LIBRARY_PATH" value="${OUTDIR}/lib"/>
+            <arg value="-I${OUTDIR}/idl"/>
+            <arg value="-O"/>
+            <arg value="${idl.urd.build.dir}"/>
+            <arg value="-verbose"/>
+            <arg value="-cid"/>
+            <arg value="-we"/>
+            <filelist refid="idl.files"/>
+        </apply>
+    </target>
+
+</project>
+
diff --git a/solenv/ant/manifest.empty b/solenv/ant/manifest.empty
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/solenv/ant/manifest.empty
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
new file mode 100644
index 000000000000..72b7e900f226
--- /dev/null
+++ b/solenv/gbuild/Ant.mk
@@ -0,0 +1,82 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+# Ant class
+
+gb_Ant_ANTCOMMAND := $(ANT)
+
+# clean target
+$(call gb_Ant_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),ANT,3)
+	$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_Ant_get_target,$*) $(call gb_Jar_get_outdir_target,$*) && \
+		$(gb_Ant_ANTCOMMAND) -f $(ANTBUILDFILE) clean)
+
+# the outdir target depends on the workdir target and is built by delivering the latter
+
+# rule for creating the jar file
+# creates the target folder of the jar file if it doesn't exist
+# creates the jar file
+$(call gb_Ant_get_target,%) : FORCE
+	$(call gb_Output_announce,$*,$(true),ANT,3)
+	$(call gb_Helper_abbreviate_dirs_native,\
+	mkdir -p $(dir $@) && \
+	$(gb_Ant_ANTCOMMAND) -f $(ANTBUILDFILE) )
+
+FORCE:
+
+
+# registers target and clean target
+# adds jar files to DeliverLogTarget
+# adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
+define gb_Ant_Ant
+$(call gb_Ant_get_target,$(1)) : ANTBUILDFILE := $(2)
+$(call gb_Ant_get_clean_target,$(1)) : ANTBUILDFILE := $(2)
+$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Ant_get_target,$(1)),$(1))
+$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
+
+endef
+
+
+# possible directories for jar files containing UNO services 
+gb_Ant_COMPONENTPREFIXES := \
+    OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/classes/ \
+    URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
+    INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
+
+# get component prefix from layer name ("OOO", "URE", "INTERN")
+gb_Ant__get_componentprefix = \
+    $(patsubst $(1):%,%,$(or \
+        $(filter $(1):%,$(gb_Ant_COMPONENTPREFIXES)), \
+        $(call gb_Output_error,no ComponentTarget native prefix for layer '$(1)')))
+
+# layer must be specified explicitly in this macro (different to libraries)
+define gb_Ant_set_componentfile
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Ant__get_componentprefix,$(3)),$(notdir $(call gb_Ant_get_target,$(1))))
+$(call gb_Ant_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Ant_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 19795bf58bbb..8ec415f0597a 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -45,6 +45,7 @@ endef
 # workdir target patterns
 
 gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
+gb_Ant_get_target = $(WORKDIR)/Ant/$(1).jar
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
 gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
@@ -109,6 +110,7 @@ endef
 
 $(eval $(call gb_Helper_make_clean_targets,\
 	AllLangResTarget \
+	Ant \
 	ComponentTarget \
 	JavaClassSet \
 	Jar \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0b39bb73afee..4770ae70fc71 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -254,6 +254,7 @@ include $(foreach class, \
 	CustomTarget \
 	PrecompiledHeaders \
 	GoogleTest \
+	Ant \
 	Jar \
 	JavaClassSet \
 	JunitTest \