Java cleanup, rename folders and packages to make them match

Also fix some compile errors. I suspect this is dead code, but on the chance
that it might be useful.....

Change-Id: I0d56df88420ce484b72df626db4fadcebe04d777

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug107753_Test.java → bridges/test/java_remote/Bug107753_Test.java

@@ -16,16 +16,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #107753#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug108825_Test.java → bridges/test/java_remote/Bug108825_Test.java

@@ -16,16 +16,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #108825#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug110892_Test.java → bridges/test/java_remote/Bug110892_Test.java

@@ -16,10 +16,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
@@ -27,6 +26,7 @@ import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
 import util.WaitUnreachable;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #110892#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug111153_Test.java → bridges/test/java_remote/Bug111153_Test.java

@@ -16,16 +16,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #111153#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug114133_Test.java → bridges/test/java_remote/Bug114133_Test.java

@@ -16,14 +16,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
 import util.WaitUnreachable;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #114133#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug51323_Test.java → bridges/test/java_remote/Bug51323_Test.java

@@ -16,18 +16,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XBridgeFactory;
 import com.sun.star.bridge.XInstanceProvider;
 import com.sun.star.connection.Connector;
 import com.sun.star.connection.XConnection;
-import com.sun.star.lib.TestBed;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
 import util.WaitUnreachable;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #i51323#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug92174_Test.java → bridges/test/java_remote/Bug92174_Test.java

@@ -16,16 +16,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 public final class Bug92174_Test extends ComplexTestCase {
     public String[] getTestMethodNames() {

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug97697_Test.java → bridges/test/java_remote/Bug97697_Test.java

@@ -16,17 +16,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #97697#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/Bug98508_Test.java → bridges/test/java_remote/Bug98508_Test.java

@@ -16,14 +16,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lib.TestBed;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #98508#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/MethodIdTest.java → bridges/test/java_remote/MethodIdTest.java

@@ -16,16 +16,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /**
  * Test case for bug #111153#.

bridges/test/com/sun/star/lib/uno/bridges/java_remote/PolyStructTest.java → bridges/test/java_remote/PolyStructTest.java

@@ -16,10 +16,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MemberTypeInfo;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.ParameterTypeInfo;
@@ -31,6 +30,7 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 public final class PolyStructTest extends ComplexTestCase {
     public String[] getTestMethodNames() {

bridges/test/com/sun/star/lib/uno/bridges/java_remote/StopMessageDispatcherTest.java → bridges/test/java_remote/StopMessageDispatcherTest.java

@@ -16,17 +16,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib.uno.bridges.java_remote;
+package test.java_remote;
 
 import com.sun.star.bridge.XInstanceProvider;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.uno.XInterface;
 import complexlib.ComplexTestCase;
+import test.lib.TestBed;
 
 /* This test has to detect whether the spawned client process hangs, which can
  * not be done reliably.  As an approximation, it waits for 10 sec and considers

bridges/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk → bridges/test/java_remote/makefile.mk

@@ -20,7 +20,7 @@ PRJ := ..$/..$/..$/..$/..$/..$/..$/..
 PRJNAME := bridges
 TARGET := test_com_sun_star_lib_uno_bridges_javaremote
 
-PACKAGE := com$/sun$/star$/lib$/uno$/bridges$/javaremote
+PACKAGE := test$/javaremote
 JAVATESTFILES := \
     Bug51323_Test.java \
     Bug92174_Test.java \

bridges/test/java_uno/acquire/TestAcquire.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package test.javauno.acquire;
+package test.java_uno.acquire;
 
 import com.sun.star.bridge.UnoUrlResolver;
 import com.sun.star.bridge.XBridgeFactory;

bridges/test/java_uno/acquire/makefile.mk

@@ -29,7 +29,7 @@ PRJ := ..$/..$/..
 PRJNAME := bridges
 
 TARGET := test_javauno_acquire
-PACKAGE := test$/javauno$/acquire
+PACKAGE := test$/java_uno$/acquire
 
 ENABLE_EXCEPTIONS := TRUE
 

bridges/test/java_uno/acquire/types.idl

@@ -18,7 +18,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module test { module javauno { module acquire {
+module test { module java_uno { module acquire {
 
 interface XBase: com::sun::star::uno::XInterface {};
 

bridges/test/java_uno/any/TestAny.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package test.java_uno.anytest;
+package test.java_uno.any;
 
 import com.sun.star.uno.Any;
 import com.sun.star.uno.Enum;
@@ -24,6 +24,8 @@ import com.sun.star.uno.Type;
 import com.sun.star.uno.TypeClass;
 import com.sun.star.uno.XInterface;
 import java.lang.reflect.Array;
+// "any" is a reserved word in IDL, so we need to use a different packagename
+import test.java_uno.anytest.*;
 
 final class TestAny {
     public static boolean test(XTransport transport, boolean createTypes) {

bridges/test/java_uno/any/TestJni.java

@@ -16,7 +16,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package test.java_uno.anytest;
+package test.java_uno.any;
+
+//"any" is a reserved word in IDL, so we need to use a different packagename
+import test.java_uno.anytest.*;
 
 public class TestJni
 {

bridges/test/java_uno/any/TestRemote.java

@@ -16,12 +16,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package test.java_uno.anytest;
+package test.java_uno.any;
 
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lib.TestBed;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
+import test.lib.TestBed;
+
+//"any" is a reserved word in IDL, so we need to use a different packagename
+import test.java_uno.anytest.*;
 
 public final class TestRemote {
     public static void main(String[] args) throws Exception {

bridges/test/java_uno/any/makefile.mk

@@ -20,7 +20,7 @@ PRJ = ..$/..$/..
 PRJNAME = bridges
 TARGET = test_javauno_any
 
-PACKAGE = test$/java_uno$/anytest
+PACKAGE = test$/java_uno$/any
 
 ENABLE_EXCEPTIONS = TRUE
 

bridges/test/java_uno/equals/TestEquals.java

@@ -27,7 +27,6 @@ import com.sun.star.connection.XAcceptor;
 import com.sun.star.connection.XConnection;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.lib.TestBed;
 import com.sun.star.lib.uno.typeinfo.MethodTypeInfo;
 import com.sun.star.lib.uno.typeinfo.TypeInfo;
 import com.sun.star.loader.XImplementationLoader;
@@ -38,6 +37,7 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Hashtable;
+import test.lib.TestBed;
 
 // In this test scenario, the Java server (see implementation of method
 // notifyAccepting) has a remote bridge to the Java client and a local JNI

bridges/test/java_uno/nativethreadpool/Relay.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package test.javauno.nativethreadpool;
+package test.java_uno.nativethreadpool;
 
 import com.sun.star.bridge.BridgeExistsException;
 import com.sun.star.bridge.XBridgeFactory;

bridges/test/java_uno/nativethreadpool/makefile.mk

@@ -29,7 +29,7 @@ PRJ := ..$/..$/..
 PRJNAME := bridges
 
 TARGET := test_javauno_nativethreadpool
-PACKAGE := test$/javauno$/nativethreadpool
+PACKAGE := test$/java_uno$/nativethreadpool
 
 ENABLE_EXCEPTIONS := TRUE
 

bridges/test/java_uno/nativethreadpool/types.idl

@@ -18,7 +18,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module test { module javauno { module nativethreadpool {
+module test { module java_uno { module nativethreadpool {
 
 interface XSource: com::sun::star::uno::XInterface {
     long get();

bridges/test/com/sun/star/lib/TestBed.java → bridges/test/lib/TestBed.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package com.sun.star.lib;
+package test.lib;
 
 import com.sun.star.bridge.XBridge;
 import com.sun.star.bridge.XBridgeFactory;

bridges/test/com/sun/star/lib/makefile.mk → bridges/test/lib/makefile.mk

@@ -20,7 +20,7 @@ PRJ := ..$/..$/..$/..$/..
 PRJNAME := bridges
 TARGET := test_com_sun_star_lib
 
-PACKAGE := com$/sun$/star$/lib
+PACKAGE := test$/lib
 JAVAFILES := TestBed.java
 JARFILES := juh.jar jurt.jar ridl.jar
 

bridges/test/makefile.mk

@@ -39,7 +39,7 @@ UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb  $(BIN)$/test.rdb
 # output directory (one dir for each project)
 UNOUCROUT=$(OUT)$/inc
 
-# adding to inludeoath
+# adding to includepath
 INCPRE+=$(UNOUCROUT)
 CFLAGS += -I..$/source$/remote$/urp
 

bridges/test/testclient.java

@@ -16,6 +16,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+package test;
+
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.IBridge;
 import com.sun.star.connection.XConnector;
@@ -97,7 +99,7 @@ public class testclient
 
                 com.sun.star.comp.servicemanager.ServiceManager smgr =
                     new com.sun.star.comp.servicemanager.ServiceManager();
-                smgr.addFactories( new String[] { "com.sun.star.comp.connections.Connector" });
+                smgr.insert( "com.sun.star.comp.connections.Connector" );
 
                 Object  x  = smgr.createInstance("com.sun.star.connection.Connector");
                 if( x == null )