14 files changed, 44 insertions, 14 deletions

diff --git a/Repository.mk b/Repository.mk
index e04e7ec50d6b..0160fe72f3d4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -758,6 +758,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \
 	reportbuilder \
 	reportbuilderwizard \
 	sdbc_hsqldb \
+	smoketest \
 	table \
 	unoil \
 	web \
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 1df8c67ac57e..a4f1f4c9fbe7 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/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 \
diff --git a/javaunohelper/util/manifest b/javaunohelper/util/manifest
index 2620d3330912..f89dc5414f0c 100644
--- a/javaunohelper/util/manifest
+++ b/javaunohelper/util/manifest
@@ -1,3 +1,2 @@
 Sealed: true
-RegistrationClassName: com.sun.star.comp.JavaUNOHelperServices
 UNO-Type-Path: 
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index be86ff79d2aa..20354468c416 100644
--- a/postprocess/Rdb_services.mk
+++ b/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 \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a52f78b9dc7a..0579cff29741 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/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 )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index cd0c44f7ac65..858d06782d93 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/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,
diff --git a/smoketest/Jar_smoketest.mk b/smoketest/Jar_smoketest.mk
new file mode 100644
index 000000000000..2f0bca193901
--- /dev/null
+++ b/smoketest/Jar_smoketest.mk
@@ -0,0 +1,29 @@
+# -*- 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:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 340e391094d6..70f2a3e5257d 100644
--- a/smoketest/Module_smoketest.mk
+++ b/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
 
diff --git a/smoketest/data/Basic/Standard/Test_Ext.xml b/smoketest/data/Basic/Standard/Test_Ext.xml
index 29a68f8868ea..364a6a68402a 100644
--- a/smoketest/data/Basic/Standard/Test_Ext.xml
+++ b/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
diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/smoketest/org/libreoffice/smoketest/Services.java
index 7ed846e2b9a7..4f74769e1523 100644
--- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java
+++ b/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.
diff --git a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java b/smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment.java
index fa2cc18adab4..51c957adb0c5 100644
--- a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java
+++ b/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;
diff --git a/smoketest/org/libreoffice/smoketest/manifest b/smoketest/org/libreoffice/smoketest/manifest
new file mode 100644
index 000000000000..88cb26f5b6bb
--- /dev/null
+++ b/smoketest/org/libreoffice/smoketest/manifest
@@ -0,0 +1,3 @@
+Sealed: true
+RegistrationClassName: org.libreoffice.smoketest.Services
+UNO-Type-Path: 
diff --git a/javaunohelper/util/juh.component b/smoketest/org/libreoffice/smoketest/smoketest.component
index 5da5a702540b..fa7d8f100a05 100644
--- a/javaunohelper/util/juh.component
+++ b/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>
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index 84c1925aa5ef..1428923c521c 100644
--- a/ure/Rdb_ure.mk
+++ b/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 \
 ))