Wed Aug 15 12:49:49 PDT 2012

RepositoryExternal.mk                          |  158 +++++++++++++------------
 accessibility/Jar_uno_accessbridge.mk          |    4 
 connectivity/Jar_sdbc_hsqldb.mk                |   15 --
 filter/Jar_XSLTFilter.mk                       |    2 
 javaunohelper/Jar_juh.mk                       |    2 
 jurt/Jar_jurt.mk                               |    2 
 nlpsolver/Jar_nlpsolver.mk                     |    4 
 qadevOOo/Jar_OOoRunner.mk                      |    2 
 qadevOOo/Jar_OOoRunnerLight.mk                 |    2 
 reportbuilder/Jar_reportbuilder.mk             |   34 -----
 ridljar/CustomTarget_javamaker.mk              |    2 
 ridljar/Jar_ridl.mk                            |    6 
 scripting/Jar_ScriptProviderForBeanShell.mk    |    5 
 scripting/Jar_ScriptProviderForJava.mk         |    3 
 scripting/Jar_ScriptProviderForJavaScript.mk   |    5 
 smoketest/Jar_TestExtension.mk                 |    2 
 solenv/gbuild/Jar.mk                           |   30 +++-
 solenv/gbuild/JavaClassSet.mk                  |   22 +--
 swext/Jar_mediawiki.mk                         |   37 -----
 testtools/CustomTarget_bridgetest_javamaker.mk |    2 
 testtools/Jar_testComponent.mk                 |    6 
 unoil/Jar_unoil.mk                             |    2 
 unotest/Jar_test-tools.mk                      |    2 
 unotest/Jar_test.mk                            |    2 
 wizards/Jar_agenda.mk                          |    4 
 wizards/Jar_commonwizards.mk                   |    2 
 wizards/Jar_fax.mk                             |    4 
 wizards/Jar_form.mk                            |    4 
 wizards/Jar_letter.mk                          |    4 
 wizards/Jar_query.mk                           |    4 
 wizards/Jar_report.mk                          |    4 
 wizards/Jar_reportbuilder.mk                   |    5 
 wizards/Jar_table.mk                           |    4 
 wizards/Jar_web.mk                             |    4 
 xmerge/Jar_XMergeBridge.mk                     |    4 
 xmerge/Jar_xmerge.mk                           |    6 
 36 files changed, 142 insertions(+), 258 deletions(-)

New commits:
commit 84b330c8f6637e5eafb46bb075a91b9146666bc8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 21:45:53 2012 +0200

    xmerge: remove obsolete xalan stuff from manifest classpath
    
    It appears this came in to make it work with JREs < 1.4, i#58308.
    
    Change-Id: I6974e0fe7b94ecf1b577af064dcce8f017d0a31d

diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index dcd9edc..34f644c 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -38,13 +38,6 @@ $(eval $(call gb_Jar_use_jars,xmerge,\
 	$(OUTDIR)/bin/juh.jar \
 ))
 
-# FIXME: what is this stuff good for???
-$(eval $(call gb_Jar_add_manifest_classpath,xmerge,\
-	xml-apis.jar \
-	xercesImpl.jar \
-	serializer.jar \
-))
-
 $(eval $(call gb_Jar_set_packageroot,xmerge,org))
 
 $(eval $(call gb_Jar_add_sourcefiles,xmerge,\
commit 48210d0c70787d6240e9d3a1f30319b627d94556
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 21:25:58 2012 +0200

    wizards: remove silly saxon9.jar from manifest classpath:
    
    Apparently Xalan was introduced years ago to have a DOM implementation
    with JRE < 1.4 (i#37179), which then got automatically converted to
    saxon years later.
    
    Change-Id: Ibc13b84331854926965f35e3afe25e923bad821b

diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 6802c40..3e48e42 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -40,9 +40,6 @@ $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
 
 $(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
 
-# FIXME: what is this doing here?
-$(eval $(call gb_Jar_add_manifest_classpath,commonwizards,saxon9.jar))
-
 $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
 	wizards/com/sun/star/wizards/common/HelpIds	                		\
 	wizards/com/sun/star/wizards/common/Desktop	                		\
commit 999f7fb840b3cf1abd861d0fd402c70a4092454e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 20:28:41 2012 +0200

    swext: use gb_Jar_use_externals
    
    Change-Id: Ib62473d841bc9a66acde6529d3f63e3fd1a00928

diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index 277c17f..5707347 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -33,16 +33,12 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com))
 
 $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
 
-ifeq ($(SYSTEM_APACHE_COMMONS),YES)
-# FIXME: use gb_Jar_use_externals?
-# for the build
-$(eval $(call gb_Jar_use_jars,mediawiki,\
-	$(COMMONS_CODEC_JAR) \
-	$(COMMONS_LANG_JAR) \
-	$(COMMONS_HTTPCLIENT_JAR) \
-	$(COMMONS_LOGGING_JAR) \
+$(eval $(call gb_Jar_use_externals,mediawiki,\
+	commons-codec \
+	commons-lang \
+	commons-httpclient \
+	commons-logging \
 ))
-endif
 
 $(eval $(call gb_Jar_use_jars,mediawiki,\
 	$(OUTDIR)/bin/juh.jar \
@@ -51,15 +47,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\
 	$(OUTDIR)/bin/unoil.jar \
 ))
 
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Jar_use_jars,mediawiki,\
-	$(OUTDIR)/bin/commons-codec-1.3.jar \
-	$(OUTDIR)/bin/commons-lang-2.3.jar \
-	$(OUTDIR)/bin/commons-httpclient-3.1.jar \
-	$(OUTDIR)/bin/commons-logging-1.1.1.jar \
-))
-endif
-
 $(eval $(call gb_Jar_add_sourcefiles,mediawiki,\
 	swext/mediawiki/src/com/sun/star/wiki/EditPageParser \
 	swext/mediawiki/src/com/sun/star/wiki/Helper \
commit 666173b83c55cc400f296f66b559ae2723f23795
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 20:24:59 2012 +0200

    add hsqldb to RepositoryExternal.mk
    
    Change-Id: I9c038e6fd1c60e4ac77740c55a45439d813524e0

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39b7b73..fad7628 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1968,6 +1968,20 @@ endif # DESKTOP
 
 ### Jars ############################################################
 
+ifeq ($(SYSTEM_HSQLDB),YES)
+
+define gb_Jar__use_hsqldb
+$(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR))
+endef
+
+else # !SYSTEM_HSQLDB
+
+define gb_Jar__use_hsqldb
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/hsqldb.jar)
+endef
+
+endif # SYSTEM_HSQLDB
+
 ifeq ($(SYSTEM_SAXON),YES)
 
 define gb_Jar__use_saxon
diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 3f330e2..73bdb02 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -27,15 +27,9 @@
 
 $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
 
-ifeq ($(SYSTEM_HSQLDB),YES)
-$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
-	$(HSQLDB_JAR) \
+$(eval $(call gb_Jar_use_externals,sdbc_hsqldb,\
+	hsqldb \
 ))
-else
-$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
-	$(OUTDIR)/bin/hsqldb.jar \
-))
-endif
 
 # FIXME: is this really necessary?
 $(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\
commit cdbd6957a59183667f65dcb233bd9ddffd7b6e91
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 20:10:10 2012 +0200

    gbuild: remove most uses of gb_Jar_set_jarclasspath:
    
    With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest
    classpath automatically it is no longer necessary to call
    gb_Jar_set_jarclasspath manually except for the URE jars, which
    are apparently not supposed to be added automatically.
    
    Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29

diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
index 586f775..3cefaa8 100644
--- a/accessibility/Jar_uno_accessbridge.mk
+++ b/accessibility/Jar_uno_accessbridge.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Jar_set_packageroot,java_uno_accessbridge,org))
 
 $(eval $(call gb_Jar_set_manifest,java_uno_accessbridge,$(SRCDIR)/accessibility/bridge/org/openoffice/accessibility/manifest))
 
-$(eval $(call gb_Jar_set_jarclasspath,java_uno_accessbridge,\
-    $$(JARCLASSPATH) \
-))
-
 $(eval $(call gb_Jar_set_componentfile,java_uno_accessbridge,accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge,OOO))
 
 $(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\
diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index 34fcb7c..3f330e2 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -37,9 +37,8 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 ))
 endif
 
-$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
-	hsqldb.jar \
-	$(HSQLDB_JAR) \
+# FIXME: is this really necessary?
+$(eval $(call gb_Jar_add_manifest_classpath,sdbc_hsqldb,\
 	.. \
 ))
 
diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk
index 4816044..591b7e0 100644
--- a/filter/Jar_XSLTFilter.mk
+++ b/filter/Jar_XSLTFilter.mk
@@ -31,8 +31,6 @@ $(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTF
 
 $(eval $(call gb_Jar_set_manifest,XSLTFilter,$(SRCDIR)/filter/source/xsltfilter/Manifest))
 
-$(eval $(call gb_Jar_set_jarclasspath,XSLTFilter,saxon9.jar))
-
 $(eval $(call gb_Jar_set_packageroot,XSLTFilter,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,XSLTFilter,\
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 6ed9d23..0850708 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Jar_use_jars,juh,\
 
 $(eval $(call gb_Jar_set_packageroot,juh,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
+$(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../bin/))
 
 $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
 
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 9fbabec..1528c92 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Jar_set_packageroot,jurt,com))
 
 $(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
 
-$(eval $(call gb_Jar_set_jarclasspath,jurt, \
+$(eval $(call gb_Jar_add_manifest_classpath,jurt, \
     ridl.jar unoloader.jar ../../lib/ ../bin/))
 
 $(eval $(call gb_Jar_add_sourcefiles,jurt,\
diff --git a/nlpsolver/Jar_nlpsolver.mk b/nlpsolver/Jar_nlpsolver.mk
index a3db34a..8b0b3de 100644
--- a/nlpsolver/Jar_nlpsolver.mk
+++ b/nlpsolver/Jar_nlpsolver.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,nlpsolver,com))
 
 $(eval $(call gb_Jar_set_manifest,nlpsolver,$(SRCDIR)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Manifest.mf))
 
-$(eval $(call gb_Jar_set_jarclasspath,nlpsolver,\
-	EvolutionarySolver.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,nlpsolver,\
     nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/Registration \
     nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/PropertyInfo \
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 9ef3da9..6de3757 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG:= -g
 
 $(eval $(call gb_Jar_Jar,OOoRunner))
 
-$(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
+$(eval $(call gb_Jar_add_manifest_classpath,OOoRunner,\
 	ridl.jar \
 	unoil.jar \
 ))
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 1c58eef..9b79ddb 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -32,7 +32,7 @@ gb_JavaClassSet_JAVACDEBUG := -g
 
 $(eval $(call gb_Jar_Jar,OOoRunnerLight))
 
-$(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
+$(eval $(call gb_Jar_add_manifest_classpath,OOoRunnerLight,\
 	ridl.jar \
 	unoil.jar \
 ))
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 1f7159d..b3faf6e 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -50,40 +50,6 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\
 	sac \
 ))
 
-$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\
-	$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
-		$(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\
-		commons-logging-1.1.1.jar \
-	) \
-	$(if $(filter YES,$(SYSTEM_JFREEREPORT)),\
-		$(foreach jar,\
-			$(FLUTE_JAR) \
-			$(JFREEREPORT_JAR) \
-			$(LIBBASE_JAR) \
-			$(LIBFONTS_JAR) \
-			$(LIBFORMULA_JAR) \
-			$(LIBLAYOUT_JAR) \
-			$(LIBLOADER_JAR) \
-			$(LIBREPOSITORY_JAR) \
-			$(LIBSERIALIZER_JAR) \
-			$(LIBXML_JAR) \
-			$(SAC_JAR) \
-			,$(call gb_Helper_make_url,$(jar)) \
-		),\
-		flow-engine-0.9.4.jar \
-		flute-1.1.6.jar \
-		libbase-1.1.6.jar \
-		libfonts-1.1.6.jar \
-		libformula-1.1.7.jar \
-		liblayout-0.2.10.jar \
-		libloader-1.1.6.jar \
-		librepository-1.1.6.jar \
-		libserializer-1.1.6.jar \
-		libxml-1.1.7.jar \
-		sac.jar \
-	) \
-))
-
 $(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
 
 $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index dc6f4dc..228896d 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
-	ScriptFramework.jar \
-	$(if $(filter-out YES,$(SYSTEM_BSH)),bsh.jar) \
-))
-
 $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index bcff02d..74c9ddf 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -38,9 +38,6 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
 
 $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
 
-$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJava, \
-    ScriptFramework.jar))
-
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com))
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index 16c2cf4..84dfe83 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \
-	ScriptFramework.jar \
-	$(if $(filter-out YES,$(SYSTEM_RHINO)),js.jar) \
-))
-
 $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com))
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
index 8069efe..b318380 100644
--- a/smoketest/Jar_TestExtension.mk
+++ b/smoketest/Jar_TestExtension.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Jar_Jar,TestExtension))
 
 $(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\
+$(eval $(call gb_Jar_add_manifest_classpath,TestExtension,\
 	juh.jar \
 	jurt.jar \
 	ridl.jar \
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 88616a3..1b9b370 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -162,7 +162,8 @@ endef
 
 # JARCLASSPATH is the class path that is written to the manifest of the jar
 define gb_Jar_set_jarclasspath
-$(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2)
+$$(call gb_Output_error,\
+ gb_Jar_set_jarclasspath: use gb_Jar_add_manifest_classpath instead.)
 
 endef
 
@@ -185,10 +186,14 @@ $$(call gb_Output_error,\
  gb_Jar_add_jar: use gb_Jar_use_jar instead.)
 endef
 
+# these are not added to manifest classpath
+gb_Jar_default_jars := unoloader ridl jurt unoil juh java_uno
+
 # remember: classpath is "inherited" to ClassSet
 define gb_Jar_use_jar
 $(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))
+$(if $(filter-out $(gb_Jar_default_jars),$(basename $(notdir $(2)))),\
+  $(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))))
 
 endef
 
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index 0fc4fee..277c17f 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -42,20 +42,6 @@ $(eval $(call gb_Jar_use_jars,mediawiki,\
 	$(COMMONS_HTTPCLIENT_JAR) \
 	$(COMMONS_LOGGING_JAR) \
 ))
-# Class-Path: in MANIFEST.MF
-$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
-	$(COMMONS_CODEC_JAR) \
-	$(COMMONS_LANG_JAR) \
-	$(COMMONS_HTTPCLIENT_JAR) \
-	$(COMMONS_LOGGING_JAR) \
-))
-else
-$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
-	commons-codec-1.3.jar \
-	commons-lang-2.3.jar \
-	commons-httpclient-3.1.jar \
-	commons-logging-1.1.1.jar \
-))
 endif
 
 $(eval $(call gb_Jar_use_jars,mediawiki,\
diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
index f68b5a2..23be655 100644
--- a/unotest/Jar_test-tools.mk
+++ b/unotest/Jar_test-tools.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Jar_Jar,test-tools))
 
-$(eval $(call gb_Jar_set_jarclasspath,test-tools,\
+$(eval $(call gb_Jar_add_manifest_classpath,test-tools,\
 	juh.jar \
 	ridl.jar \
 	unoil.jar \
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index 6c4e4aa..9f718cc 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Jar_Jar,test))
 
-$(eval $(call gb_Jar_set_jarclasspath,test,\
+$(eval $(call gb_Jar_add_manifest_classpath,test,\
 	juh.jar \
 	ridl.jar \
 	unoil.jar \
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
index 3d61f3b..03ef000 100644
--- a/wizards/Jar_agenda.mk
+++ b/wizards/Jar_agenda.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Jar_use_jars,agenda,\
 
 $(eval $(call gb_Jar_set_manifest,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,agenda,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_set_packageroot,agenda,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,agenda,\
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index 19c8bdc..6802c40 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -40,7 +40,8 @@ $(eval $(call gb_Jar_set_packageroot,commonwizards,com))
 
 $(eval $(call gb_Jar_set_manifest,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards/common/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,commonwizards,saxon9.jar))
+# FIXME: what is this doing here?
+$(eval $(call gb_Jar_add_manifest_classpath,commonwizards,saxon9.jar))
 
 $(eval $(call gb_Jar_add_sourcefiles,commonwizards,\
 	wizards/com/sun/star/wizards/common/HelpIds	                		\
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
index a25a20a..96a7fbb 100644
--- a/wizards/Jar_fax.mk
+++ b/wizards/Jar_fax.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,fax,com))
 
 $(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,fax,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,fax,\
 	wizards/com/sun/star/wizards/fax/CallWizard \
 	wizards/com/sun/star/wizards/fax/CGFax \
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index 54e4908..bd4cdba 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,form,$(SRCDIR)/wizards/com/sun/star/wizards/fo
 
 $(eval $(call gb_Jar_set_packageroot,form,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,form,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,form,\
 	wizards/com/sun/star/wizards/form/CallFormWizard \
 	wizards/com/sun/star/wizards/form/DataEntrySetter \
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
index 4d6133e..63d1105 100644
--- a/wizards/Jar_letter.mk
+++ b/wizards/Jar_letter.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,letter,$(SRCDIR)/wizards/com/sun/star/wizards/
 
 $(eval $(call gb_Jar_set_packageroot,letter,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,letter,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,letter,\
 	wizards/com/sun/star/wizards/letter/CallWizard \
 	wizards/com/sun/star/wizards/letter/CGLetter \
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 000ce7d..1c9496f 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -40,10 +40,6 @@ $(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/q
 
 $(eval $(call gb_Jar_set_packageroot,query,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,query,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,query,\
 	wizards/com/sun/star/wizards/query/CallQueryWizard \
 	wizards/com/sun/star/wizards/query/Finalizer \
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index b9660dd..5fd3d26 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_manifest,report,$(SRCDIR)/wizards/com/sun/star/wizards/
 
 $(eval $(call gb_Jar_set_packageroot,report,com))
 
-$(eval $(call gb_Jar_set_jarclasspath,report,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,report,\
 	wizards/com/sun/star/wizards/report/CallReportWizard \
 	wizards/com/sun/star/wizards/report/Dataimport \
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index d190874..9148d34 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -42,11 +42,6 @@ $(eval $(call gb_Jar_set_packageroot,reportbuilderwizard,com))
 
 $(eval $(call gb_Jar_set_manifest,reportbuilderwizard,$(SRCDIR)/wizards/com/sun/star/wizards/reportbuilder/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,reportbuilderwizard,\
-	commonwizards.jar \
-	report.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,reportbuilderwizard,\
 	wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation \
 	wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn \
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index 7bc9102..ba1608c 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,table,com))
 
 $(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,table,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,table,\
 	wizards/com/sun/star/wizards/table/CallTableWizard \
 	wizards/com/sun/star/wizards/table/CGCategory \
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
index a31a2f6..085c769 100644
--- a/wizards/Jar_web.mk
+++ b/wizards/Jar_web.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Jar_set_packageroot,web,com))
 
 $(eval $(call gb_Jar_set_manifest,web,$(SRCDIR)/wizards/com/sun/star/wizards/web/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_jarclasspath,web,\
-	commonwizards.jar \
-))
-
 $(eval $(call gb_Jar_add_sourcefiles,web,\
 	wizards/com/sun/star/wizards/web/AbstractErrorHandler \
 	wizards/com/sun/star/wizards/web/BackgroundsDialog \
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index a346b05..5bc4c03 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/ma
 
 $(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class))
 
-$(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\
-	xmerge.jar \
-))
-
 $(eval $(call gb_Jar_use_jars,XMergeBridge,\
 	$(OUTDIR)/bin/xmerge.jar \
 	$(OUTDIR)/bin/unoil.jar \
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 27de50b..dcd9edc 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -38,7 +38,8 @@ $(eval $(call gb_Jar_use_jars,xmerge,\
 	$(OUTDIR)/bin/juh.jar \
 ))
 
-$(eval $(call gb_Jar_set_jarclasspath,xmerge,\
+# FIXME: what is this stuff good for???
+$(eval $(call gb_Jar_add_manifest_classpath,xmerge,\
 	xml-apis.jar \
 	xercesImpl.jar \
 	serializer.jar \
commit 8b8e749fae45ba41e361897b447173fb6a26eb38
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 19:44:26 2012 +0200

    gbuild: remove horrible abuses of gb_Jar_use_jars:
    
    Let gb_JavaClassSet_use_customtarget add the customtarget workdir to the
    classpath.
    
    Change-Id: I836e890b43bb2ca06d19cf9f83a5fa8f735cf963

diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index d9b3a7b..3486d91 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -36,6 +36,6 @@ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
 		| $(ridljar_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR)/class $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR) $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index e245225..7005081 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -31,14 +31,10 @@ $(eval $(call gb_Jar_use_customtargets,ridl,\
     ridljar/javamaker \
 ))
 
-$(eval $(call gb_Jar_use_jars,ridl,\
-    $(WORKDIR)/CustomTarget/ridljar/javamaker/class \
-))
-
 $(eval $(call gb_Jar_set_packageroot,ridl,com))
 
 $(eval $(call gb_Jar_add_packagedirs,ridl,\
-    $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \
+    $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,ridl,\
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index d0c03e7..67e48e6 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -195,6 +195,7 @@ endef
 define gb_JavaClassSet_use_customtarget
 $(call gb_JavaClassSet_get_preparation_target,$(1)) : \
 	$(call gb_CustomTarget_get_target,$(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
 
 endef
 
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index e509e04..d55126a 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -34,6 +34,6 @@ $(testtools_JAVADIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
 	$(call gb_Executable_get_target_for_build,javamaker) | $(testtools_JAVADIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -BUCR -nD -O$(testtools_JAVADIR) -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 12dfe3f..498edd5 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -36,10 +36,6 @@ $(eval $(call gb_Jar_use_customtargets,testComponent,\
     testtools/bridgetest_javamaker \
 ))
 
-$(eval $(call gb_Jar_use_jars,testComponent,\
-    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class \
-))
-
 $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
@@ -47,7 +43,7 @@ $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star
 $(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
 
 $(eval $(call gb_Jar_add_packagedirs,testComponent,\
-    $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
+    $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,testComponent,\
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
index 1044453..f53c4b4 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Jar_use_customtargets,unoil,\
 ))
 
 $(eval $(call gb_Jar_add_packagedirs,unoil,\
-    $(WORKDIR)/CustomTarget/unoil/javamaker/com \
+    $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 96410b9e04c1da1f634c3a4ab1ffba335309e46e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 19:43:20 2012 +0200

    gbuild: s/gb_JavaClassSet_set_classpath/gb_JavaClassSet_add_classpath/
    
    Change-Id: I549888fcfe08d83101e414de86e8c9db1357d6eb

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 5aae766..88616a3 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -94,7 +94,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
 $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
-$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
+$(call gb_JavaClassSet_add_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
 $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
 $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
@@ -156,8 +156,8 @@ $(foreach sourcefile,$(2),$(call gb_Jar_add_generated_sourcefile,$(1),$(sourcefi
 endef
 
 define gb_JarTest_set_classpath
-$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2))
-
+$$(call gb_Output_error,\
+ gb_JarTest_set_classpath: use gb_JavaClassSet_add_classpath instead.)
 endef
 
 # JARCLASSPATH is the class path that is written to the manifest of the jar
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 11b67cd..d0c03e7 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -104,7 +104,12 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_generated_sourcefile,$(1),$
 endef
 
 define gb_JavaClassSet_set_classpath
-$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)
+$$(call gb_Output_error,\
+ gb_JavaClassSet_set_classpath: use gb_JavaClassSet_add_classpath instead.)
+endef
+
+define gb_JavaClassSet_add_classpath
+$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
 
 endef
 
@@ -118,7 +123,7 @@ endef
 define gb_JavaClassSet_use_jar
 $(call gb_JavaClassSet_get_target,$(1)) : $(2)
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)
-$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(2))
 $(2) :| $(gb_Helper_PHONY)
 
 endef
@@ -130,7 +135,7 @@ $$(call gb_Output_error,\
 endef
 
 define gb_JavaClassSet_use_system_jar
-$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2))
+$(call gb_JavaClassSet_add_classpath,$(1),$(2))
 
 endef
 
@@ -168,7 +173,7 @@ endef
 define gb_JavaClassSet_use_jar_classset
 $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2)))
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2)))
-$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2)))
+$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))))
 
 endef
 
commit a455126868f466b8f0e6b3a354dbe88770258913
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 15 17:41:25 2012 +0200

    gbuild: refactor external jar handling:
    
    Using a system jar should really put the system jar onto the manifest
    class-path, but that is currently difficult because externals are used
    by JavaClassSet and not Jar; fortunately it seems nobody uses
    gb_JavaClassSet_use_external directly so move the implementation to
    gb_Jar_use_external.
    
    Change-Id: Ieac480b3dec0ad39d2404b0a64b641eaf73c1e4a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4b8bfe9..39b7b73 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1970,28 +1970,28 @@ endif # DESKTOP
 
 ifeq ($(SYSTEM_SAXON),YES)
 
-define gb_JavaClassSet__use_saxon
-$(call gb_JavaClassSet_use_system_jar,$(1),$(SAXON_JAR))
+define gb_Jar__use_saxon
+$(call gb_Jar_use_system_jar,$(1),$(SAXON_JAR))
 endef
 
 else # !SYSTEM_SAXON
 
-define gb_JavaClassSet__use_saxon
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
+define gb_Jar__use_saxon
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
 endef
 
 endif # SYSTEM_SAXON
 
 ifeq ($(SYSTEM_BSH),YES)
 
-define gb_JavaClassSet__use_bsh
-$(call gb_JavaClassSet_use_system_jar,$(1),$(BSH_JAR))
+define gb_Jar__use_bsh
+$(call gb_Jar_use_system_jar,$(1),$(BSH_JAR))
 endef
 
 else # !SYSTEM_BSH
 
-define gb_JavaClassSet__use_bsh
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+define gb_Jar__use_bsh
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/bsh.jar)
 endef
 
 endif # SYSTEM_BSH
@@ -1999,52 +1999,52 @@ endif # SYSTEM_BSH
 
 ifeq ($(SYSTEM_RHINO),YES)
 
-define gb_JavaClassSet__use_rhino
-$(call gb_JavaClassSet_use_system_jar,$(1),$(RHINO_JAR))
+define gb_Jar__use_rhino
+$(call gb_Jar_use_system_jar,$(1),$(RHINO_JAR))
 endef
 
 else # !SYSTEM_RHINO
 
-define gb_JavaClassSet__use_rhino
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/js.jar)
+define gb_Jar__use_rhino
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/js.jar)
 endef
 
 endif # SYSTEM_RHINO
 
 ifeq ($(SYSTEM_APACHE_COMMONS),YES)
 
-define gb_JavaClassSet__use_commons-codec
-$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_CODEC_JAR))
+define gb_Jar__use_commons-codec
+$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR))
 endef
 
-define gb_JavaClassSet__use_commons-httpclient
-$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR))
+define gb_Jar__use_commons-httpclient
+$(call gb_Jar_use_system_jar,$(1),$(COMMONS_HTTPCLIENT_JAR))
 endef
 
-define gb_JavaClassSet__use_commons-lang
-$(call gb_JavaClassSet_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR))
+define gb_Jar__use_commons-lang
+$(call gb_Jar_usadd_linked_libse_system_jar,$(1),$(COMMONS_LANG_JAR))
 endef
 
-define gb_JavaClassSet__use_commons-logging
-$(call gb_JavaClassSet_use_system_jar,$(1),$(COMMONS_LOGGING_JAR))
+define gb_Jar__use_commons-logging
+$(call gb_Jar_use_system_jar,$(1),$(COMMONS_LOGGING_JAR))
 endef
 
 else # !SYSTEM_APACHE_COMMONS
 
-define gb_JavaClassSet__use_commons-codec
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar)
+define gb_Jar__use_commons-codec
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-codec-1.3.jar)
 endef
 
-define gb_JavaClassSet__use_commons-httpclient
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
+define gb_Jar__use_commons-httpclient
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
 endef
 
-define gb_JavaClassSet__use_commons-lang
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar)
+define gb_Jar__use_commons-lang
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-lang-2.3.jar)
 endef
 
-define gb_JavaClassSet__use_commons-logging
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar)
+define gb_Jar__use_commons-logging
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/commons-logging-1.1.1.jar)
 endef
 
 endif # SYSTEM_APACHE_COMMONS
@@ -2052,94 +2052,94 @@ endif # SYSTEM_APACHE_COMMONS
 
 ifeq ($(SYSTEM_JFREEREPORT),YES)
 
-define gb_JavaClassSet__use_flow-engine
-$(call gb_JavaClassSet_use_system_jar,$(1),$(JFREEREPORT_JAR))
+define gb_Jar__use_flow-engine
+$(call gb_Jar_use_system_jar,$(1),$(JFREEREPORT_JAR))
 endef
 
-define gb_JavaClassSet__use_flute
-$(call gb_JavaClassSet_use_system_jar,$(1),$(FLUTE_JAR))
+define gb_Jar__use_flute
+$(call gb_Jar_use_system_jar,$(1),$(FLUTE_JAR))
 endef
 
-define gb_JavaClassSet__use_libbase
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBBASE_JAR))
+define gb_Jar__use_libbase
+$(call gb_Jar_use_system_jar,$(1),$(LIBBASE_JAR))
 endef
 
-define gb_JavaClassSet__use_libfonts
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBFONTS_JAR))
+define gb_Jar__use_libfonts
+$(call gb_Jar_use_system_jar,$(1),$(LIBFONTS_JAR))
 endef
 
-define gb_JavaClassSet__use_libformula
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBFORMULA_JAR))
+define gb_Jar__use_libformula
+$(call gb_Jar_use_system_jar,$(1),$(LIBFORMULA_JAR))
 endef
 
-define gb_JavaClassSet__use_liblayout
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBLAYOUT_JAR))
+define gb_Jar__use_liblayout
+$(call gb_Jar_use_system_jar,$(1),$(LIBLAYOUT_JAR))
 endef
 
-define gb_JavaClassSet__use_libloader
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBLOADER_JAR))
+define gb_Jar__use_libloader
+$(call gb_Jar_use_system_jar,$(1),$(LIBLOADER_JAR))
 endef
 
-define gb_JavaClassSet__use_librepository
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBREPOSITORY_JAR))
+define gb_Jar__use_librepository
+$(call gb_Jar_use_system_jar,$(1),$(LIBREPOSITORY_JAR))
 endef
 
-define gb_JavaClassSet__use_libserializer
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBSERIALIZER_JAR))
+define gb_Jar__use_libserializer
+$(call gb_Jar_use_system_jar,$(1),$(LIBSERIALIZER_JAR))
 endef
 
-define gb_JavaClassSet__use_libxml
-$(call gb_JavaClassSet_use_system_jar,$(1),$(LIBXML_JAR))
+define gb_Jar__use_libxml
+$(call gb_Jar_use_system_jar,$(1),$(LIBXML_JAR))
 endef
 
-define gb_JavaClassSet__use_sac
-$(call gb_JavaClassSet_use_system_jar,$(1),$(SAC_JAR))
+define gb_Jar__use_sac
+$(call gb_Jar_use_system_jar,$(1),$(SAC_JAR))
 endef
 
 else # !SYSTEM_JFREEREPORT
 
-define gb_JavaClassSet__use_flow-engine
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.4.jar)
+define gb_Jar__use_flow-engine
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flow-engine-0.9.4.jar)
 endef
 
-define gb_JavaClassSet__use_flute
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/flute-1.1.6.jar)
+define gb_Jar__use_flute
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/flute-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_libbase
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libbase-1.1.6.jar)
+define gb_Jar__use_libbase
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libbase-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_libfonts
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libfonts-1.1.6.jar)
+define gb_Jar__use_libfonts
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libfonts-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_libformula
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libformula-1.1.7.jar)
+define gb_Jar__use_libformula
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libformula-1.1.7.jar)
 endef
 
-define gb_JavaClassSet__use_liblayout
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/liblayout-0.2.10.jar)
+define gb_Jar__use_liblayout
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/liblayout-0.2.10.jar)
 endef
 
-define gb_JavaClassSet__use_libloader
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libloader-1.1.6.jar)
+define gb_Jar__use_libloader
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libloader-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_librepository
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/librepository-1.1.6.jar)
+define gb_Jar__use_librepository
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/librepository-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_libserializer
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libserializer-1.1.6.jar)
+define gb_Jar__use_libserializer
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libserializer-1.1.6.jar)
 endef
 
-define gb_JavaClassSet__use_libxml
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/libxml-1.1.7.jar)
+define gb_Jar__use_libxml
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/libxml-1.1.7.jar)
 endef
 
-define gb_JavaClassSet__use_sac
-$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/sac.jar)
+define gb_Jar__use_sac
+$(call gb_Jar_use_jar,$(1),$(OUTDIR)/bin/sac.jar)
 endef
 
 endif # SYSTEM_JFREEREPORT
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index b85681b..5aae766 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -166,6 +166,11 @@ $(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2)
 
 endef
 
+define gb_Jar_add_manifest_classpath
+$(call gb_Jar_get_target,$(1)) : JARCLASSPATH += $(2)
+
+endef
+
 # provide a manifest template containing jar specific information to be written into the manifest
 # it will be appended to the standard content that is written in the build command explicitly
 # the jar file gets a dependency to the manifest template
@@ -183,6 +188,7 @@ endef
 # remember: classpath is "inherited" to ClassSet
 define gb_Jar_use_jar
 $(call gb_JavaClassSet_use_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))
 
 endef
 
@@ -193,6 +199,7 @@ endef
 
 define gb_Jar_use_system_jar
 $(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2)))
 
 endef
 
@@ -203,7 +210,7 @@ endef
 
 # specify jars with imported modules
 define gb_Jar_use_jars
-$(call gb_JavaClassSet_use_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar)))
 
 endef
 
@@ -217,13 +224,17 @@ $(call gb_JavaClassSet_use_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)
 
 endef
 
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(eval $(call gb_Jar_use_external,jar,external))
 define gb_Jar_use_external
-$(call gb_JavaClassSet_use_external,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(if $(value gb_Jar__use_$(2)),\
+  $(call gb_Jar__use_$(2),$(1)),\
+  $(error gb_Jar_use_external: unknown external: $(2)))
 
 endef
 
 define gb_Jar_use_externals
-$(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(foreach external,$(2),$(call gb_Jar_use_external,$(1),$(external)))
 
 endef
 
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 7198331..11b67cd 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -172,13 +172,9 @@ $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_C
 
 endef
 
-# this forwards to functions that must be defined in RepositoryExternal.mk.
-# $(eval $(call gb_LinkTarget_use_external,library,external))
 define gb_JavaClassSet_use_external
-$(if $(value gb_JavaClassSet__use_$(2)),\
-  $(call gb_JavaClassSet__use_$(2),$(1)),\
-  $(error gb_JavaClassSet_use_external: unknown external: $(2)))
-
+$$(call gb_Output_error,\
+ gb_JavaClassSet_use_external: use gb_Jar_use_external instead.)
 endef
 
 define gb_JavaClassSet_use_externals
