From b8b775235639af6b9ef495831ab37eee211d325a Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Thu, 1 Jan 2015 17:11:13 +0100
Subject: [PATCH] Rename files and flows.

---
 ...argeo.tp.apache.ant.xml => apache.ant.xml} |   2 +-
 ....apache.commons.xml => apache.commons.xml} |  14 +-
 ...o.tp.apache.felix.xml => apache.felix.xml} |   0
 META-INF/spring/apache.jackrabbit.xml         |  36 +++++
 ...tp.apache.tomcat.xml => apache.tomcat.xml} |   2 +-
 META-INF/spring/distribution.xml              |  38 ++---
 ...geo.tp.equinox.xml => eclipse.equinox.xml} |   2 +-
 ...argeo.tp.gemini.xml => eclipse.gemini.xml} |   2 +-
 ...geo.tp.eclipse.ide.xml => eclipse.ide.xml} |   2 +-
 ...g.argeo.tp.jetty.xml => eclipse.jetty.xml} |   2 +-
 .../{org.argeo.tp.rap.xml => eclipse.rap.xml} |  14 +-
 .../{org.argeo.tp.javax.xml => javax.xml}     |  14 +-
 .../spring/{org.argeo.tp.xml => misc.xml}     |   6 +-
 .../spring/org.argeo.tp.apache.jackrabbit.xml | 136 ------------------
 ...pring.security.xml => spring.security.xml} |   2 +-
 .../{org.argeo.tp.spring.xml => spring.xml}   |   2 +-
 16 files changed, 87 insertions(+), 187 deletions(-)
 rename META-INF/spring/{org.argeo.tp.apache.ant.xml => apache.ant.xml} (95%)
 rename META-INF/spring/{org.argeo.tp.apache.commons.xml => apache.commons.xml} (90%)
 rename META-INF/spring/{org.argeo.tp.apache.felix.xml => apache.felix.xml} (100%)
 create mode 100644 META-INF/spring/apache.jackrabbit.xml
 rename META-INF/spring/{org.argeo.tp.apache.tomcat.xml => apache.tomcat.xml} (98%)
 rename META-INF/spring/{org.argeo.tp.equinox.xml => eclipse.equinox.xml} (96%)
 rename META-INF/spring/{org.argeo.tp.gemini.xml => eclipse.gemini.xml} (98%)
 rename META-INF/spring/{org.argeo.tp.eclipse.ide.xml => eclipse.ide.xml} (97%)
 rename META-INF/spring/{org.argeo.tp.jetty.xml => eclipse.jetty.xml} (97%)
 rename META-INF/spring/{org.argeo.tp.rap.xml => eclipse.rap.xml} (93%)
 rename META-INF/spring/{org.argeo.tp.javax.xml => javax.xml} (66%)
 rename META-INF/spring/{org.argeo.tp.xml => misc.xml} (95%)
 delete mode 100644 META-INF/spring/org.argeo.tp.apache.jackrabbit.xml
 rename META-INF/spring/{org.argeo.tp.spring.security.xml => spring.security.xml} (97%)
 rename META-INF/spring/{org.argeo.tp.spring.xml => spring.xml} (99%)

diff --git a/META-INF/spring/org.argeo.tp.apache.ant.xml b/META-INF/spring/apache.ant.xml
similarity index 95%
rename from META-INF/spring/org.argeo.tp.apache.ant.xml
rename to META-INF/spring/apache.ant.xml
index 9c85385..2a61571 100644
--- a/META-INF/spring/org.argeo.tp.apache.ant.xml
+++ b/META-INF/spring/apache.ant.xml
@@ -7,7 +7,7 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.ant" spec="spec.version">
+	<flow:flow name="apache/org.apache.ant" spec="spec.version">
 		<flow:arg name="version" value="1.9.2" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
diff --git a/META-INF/spring/org.argeo.tp.apache.commons.xml b/META-INF/spring/apache.commons.xml
similarity index 90%
rename from META-INF/spring/org.argeo.tp.apache.commons.xml
rename to META-INF/spring/apache.commons.xml
index e4b0162..04644a4 100644
--- a/META-INF/spring/org.argeo.tp.apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -7,42 +7,42 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.codec"
+	<flow:flow name="apache/org.apache.commons.codec"
 		spec="spec.commons">
 		<flow:arg name="project" value="codec" />
 		<flow:arg name="version" value="1.9" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.dbcp"
+	<flow:flow name="apache/org.apache.commons.dbcp"
 		spec="spec.commons">
 		<flow:arg name="project" value="pool" />
 		<flow:arg name="version" value="1.5.7" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.pool"
+	<flow:flow name="apache/org.apache.commons.pool"
 		spec="spec.commons">
 		<flow:arg name="project" value="pool" />
 		<flow:arg name="version" value="1.5.7" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.collections"
+	<flow:flow name="apache/org.apache.commons.collections"
 		spec="spec.commons">
 		<flow:arg name="project" value="collections" />
 		<flow:arg name="version" value="3.2.1" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.io"
+	<flow:flow name="apache/org.apache.commons.io"
 		spec="spec.commons">
 		<flow:arg name="project" value="io" />
 		<flow:arg name="version" value="2.4" />
 		<bean parent="template.commonsArchiveWrapper" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.fileupload"
+	<flow:flow name="apache/org.apache.commons.fileupload"
 		spec="spec.commons">
 		<flow:arg name="project" value="fileupload" />
 		<flow:arg name="version" value="1.3.1" />
@@ -69,7 +69,7 @@
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.httpclient"
+	<flow:flow name="apache/org.apache.commons.httpclient"
 		spec="spec.version">
 		<flow:arg name="version" value="3.1" />
 		<bean parent="template.commonsArchiveWrapper">
diff --git a/META-INF/spring/org.argeo.tp.apache.felix.xml b/META-INF/spring/apache.felix.xml
similarity index 100%
rename from META-INF/spring/org.argeo.tp.apache.felix.xml
rename to META-INF/spring/apache.felix.xml
diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
new file mode 100644
index 0000000..fb1b8b6
--- /dev/null
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+	<flow:flow name="apache/org.apache.jackrabbit"
+		spec="spec.version">
+		<flow:arg name="version" value="2.8.0" />
+		<bean id="org.apache.jackrabbit.api" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-api:@{version}" />
+		<bean id="org.apache.jackrabbit.jcr.commons" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-commons:@{version}" />
+		<bean id="org.apache.jackrabbit.spi" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi:@{version}" />
+		<bean id="org.apache.jackrabbit.spi.commons" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi-commons:@{version}" />
+		<bean id="org.apache.jackrabbit.data" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-data:@{version}" />
+		<bean id="org.apache.jackrabbit.core" parent="template.jackrabbitMaven"
+			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}" />
+	</flow:flow>
+
+	<bean id="template.jackrabbitMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.apache.jackrabbit" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<!-- <property name="doNotModify" value="true" /> -->
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/apache.tomcat.xml
similarity index 98%
rename from META-INF/spring/org.argeo.tp.apache.tomcat.xml
rename to META-INF/spring/apache.tomcat.xml
index 42f83ae..2dbe87f 100644
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/apache.tomcat.xml
@@ -60,7 +60,7 @@
 		<property name="groupId" value="org.argeo.tp.apache.tomcat" />
 	</bean>
 
-	<flow:flow name="org.argeo.tp.apache.tomcat/org.apache.tomcat"
+	<flow:flow name="apache/org.apache.tomcat"
 		spec="spec.version">
 		<flow:arg name="version" value="7.0.42" />
 		<bean parent="template.archiveWrapper">
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index d8a439c..26e8395 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,22 +13,22 @@
 		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
 		<property name="modules">
 			<list>
-				<ref bean="org.argeo.tp/org.apache.log4j" />
-				<ref bean="org.argeo.tp/org.slf4j" />
-				<!-- <ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" /> -->
+				<ref bean="misc/org.apache.log4j" />
+				<ref bean="misc/org.slf4j" />
+				<!-- <ref bean="apache.tomcat/org.apache.tomcat" /> -->
 				<ref bean="org.aopalliance" />
 				<ref bean="org.junit" />
-				<ref bean="org.argeo.tp/org.aspectj" />
-				<ref bean="org.argeo.tp.spring/org.springframework" />
-				<ref bean="org.argeo.tp.spring/org.springframework.security" />
-				<ref bean="org.argeo.tp.apache/org.apache.ant" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.io" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.fileupload" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.collections" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.dbcp" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.pool" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.codec" />
-				<ref bean="org.argeo.tp.apache/org.apache.commons.httpclient" />
+				<ref bean="misc/org.aspectj" />
+				<ref bean="spring/org.springframework" />
+				<ref bean="spring/org.springframework.security" />
+				<ref bean="apache/org.apache.ant" />
+				<ref bean="apache/org.apache.commons.io" />
+				<ref bean="apache/org.apache.commons.fileupload" />
+				<ref bean="apache/org.apache.commons.collections" />
+				<ref bean="apache/org.apache.commons.dbcp" />
+				<ref bean="apache/org.apache.commons.pool" />
+				<ref bean="apache/org.apache.commons.codec" />
+				<ref bean="apache/org.apache.commons.httpclient" />
 				<!-- Felix -->
 				<!-- <ref bean="org.apache.felix.framework" /> -->
 				<!-- <ref bean="org.apache.felix.bundlerepository" /> -->
@@ -36,16 +36,16 @@
 				<!-- <ref bean="org.apache.felix.gogo.runtime" /> -->
 				<!-- <ref bean="org.apache.felix.gogo.shell" /> -->
 				<!-- Eclipse -->
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.jetty" />
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.equinox" />
-				<ref bean="org.argeo.tp.eclipse/org.argeo.tp.gemini" />
+				<ref bean="eclipse/org.argeo.tp.jetty" />
+				<ref bean="eclipse/org.argeo.tp.equinox" />
+				<ref bean="eclipse/org.argeo.tp.gemini" />
 				<!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.core" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
 				<!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
 				<!-- Jackrabbit -->
-				<ref bean="org.argeo.tp.javax/javax.jcr" />
-				<ref bean="org.argeo.tp.apache/org.apache.jackrabbit" />
+				<ref bean="javax/javax.jcr" />
+				<ref bean="apache/org.apache.jackrabbit" />
 			</list>
 		</property>
 	</bean>
diff --git a/META-INF/spring/org.argeo.tp.equinox.xml b/META-INF/spring/eclipse.equinox.xml
similarity index 96%
rename from META-INF/spring/org.argeo.tp.equinox.xml
rename to META-INF/spring/eclipse.equinox.xml
index c1d8cb7..7a78d05 100644
--- a/META-INF/spring/org.argeo.tp.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- Equinox Kepler SR2 (3.9.1) -->
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.equinox"
+	<flow:flow name="eclipse/org.argeo.tp.equinox"
 		parent="template.importEquinox">
 		<!-- <flow:arg name="version" value="3.9.1" /> -->
 		<flow:arg name="equinoxRelease" value="KeplerSR2" />
diff --git a/META-INF/spring/org.argeo.tp.gemini.xml b/META-INF/spring/eclipse.gemini.xml
similarity index 98%
rename from META-INF/spring/org.argeo.tp.gemini.xml
rename to META-INF/spring/eclipse.gemini.xml
index 4e07217..f0309dd 100644
--- a/META-INF/spring/org.argeo.tp.gemini.xml
+++ b/META-INF/spring/eclipse.gemini.xml
@@ -57,7 +57,7 @@
 	</bean>
 
 	<!-- Gemini Blueprint -->
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.gemini"
+	<flow:flow name="eclipse/org.argeo.tp.gemini"
 		spec="spec.version">
 		<flow:arg name="version" value="1.0.2.RELEASE" />
 		<bean parent="template.archiveWrapper">
diff --git a/META-INF/spring/org.argeo.tp.eclipse.ide.xml b/META-INF/spring/eclipse.ide.xml
similarity index 97%
rename from META-INF/spring/org.argeo.tp.eclipse.ide.xml
rename to META-INF/spring/eclipse.ide.xml
index 20a533c..08c4866 100644
--- a/META-INF/spring/org.argeo.tp.eclipse.ide.xml
+++ b/META-INF/spring/eclipse.ide.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- RCP 3.8 -->
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.eclipse.ide_3.8.2"
+	<flow:flow name="eclipse/org.argeo.tp.eclipse.ide_3.8.2"
 		parent="template.eclipseIde">
 		<flow:arg name="version" value="3.8.2" />
 		<flow:arg name="release" value="R-3.8.2-201301310800" />
diff --git a/META-INF/spring/org.argeo.tp.jetty.xml b/META-INF/spring/eclipse.jetty.xml
similarity index 97%
rename from META-INF/spring/org.argeo.tp.jetty.xml
rename to META-INF/spring/eclipse.jetty.xml
index 0b44693..17dea18 100644
--- a/META-INF/spring/org.argeo.tp.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -7,7 +7,7 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.jetty"
+	<flow:flow name="eclipse/org.argeo.tp.jetty"
 		parent="template.importJettyZip">
 		<flow:arg name="jettyVersion" value="8.1.16.v20140903" />
 	</flow:flow>
diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/eclipse.rap.xml
similarity index 93%
rename from META-INF/spring/org.argeo.tp.rap.xml
rename to META-INF/spring/eclipse.rap.xml
index 15a1ec9..0000d26 100644
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -8,13 +8,13 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- RAP 2.2 -->
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0"
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0"
 		parent="template.importRapZip">
 		<flow:arg name="rapBranch" value="2.2" />
 		<flow:arg name="rapVersion" value="2.2.0-R-20131204-0942" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.2.0-M1"
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0-M1"
 		parent="template.importRapZip">
 		<flow:arg name="rapBranch" value="2.2" />
 		<flow:arg name="rapVersion" value="2.2.0-M1-20130821-1618" />
@@ -22,13 +22,13 @@
 
 	<!-- RAP ADDONS - experimental: use a zip that has been manually uploaded 
 		in the dist repo -->
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.addons_0.5.0"
+	<flow:flow name="eclipse/org.argeo.tp.rap.addons_0.5.0"
 		parent="template.importRapAddonsZip">
 		<flow:arg name="rapBranch" value="2.2" />
 		<flow:arg name="rapVersion" value="0.5.0.argeo.20141029" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.addons_0.2.0"
+	<flow:flow name="eclipse/org.argeo.tp.rap.addons_0.2.0"
 		parent="template.importRapAddonsZip">
 		<flow:arg name="rapBranch" value="2.2" />
 		<flow:arg name="rapVersion" value="0.2.0.20131212-1229" />
@@ -68,19 +68,19 @@
 
 
 	<!-- RAP 2.1 -->
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.2"
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.2"
 		parent="template.importRapZip">
 		<flow:arg name="rapBranch" value="2.1" />
 		<flow:arg name="rapVersion" value="2.1.2-R-20140210-0628" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-R"
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-R"
 		parent="template.importRapZip">
 		<flow:arg name="rapBranch" value="2.1" />
 		<flow:arg name="rapVersion" value="2.1.0-R-20130611-2139" />
 	</flow:flow>
 
-	<flow:flow name="org.argeo.tp.rap/org.argeo.tp.rap.platform_2.1.0-M1"
+	<flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-M1"
 		parent="template.importRapZip">
 		<flow:arg name="rapBranch" value="2.1" />
 		<flow:arg name="rapVersion" value="2.1.0-M1-20130318-2137" />
diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/javax.xml
similarity index 66%
rename from META-INF/spring/org.argeo.tp.javax.xml
rename to META-INF/spring/javax.xml
index a2bf71d..3a2ff20 100644
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/javax.xml
@@ -8,17 +8,17 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
 	<!-- REGISTER -->
-<!-- 	<bean id="javax.annotation" p:version="3.0.0" parent="template.javax" /> -->
-<!-- 	<bean id="javax.el" p:version="2.2.0" parent="template.javax" /> -->
-<!-- 	<bean id="javax.servlet" p:version="3.0.0" parent="template.javax" /> -->
-<!-- 	<bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" /> -->
+	<bean id="javax.annotation" p:version="3.0.0" parent="template.javax" />
+	<bean id="javax.el" p:version="2.2.0" parent="template.javax" />
+	<bean id="javax.servlet" p:version="3.0.0" parent="template.javax" />
+	<bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" />
 
-	<bean id="javax.inject" flow:as-flow="org.argeo.tp.javax/javax.inject"
+	<bean id="javax.inject" flow:as-flow="javax/javax.inject"
 		p:version="1.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.inject:javax.inject:1"
 		parent="template.mavenWrapper" />
 
-	<bean id="javax.jcr" flow:as-flow="org.argeo.tp.javax/javax.jcr"
-		p:version="2.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"
+	<bean id="javax.jcr" flow:as-flow="javax/javax.jcr" p:version="2.0.0"
+		p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"
 		parent="template.mavenWrapper" />
 
 	<!-- FACTORY -->
diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/misc.xml
similarity index 95%
rename from META-INF/spring/org.argeo.tp.xml
rename to META-INF/spring/misc.xml
index 2b325a5..08207c8 100644
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/misc.xml
@@ -53,7 +53,7 @@
 	</bean>
 
 	<!-- Log4j12 Factory -->
-	<flow:flow name="org.argeo.tp/org.apache.log4j" spec="spec.version">
+	<flow:flow name="misc/org.apache.log4j" spec="spec.version">
 		<flow:arg name="version" value="1.2.17" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
@@ -79,7 +79,7 @@
 	</flow:flow>
 
 	<!-- AspectJ Factory -->
-	<flow:flow name="org.argeo.tp/org.aspectj" spec="spec.version">
+	<flow:flow name="misc/org.aspectj" spec="spec.version">
 		<flow:arg name="version" value="1.7.3" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
@@ -101,7 +101,7 @@
 		<property name="groupId" value="org.argeo.tp" />
 	</bean>
 
-	<flow:flow name="org.argeo.tp/org.slf4j" spec="spec.version">
+	<flow:flow name="misc/org.slf4j" spec="spec.version">
 		<flow:arg name="version" value="1.7.5" />
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
diff --git a/META-INF/spring/org.argeo.tp.apache.jackrabbit.xml b/META-INF/spring/org.argeo.tp.apache.jackrabbit.xml
deleted file mode 100644
index 9b075cc..0000000
--- a/META-INF/spring/org.argeo.tp.apache.jackrabbit.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
-
-
-	<flow:flow name="org.argeo.tp.apache/org.apache.jackrabbit"
-		spec="spec.version">
-		<flow:arg name="version" value="2.8.0" />
-		<bean id="org.apache.jackrabbit.api" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-api:@{version}" />
-		<bean id="org.apache.jackrabbit.jcr.commons" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-jcr-commons:@{version}" />
-		<bean id="org.apache.jackrabbit.spi" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi:@{version}" />
-		<bean id="org.apache.jackrabbit.spi.commons" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-spi-commons:@{version}" />
-		<bean id="org.apache.jackrabbit.data" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-data:@{version}" />
-		<bean id="org.apache.jackrabbit.core" parent="template.jackrabbitMaven"
-			p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-core:@{version}" />
-	</flow:flow>
-
-	<bean id="template.jackrabbitMaven" parent="template.mavenWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.jackrabbit" />
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-		</property>
-		<!-- <property name="doNotModify" value="true" /> -->
-	</bean>
-
-	<!-- REGISTER -->
-	<bean id="org.apache.catalina" parent="template.org.apache.tomcat">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					javax.mail.*;resolution:=optional,
-					org.apache.juli.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.apache.jasper" parent="template.org.apache.tomcat">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					org.apache.juli.logging;resolution:=optional,
-					org.apache.tools.ant.*;resolution:=optional,
-					org.eclipse.jdt.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.apache.el" parent="template.org.apache.tomcat" />
-	<bean id="org.apache.coyote" parent="template.org.apache.tomcat">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					*,
-					org.apache.juli.logging;resolution:=optional,
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.apache.tomcat.api" parent="template.org.apache.tomcat" />
-	<bean id="org.apache.tomcat.util" parent="template.org.apache.tomcat">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					org.apache.juli.logging;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- FACTORY -->
-	<bean id="template.org.apache.tomcat" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.tomcat" />
-	</bean>
-
-	<flow:flow name="org.argeo.tp.apache.tomcat/org.apache.tomcat"
-		spec="spec.version">
-		<flow:arg name="version" value="7.0.42" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/bin/apache-tomcat-@{version}.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<!-- Tomcat -->
-					<entry key="apache-tomcat-@{version}/lib/catalina.jar"
-						value-ref="org.apache.catalina" />
-					<entry key="apache-tomcat-@{version}/lib/jasper.jar"
-						value-ref="org.apache.jasper" />
-					<entry key="apache-tomcat-@{version}/lib/jasper-el.jar"
-						value-ref="org.apache.el" />
-					<entry key="apache-tomcat-@{version}/lib/tomcat-coyote.jar"
-						value-ref="org.apache.coyote" />
-					<entry key="apache-tomcat-@{version}/lib/tomcat-api.jar"
-						value-ref="org.apache.tomcat.api" />
-					<entry key="apache-tomcat-@{version}/lib/tomcat-util.jar"
-						value-ref="org.apache.tomcat.util" />
-					<!-- Javax -->
-					<entry key="apache-tomcat-@{version}/lib/annotations-api.jar"
-						value-ref="javax.annotation" />
-					<entry key="apache-tomcat-@{version}/lib/el-api.jar"
-						value-ref="javax.el" />
-					<entry key="apache-tomcat-@{version}/lib/jsp-api.jar"
-						value-ref="javax.servlet.jsp" />
-					<entry key="apache-tomcat-@{version}/lib/servlet-api.jar"
-						value-ref="javax.servlet" />
-				</map>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/src/apache-tomcat-@{version}-src.zip" />
-					<property name="base" value="apache-tomcat-@{version}-src/java/" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.spring.security.xml b/META-INF/spring/spring.security.xml
similarity index 97%
rename from META-INF/spring/org.argeo.tp.spring.security.xml
rename to META-INF/spring/spring.security.xml
index 1f58bdd..c21f48d 100644
--- a/META-INF/spring/org.argeo.tp.spring.security.xml
+++ b/META-INF/spring/spring.security.xml
@@ -14,7 +14,7 @@
 		<property name="doNotModify" value="true" />
 	</bean>
 
-	<flow:flow name="org.argeo.tp.spring/org.springframework.security"
+	<flow:flow name="spring/org.springframework.security"
 		spec="spec.version">
 		<flow:arg name="version" value="3.2.5.RELEASE" />
 		<bean parent="template.archiveWrapper">
diff --git a/META-INF/spring/org.argeo.tp.spring.xml b/META-INF/spring/spring.xml
similarity index 99%
rename from META-INF/spring/org.argeo.tp.spring.xml
rename to META-INF/spring/spring.xml
index 4a3dab7..57057fd 100644
--- a/META-INF/spring/org.argeo.tp.spring.xml
+++ b/META-INF/spring/spring.xml
@@ -135,7 +135,7 @@
 		<property name="groupId" value="org.argeo.tp.spring" />
 	</bean>
 
-	<flow:flow name="org.argeo.tp.spring/org.springframework"
+	<flow:flow name="spring/org.springframework"
 		spec="spec.version">
 		<flow:arg name="version" value="3.2.4" />
 		<bean parent="template.archiveWrapper">
-- 
2.30.2