gbuild: component files for Jars in NONE layer and move testComponent

... from URE to NONE.

Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7

Repository.mk

@@ -645,10 +645,6 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
 	unoloader \
 ))
 
-$(eval $(call gb_Helper_register_jars,URE, \
-	testComponent \
-))
-
 $(eval $(call gb_Helper_register_jars,OOO, \
 	ConnectivityTools \
 	ScriptFramework \
@@ -697,6 +693,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 	TestExtension \
 	test \
 	test-tools \
+	testComponent \
 ))
 endif
 

solenv/gbuild/Jar.mk

@@ -255,8 +255,9 @@ gb_Jar_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
     URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
     OXT:./ \
+	NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar) \
 
-# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
+# get component prefix from layer name ("OOO", "URE", "OXT", "NONE")
 gb_Jar__get_componentprefix = \
     $(patsubst $(1):%,%,$(or \
         $(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \

testtools/Jar_testComponent.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
 
-$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
+$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE))
 
 $(eval $(call gb_Jar_add_packagedirs,testComponent,\
     $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \