Make ure/source/uretest/ use defaultBootstrap_InitialComponentContext

...instead of the ure executable's obsolte -ro arguments (leading to usage of
deprecated bootstrap_InitialComponentContext with an XSimpleRegistry instead).

The com.sun.star.lang.MultiServiceFactory service is (only) implemented by the
cppuhelper/source/defaultbootstrap.cxx ServiceManager itself, but it doesn't add
itself to its list of know services, so cppmain.cc should not test for it.

Change-Id: Iaaf8d466fe3607ab9bac6aba09396809e53404f3

4 files changed, 27 insertions, 42 deletions

diff --git a/ure/source/uretest/JavaNative.java b/ure/source/uretest/JavaNative.java
index 7829f8c3a977..289f00909da0 100644
--- a/ure/source/uretest/JavaNative.java
+++ b/ure/source/uretest/JavaNative.java
@@ -23,9 +23,7 @@ import test.java.tester.Tester;
 
 public final class JavaNative {
     public static void main(String[] arguments) throws Exception {
-        Tester.test(
-            Bootstrap.defaultBootstrap_InitialComponentContext(
-                arguments[0], null));
+        Tester.test(Bootstrap.defaultBootstrap_InitialComponentContext());
     }
 
     private JavaNative() {}
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 8c399075d51a..8ff1c04cd58e 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -61,36 +61,35 @@ test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
             out.sdk/services.rdb
 	$(GCCS_COMPAT) uno \
             -c test.cpp.cppmain.Component -l $(URLPREFIX)$(cwd)/$< \
-            -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-            -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
-            -ro out.sdk/services.rdb
+            -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+            -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
 
 .PHONY: test-javatest
 test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
 	$(GCCS_COMPAT) uno \
             -c test.java.javamain.Component -l $(URLPREFIX)$(cwd)/$< \
-            -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-            -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
-            -ro out.sdk/services.rdb
+            -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+            -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
 
 .PHONY: test-javanative
 test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \
-            out.sdk/javanative.rc out.sdk/services.rdb out.sdk/types.rdb
-	$(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
-            $(URLPREFIX)$(cwd)/out.sdk/javanative.jar \
-            $(URLPREFIX)$(cwd)/out.sdk/javanative.rc
+            out.sdk/services.rdb out.sdk/types.rdb
+	URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+            URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
+            $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
+            $(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar
 
 do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \
     -l $(URLPREFIX)$(cwd)/out.sdk/cppserver.uno.$(SHAREDLIB_EXT) \
-    -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
-    -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" -ro out.sdk/services.rdb \
+    -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+    -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
     -u "uno:pipe,name=ure_test;urp;server" --singleaccept
 do_client = $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
     $(URLPREFIX)$(cwd)/out.sdk/javaclient.jar \
     "uno:pipe,name=ure_test;urp;server"
 .PHONY: test-clientserver
-test-clientserver: out.sdk/cppserver.uno.$(SHAREDLIB_EXT) out.sdk/runner.jar \
-            out.sdk/javaclient.jar
+test-clientserver: out.sdk/cppserver.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
+            out.sdk/services.rdb out.sdk/runner.jar out.sdk/javaclient.jar
 ifeq "$(PLATFORM)" "windows"
 	echo $(subst %,%%,$(do_server)) > out.sdk/server.bat
 	echo $(subst %,%%,$(do_client)) > out.sdk/client.bat
@@ -234,12 +233,6 @@ out.sdk/class/javanative/test/java/javanative/JavaNative.class: \
             -classpath "$(CLASSPATH)$(PATH_SEPARATOR)out.sdk/tester.jar" \
             -sourcepath . -d out.sdk/class/javanative $<
 
-out.sdk/javanative.rc: | out.sdk
-	echo $(qt2)URE_INTERNAL_LIB_DIR=$${$(subst :,\u003A,$(ure_unorc_url)):URE_INTERNAL_LIB_DIR}$(qt2) > $@
-	echo $(qt2)URE_INTERNAL_JAVA_DIR=$${$(subst :,\u003A,$(ure_unorc_url)):URE_INTERNAL_JAVA_DIR}$(qt2) >> $@
-	echo $(qt2)UNO_TYPES=$${$(subst :,\u003A,$(ure_unorc_url)):UNO_TYPES} $(URLPREFIX)$(cwd)/out.sdk/types.rdb$(qt2) >> $@
-	echo $(qt2)UNO_SERVICES=$${$(subst :,\u003A,$(ure_unorc_url)):UNO_SERVICES} $(URLPREFIX)$(cwd)/out.sdk/services.rdb$(qt2) >> $@
-
 
 out.sdk/javaclient.jar: \
             out.sdk/class/javaclient/test/java/javaclient/JavaClient.class \
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index fef981a10913..9ff84ec15309 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -40,31 +40,32 @@ test-regview: out.pln/types.rdb
 test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb
 	$(GCCS_COMPAT) $(URE_HOME)/bin/uno \
             -c test.cpp.cppmain.Component -l file://$(PWD)/$< \
-            -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-            -ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
+            -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+            -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
 
 .PHONY: test-javatest
 test-javatest: out.pln/javamain.uno.jar out.pln/types.rdb out.pln/services.rdb
 	$(GCCS_COMPAT) $(URE_HOME)/bin/uno \
             -c test.java.javamain.Component -l file://$(PWD)/$< \
-            -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-            -ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
+            -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+            -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
 
 .PHONY: test-javanative
 test-javanative: out.pln/runner.jar out.pln/javanative.jar \
-            out.pln/javanative.rc out.pln/services.rdb out.pln/types.rdb
-	$(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
+            out.pln/types.rdb out.pln/services.rdb
+	URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+            URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
+            $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
             -jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
-            file://$(PWD)/out.pln/javanative.jar \
-            file://$(PWD)/out.pln/javanative.rc
+            file://$(PWD)/out.pln/javanative.jar
 
 .PHONY: test-clientserver
-test-clientserver: out.pln/cppserver.uno.so out.pln/runner.jar \
-            out.pln/javaclient.jar
+test-clientserver: out.pln/cppserver.uno.so out.pln/types.rdb \
+            out.pln/services.rdb out.pln/runner.jar out.pln/javaclient.jar
 	$(GCCS_COMPAT) $(URE_HOME)/bin/uno -c test.cpp.cppserver.Component \
             -l file://$(PWD)/out.pln/cppserver.uno.so \
-            -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
-            -ro $(URE_HOME)/share/misc/services.rdb \
+            -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+            -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
             -u 'uno:pipe,name=ure_test;urp;server' --singleaccept &
 	sleep 5 && \
             java -jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
@@ -217,12 +218,6 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \
             $(URE_HOME)/share/java/juh.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/tester.jar \
             -sourcepath . -d out.pln/class/javanative $<
 
-out.pln/javanative.rc: | out.pln
-	echo 'URE_INTERNAL_LIB_DIR=$${file\u003A//$(URE_HOME)/lib/unorc:URE_INTERNAL_LIB_DIR}' > $@
-	echo 'URE_INTERNAL_JAVA_DIR=$${file\u003A//$(URE_HOME)/lib/unorc:URE_INTERNAL_JAVA_DIR}' >> $@
-	echo 'UNO_TYPES=$${file\u003A//$(URE_HOME)/lib/unorc:UNO_TYPES} file://$(PWD)/out.pln/types.rdb' >> $@
-	echo 'UNO_SERVICES=$${file\u003A//$(URE_HOME)/lib/unorc:UNO_SERVICES} file://$(PWD)/out.pln/services.rdb' >> $@
-
 
 out.pln/javaclient.jar: \
             out.pln/class/javaclient/test/java/javaclient/JavaClient.class \
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ab0c92d625cd..41fc255eb7e4 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -104,7 +104,6 @@ private:
         "com.sun.star.io.TextInputStream",
         "com.sun.star.io.TextOutputStream",
         "com.sun.star.java.JavaVirtualMachine",
-        "com.sun.star.lang.MultiServiceFactory",
         "com.sun.star.lang.RegistryServiceManager",
         "com.sun.star.lang.ServiceManager",
         "com.sun.star.loader.Java",