Extract SmoketestCommandEnvironment.java from juh.jar

...into a new smoketest.jar, so that URE juh.jar no longer depends on non-URE
unoil.jar.

Change-Id: I8937c78d8af6e2f82ada5dd80c322f8bca5ec2f5

Repository.mk

@@ -758,6 +758,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \
 	reportbuilder \
 	reportbuilderwizard \
 	sdbc_hsqldb \
+	smoketest \
 	table \
 	unoil \
 	web \

javaunohelper/Jar_juh.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Jar_Jar,juh))
 $(eval $(call gb_Jar_use_jars,juh,\
     jurt \
     ridl \
-    unoil \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,juh,com))
@@ -21,17 +20,13 @@ $(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../
 
 $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
 
-$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE))
-
 $(eval $(call gb_Jar_add_sourcefiles,juh,\
-    javaunohelper/com/sun/star/comp/JavaUNOHelperServices \
     javaunohelper/com/sun/star/comp/helper/Bootstrap \
     javaunohelper/com/sun/star/comp/helper/BootstrapException \
     javaunohelper/com/sun/star/comp/helper/ComponentContext \
     javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
     javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
     javaunohelper/com/sun/star/comp/helper/UnoInfo \
-    javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \
     javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
     javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
     javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \

javaunohelper/util/manifest

 Sealed: true
-RegistrationClassName: com.sun.star.comp.JavaUNOHelperServices
 UNO-Type-Path: 

postprocess/Rdb_services.mk

@@ -232,6 +232,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		xmerge/source/bridge/XMergeBridge \
 		scripting/java/ScriptFramework \
 		scripting/java/ScriptProviderForJava \
+		smoketest/org/libreoffice/smoketest/smoketest \
 		wizards/com/sun/star/wizards/form/form \
 		connectivity/source/drivers/hsqldb/hsqldb \
 		connectivity/source/drivers/jdbc/jdbc \

scp2/source/ooo/file_ooo.scp

@@ -311,6 +311,7 @@ End
 
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Report, report )
+STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest )
 STD_JAR_FILE( gid_File_Jar_Table, table )
 STD_JAR_FILE( gid_File_Jar_Form, form )
 STD_JAR_FILE( gid_File_Jar_Query, query )

scp2/source/ooo/module_hidden_ooo.scp

@@ -123,6 +123,7 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Accessbridge,
 	gid_File_Jar_Officebean,
 	gid_File_Jar_Report,
+	gid_File_Jar_Smoketest,
 	gid_File_Jar_Table,
 	gid_File_Jar_Letter,
 	gid_File_Jar_Form,

smoketest/Jar_smoketest.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Jar_Jar,smoketest))
+
+$(eval $(call gb_Jar_add_sourcefiles,smoketest, \
+    smoketest/org/libreoffice/smoketest/Services \
+    smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment \
+))
+
+$(eval $(call gb_Jar_set_componentfile,smoketest,smoketest/org/libreoffice/smoketest/smoketest,OOO))
+
+$(eval $(call gb_Jar_set_manifest,smoketest,$(SRCDIR)/smoketest/org/libreoffice/smoketest/manifest))
+
+$(eval $(call gb_Jar_set_packageroot,smoketest,org))
+
+$(eval $(call gb_Jar_use_jars,smoketest, \
+    juh \
+    ridl \
+    unoil \
+))
+
+# vim: set noet sw=4 ts=4:

smoketest/Module_smoketest.mk

@@ -23,6 +23,7 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Extension_TestExtension \
 	Jar_TestExtension \
+	Jar_smoketest \
 ))
 endif
 

smoketest/data/Basic/Standard/Test_Ext.xml

@@ -40,7 +40,7 @@ Sub TestExtensions
 
     'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for
     'adding the extension. The implementation is in
-    'javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar
+    'smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java and the code is in smoketest.jar
     cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment)
 
     'Create the component context and then get the singleton ExtensionManager

javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java → smoketest/org/libreoffice/smoketest/Services.java

@@ -15,19 +15,18 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-package com.sun.star.comp;
+
+package org.libreoffice.smoketest;
 
 import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.lang.XSingleComponentFactory;
-import com.sun.star.comp.juhtest.SmoketestCommandEnvironment;
-
 
 /** This class is the registration class for all services in this module.
  *
  * Note that not all files which can be used as service need to be registered
  * by this class.
  */
-public class JavaUNOHelperServices {
+public class Services {
 
      /**
      * Gives a factory for creating the service.

javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java → smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java

@@ -15,7 +15,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-package com.sun.star.comp.juhtest;
+
+package org.libreoffice.smoketest;
 
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.lib.uno.helper.WeakBase;

smoketest/org/libreoffice/smoketest/manifest

+Sealed: true
+RegistrationClassName: org.libreoffice.smoketest.Services
+UNO-Type-Path: 

javaunohelper/util/juh.component → smoketest/org/libreoffice/smoketest/smoketest.component

@@ -19,7 +19,7 @@
 
 <component loader="com.sun.star.loader.Java2"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.juhtest.SmoketestCommandEnvironment">
+  <implementation name="org.libreoffice.smoketest.SmoketestCommandEnvironment">
     <service name="com.sun.star.deployment.test.SmoketestCommandEnvironment"/>
   </implementation>
 </component>

ure/Rdb_ure.mk

@@ -30,7 +30,6 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Rdb_add_components,ure/services,\
-    javaunohelper/util/juh \
     stoc/source/javaloader/javaloader \
     stoc/source/javavm/javavm \
 ))