gbuildize javaunohelper

15 files changed, 388 insertions, 37 deletions

diff --git a/Repository.mk b/Repository.mk
index ec20e0a7d7d5..b6bde2fc266e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -269,6 +269,8 @@ endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     jpipe \
+    juh \
+    juhx \
     sal_textenc \
     sunjavaplugin \
 	xmlreader \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 64ab74807f06..fd649cabe5a8 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     i18npool \
     i18nutil \
     idl \
+    javaunohelper \
     jvmaccess \
     jurt \
     lingucomponent \
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
new file mode 100644
index 000000000000..142805d4bb21
--- /dev/null
+++ b/javaunohelper/Jar_juh.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,juh))
+
+$(eval $(call gb_Jar_add_jars,juh,\
+    $(OUTDIR)/bin/jurt.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,juh,com))
+
+$(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/RegistryServiceFactory \
+    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/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \
+    javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \
+    javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \
+    javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
+    javaunohelper/com/sun/star/lib/uno/helper/Factory \
+    javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
+    javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+    javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
+    javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \
+    javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \
+    javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
+    javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
new file mode 100644
index 000000000000..7c34479548da
--- /dev/null
+++ b/javaunohelper/Library_juh.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,juh))
+
+$(eval $(call gb_Library_add_package_headers,juh,\
+    javaunohelper_cppumaker \
+))
+
+$(eval $(call gb_Library_set_include,juh,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+))
+
+$(eval $(call gb_Library_add_api,juh,\
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juh,\
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,juh,\
+    javaunohelper/source/preload \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
new file mode 100644
index 000000000000..fe066b45065b
--- /dev/null
+++ b/javaunohelper/Library_juhx.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,juhx))
+
+$(eval $(call gb_Library_add_package_headers,juhx,\
+    javaunohelper_cppumaker \
+))
+
+$(eval $(call gb_Library_set_include,juhx,\
+    $$(INCLUDE) \
+    -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juhx,\
+    cppu \
+    cppuhelper \
+    jvmaccess \
+    sal \
+    salhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,juhx,\
+    javaunohelper/source/bootstrap \
+    javaunohelper/source/javaunohelper \
+    javaunohelper/source/vm \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/inc/makefile.mk b/javaunohelper/Makefile
index 072e7df13332..7bbbe6c703e6 100644
--- a/javaunohelper/inc/makefile.mk
+++ b/javaunohelper/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,16 +25,16 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=javaunohelper
-TARGET=inc
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-# --- Settings -----------------------------------------------------
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
new file mode 100644
index 000000000000..153f8b2a4e8e
--- /dev/null
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,javaunohelper))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,javaunohelper,\
+    Library_juh \
+    Library_juhx \
+    Jar_juh \
+    Package_cppumaker \
+    Zip_juh \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk
new file mode 100644
index 000000000000..5ab6664bde75
--- /dev/null
+++ b/javaunohelper/Package_cppumaker.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget/javaunohelper/cppumaker))
+
+$(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\
+	$(OUTDIR_FOR_BUILD)/bin/cppumaker \
+	$(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Zip_juh.mk b/javaunohelper/Zip_juh.mk
new file mode 100644
index 000000000000..e59c4cec4d5c
--- /dev/null
+++ b/javaunohelper/Zip_juh.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper))
+
+$(eval $(call gb_Zip_add_files,juh_src,\
+    com/sun/star/comp/JavaUNOHelperServices.java \
+    com/sun/star/comp/helper/Bootstrap.java \
+    com/sun/star/comp/helper/BootstrapException.java \
+    com/sun/star/comp/helper/ComponentContext.java \
+    com/sun/star/comp/helper/ComponentContextEntry.java \
+    com/sun/star/comp/helper/RegistryServiceFactory.java \
+    com/sun/star/comp/helper/SharedLibraryLoader.java \
+    com/sun/star/comp/helper/UnoInfo.java \
+    com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java \
+    com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java \
+    com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java \
+    com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java \
+    com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java \
+    com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java \
+    com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java \
+    com/sun/star/lib/uno/helper/ComponentBase.java \
+    com/sun/star/lib/uno/helper/Factory.java \
+    com/sun/star/lib/uno/helper/InterfaceContainer.java \
+    com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java \
+    com/sun/star/lib/uno/helper/PropertySet.java \
+    com/sun/star/lib/uno/helper/PropertySetMixin.java \
+    com/sun/star/lib/uno/helper/UnoUrl.java \
+    com/sun/star/lib/uno/helper/WeakAdapter.java \
+    com/sun/star/lib/uno/helper/WeakBase.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
new file mode 100644
index 000000000000..230daa002338
--- /dev/null
+++ b/javaunohelper/cppumaker/Makefile
@@ -0,0 +1,60 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done :
+	$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
+		-Tcom.sun.star.beans.NamedValue \
+		-Tcom.sun.star.beans.XPropertySet \
+		-Tcom.sun.star.container.XHierarchicalNameAccess \
+		-Tcom.sun.star.lang.DisposedException \
+		-Tcom.sun.star.lang.IllegalArgumentException \
+		-Tcom.sun.star.lang.XComponent \
+		-Tcom.sun.star.lang.XInitialization \
+		-Tcom.sun.star.lang.XMultiComponentFactory \
+		-Tcom.sun.star.lang.XMultiServiceFactory \
+		-Tcom.sun.star.lang.XServiceInfo \
+		-Tcom.sun.star.lang.XSingleComponentFactory \
+		-Tcom.sun.star.lang.XSingleServiceFactory \
+		-Tcom.sun.star.lang.XTypeProvider \
+		-Tcom.sun.star.loader.XImplementationLoader \
+		-Tcom.sun.star.registry.XRegistryKey \
+		-Tcom.sun.star.registry.XSimpleRegistry \
+		-Tcom.sun.star.uno.TypeClass \
+		-Tcom.sun.star.uno.XAggregation \
+		-Tcom.sun.star.uno.XComponentContext \
+		-Tcom.sun.star.uno.XWeak \
+		$(OUTDIR)/bin/udkapi.rdb) && \
+	touch $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/javaunohelper/prj/build.lst b/javaunohelper/prj/build.lst
index d97a6450d06a..f2fe76df0099 100644
--- a/javaunohelper/prj/build.lst
+++ b/javaunohelper/prj/build.lst
@@ -1,10 +1,3 @@
 jh  javaunohelper : LIBXSLT:libxslt bridges cppuhelper jurt ridljar unoil NULL
 jh	javaunohelper								usr1	-	all	jh_mkout NULL
-jh	javaunohelper\inc							nmake	-	all	jh_inc NULL
-jh	javaunohelper\com\sun\star\comp\helper		nmake	-	all	jh_helper jh_inc NULL
-jh	javaunohelper\com\sun\star\comp\juhtest		nmake	-	all	jh_juhtest jh_helper jh_libhelp NULL
-jh	javaunohelper\com\sun\star\comp			    nmake	-	all	jh_comp jh_juhtest NULL
-jh	javaunohelper\com\sun\star\lib\uno\adapter	nmake	-	all	jh_adapter jh_libhelp jh_inc NULL
-jh	javaunohelper\com\sun\star\lib\uno\helper	nmake	-	all	jh_libhelp jh_inc NULL
-jh	javaunohelper\source						nmake	-	all	jh_source jh_inc NULL
-jh	javaunohelper\util							nmake	-	all	jh_util jh_helper jh_source jh_adapter jh_libhelp jh_comp NULL
+jh	javaunohelper\prj							nmake	-	all	jh_prj NULL
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index 15e14f6c4601..e69de29bb2d1 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,7 +0,0 @@
-..\%__SRC%\class\juh.jar %_DEST%\bin\juh.jar
-..\%__SRC%\bin\juh*.dll %_DEST%\bin\juh*.dll
-..\%__SRC%\lib\libjuh*.so %_DEST%\lib\libjuh*.so
-..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib\libjuh*.dylib
-..\%__SRC%\misc\juh.component %_DEST%\xml\juh.component
-
-..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin\juh_src.zip
diff --git a/javaunohelper/prj/makefile.mk b/javaunohelper/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/javaunohelper/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 915d95660fbc..5f9f86aee25c 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -52,16 +52,12 @@ JAVA_PACKAGES=\
         $(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
 #        com.sun.star.beans \
 
-JAVA_SRC_FILES_BIN=\
-        $(JAVA_SRC_DIR)$/juh_src.zip
-
-JAVA_SRC_FILES_PCK=\
+JAVA_SRC_FILES=\
+        $(JAVA_SRC_DIR)$/juh_src.zip \
         $(JAVA_SRC_DIR)$/jurt_src.zip \
         $(JAVA_SRC_DIR)$/ridl_src.zip \
         $(JAVA_SRC_DIR)$/unoloader_src.zip
 
-JAVA_SRC_FILES=$(JAVA_SRC_FILES_BIN) $(JAVA_SRC_FILES_PCK)
-
 JAVA_BEAN_SRC_FILES=\
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/JavaWindowPeerFake.java \
@@ -105,12 +101,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_BIN) : $(SOLARCOMMONBINDIR)$/$$(@:f)
-    -$(MKDIRHIER) $(@:d)        
-    $(MY_COPY) $< $@
-    cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
-
-$(JAVA_SRC_FILES_PCK) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
     -$(MKDIRHIER) $(@:d)        
     $(MY_COPY) $< $@
     cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index 1f7589065e15..eff4cf666383 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -55,7 +55,7 @@ my_components = \
 my_components += \
     javaloader \
     javavm \
-    juh
+    component/javaunohelper/util/juh
 
 .ENDIF