From: mbaudier <mbaudier@argeo.org>
Date: Thu, 1 Jan 2015 16:11:13 +0000 (+0100)
Subject: Rename files and flows.
X-Git-Tag: v2.3.9~134
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=b8b775235639af6b9ef495831ab37eee211d325a

Rename files and flows.
---

diff --git a/META-INF/spring/apache.ant.xml b/META-INF/spring/apache.ant.xml
new file mode 100644
index 0000000..2a61571
--- /dev/null
+++ b/META-INF/spring/apache.ant.xml
@@ -0,0 +1,44 @@
+<?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.ant" spec="spec.version">
+		<flow:arg name="version" value="1.9.2" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="apache-ant-@{version}/lib/ant.jar">
+						<bean id="org.apache.ant" parent="template.org.apache.ant" />
+					</entry>
+					<entry key="apache-ant-@{version}/lib/ant-launcher.jar">
+						<bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
+					</entry>
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/ant/source/apache-ant-@{version}-src.zip" />
+					<property name="base" value="apache-ant-@{version}/src/main/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<!-- Specs and templates -->
+	<bean id="template.org.apache.ant" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.apache.ant" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
new file mode 100644
index 0000000..04644a4
--- /dev/null
+++ b/META-INF/spring/apache.commons.xml
@@ -0,0 +1,126 @@
+<?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.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="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="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="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="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="apache/org.apache.commons.fileupload"
+		spec="spec.commons">
+		<flow:arg name="project" value="fileupload" />
+		<flow:arg name="version" value="1.3.1" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-@{project}-@{version}-bin/lib/commons-@{project}-@{version}.jar">
+						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons" />
+					</entry>
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
+					<property name="base"
+						value="commons-@{project}-@{version}-src/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="apache/org.apache.commons.httpclient"
+		spec="spec.version">
+		<flow:arg name="version" value="3.1" />
+		<bean parent="template.commonsArchiveWrapper">
+			<property name="version" value="@{version}.0" />
+			<property name="uri"
+				value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/binary/commons-httpclient-@{version}.zip" />
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-httpclient-@{version}/commons-httpclient-@{version}.jar">
+						<bean id="org.apache.commons.httpclient" parent="template.org.apache.commons" />
+					</entry>
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-@{version}-src.zip" />
+					<property name="base" value="commons-httpclient-@{version}/src/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<!-- Specs and templates -->
+	<flow:spec id="spec.commons">
+		<flow:primitive name="version" isParameter="true" />
+		<flow:primitive name="project" isParameter="true" />
+	</flow:spec>
+
+	<bean id="template.commonsArchiveWrapper" parent="template.archiveWrapper"
+		abstract="true">
+		<property name="version" value="@{version}" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="uri"
+			value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
+		<property name="wrappers">
+			<map>
+				<entry
+					key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+					<bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="template.org.apache.commons" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.apache.commons" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/apache.felix.xml b/META-INF/spring/apache.felix.xml
new file mode 100644
index 0000000..4019764
--- /dev/null
+++ b/META-INF/spring/apache.felix.xml
@@ -0,0 +1,39 @@
+<?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">
+
+	<!-- REGISTER -->
+	<bean id="org.apache.felix.framework" p:version="4.2.1"
+		parent="template.org.apache.felix">
+	</bean>
+	<bean id="org.apache.felix.bundlerepository" p:version="1.6.6"
+		parent="template.org.apache.felix">
+	</bean>
+	<bean id="org.apache.felix.gogo.command" p:version="0.12.0"
+		parent="template.org.apache.felix">
+	</bean>
+	<bean id="org.apache.felix.gogo.runtime" p:version="0.10.0"
+		parent="template.org.apache.felix">
+	</bean>
+	<bean id="org.apache.felix.gogo.shell" p:version="0.10.0"
+		parent="template.org.apache.felix">
+	</bean>
+
+	<!-- FACTORY -->
+	<!-- TODO sources -->
+	<bean id="template.org.apache.felix" class="org.argeo.slc.repo.osgi.UriWrapper"
+		abstract="true">
+		<property name="baseUri" value="http://archive.apache.org/dist/felix" />
+		<property name="groupId" value="org.argeo.tp.apache.felix" />
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="osgiFactory" ref="osgiFactory" />
+	</bean>
+</beans>
\ No newline at end of file
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/apache.tomcat.xml b/META-INF/spring/apache.tomcat.xml
new file mode 100644
index 0000000..2dbe87f
--- /dev/null
+++ b/META-INF/spring/apache.tomcat.xml
@@ -0,0 +1,109 @@
+<?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">
+
+	<!-- 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="apache/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/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/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
new file mode 100644
index 0000000..7a78d05
--- /dev/null
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -0,0 +1,41 @@
+<?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-0.12.xsd">
+
+	<!-- Equinox Kepler SR2 (3.9.1) -->
+	<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" />
+		<flow:arg name="equinoxTimestamp" value="201402211700" />
+	</flow:flow>
+
+	<!-- Equinox specs and templates -->
+	<flow:spec id="equinoxVersion.spec">
+		<!-- <flow:primitive name="version" isParameter="true" /> -->
+		<flow:primitive name="equinoxRelease" isParameter="true" />
+		<flow:primitive name="equinoxTimestamp" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.importEquinox" spec="equinoxVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/org.eclipse.osgi_*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.osgi.equinox.security_*.jar"
+						value="org.argeo.tp.equinox" />
+				</map>
+			</property>
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/eclipse.gemini.xml b/META-INF/spring/eclipse.gemini.xml
new file mode 100644
index 0000000..f0309dd
--- /dev/null
+++ b/META-INF/spring/eclipse.gemini.xml
@@ -0,0 +1,85 @@
+<?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">
+
+	<!-- REGISTER -->
+	<!-- Gemini Blueprint -->
+	<bean id="org.eclipse.gemini.blueprint.core" parent="template.gemini" />
+	<bean id="org.eclipse.gemini.blueprint.extender" parent="template.gemini" />
+	<bean id="org.eclipse.gemini.blueprint.io" parent="template.gemini" />
+
+	<!-- Gemini Web -->
+	<!-- <flow:flow name="org.argeo.tp.gemini/org.gemini.web" -->
+	<!-- spec="spec.version"> -->
+	<!-- <flow:arg name="version" value="2.2.2.RELEASE" /> -->
+	<!-- <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven" -->
+	<!-- p:version="@{version}" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core:@{version}" 
+		/> -->
+	<!-- <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven" -->
+	<!-- p:version="@{version}" -->
+	<!-- p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender:@{version}" 
+		/> -->
+	<!-- <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven" -->
+	<!-- p:version="@{version}" -->
+	<!-- p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat:@{version}" 
+		/> -->
+	<!-- </flow:flow> -->
+
+	<!-- <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven" -->
+	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core" 
+		/> -->
+	<!-- <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven" -->
+	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender" 
+		/> -->
+	<!-- <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven" -->
+	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat" 
+		/> -->
+
+
+	<!-- FACTORY -->
+	<bean id="template.gemini" parent="template.bndWrapper" abstract="true">
+		<property name="groupId" value="org.argeo.tp.gemini" />
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="template.geminiMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.gemini" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<!-- Gemini Blueprint -->
+	<flow:flow name="eclipse/org.argeo.tp.gemini"
+		spec="spec.version">
+		<flow:arg name="version" value="1.0.2.RELEASE" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/blueprint/gemini-blueprint-@{version}.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry
+						key="gemini-blueprint-@{version}/dist/gemini-blueprint-core-@{version}.jar"
+						value-ref="org.eclipse.gemini.blueprint.core" />
+					<entry
+						key="gemini-blueprint-@{version}/dist/gemini-blueprint-extender-@{version}.jar"
+						value-ref="org.eclipse.gemini.blueprint.extender" />
+					<entry
+						key="gemini-blueprint-@{version}/dist/gemini-blueprint-io-@{version}.jar"
+						value-ref="org.eclipse.gemini.blueprint.io" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/eclipse.ide.xml b/META-INF/spring/eclipse.ide.xml
new file mode 100644
index 0000000..08c4866
--- /dev/null
+++ b/META-INF/spring/eclipse.ide.xml
@@ -0,0 +1,83 @@
+<?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-0.12.xsd">
+
+	<!-- RCP 3.8 -->
+	<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" />
+	</flow:flow>
+
+	<!-- RAP specs and templates -->
+	<flow:spec id="spec.eclipseIde">
+		<flow:primitive name="version" isParameter="true" />
+		<flow:primitive name="release" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.eclipseIde" spec="spec.eclipseIde"
+		abstract="true">
+		<!-- IDE -->
+		<!-- Using Windows because we cannot yet deal with tar.gz --><!-- <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> -->
+		<!-- <property name="version" value="@{version}" /> -->
+		<!-- <property name="mavenGroupIndexes" value="true" /> -->
+		<!-- <property name="uri" -->
+		<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/@{release}/eclipse-SDK-@{version}-win32.zip" 
+			/> -->
+		<!-- <property name="includes"> -->
+		<!-- <map> -->
+		<!-- <entry key="eclipse/plugins/*.jar" value="org.argeo.tp.eclipse.ide" 
+			/> -->
+		<!-- </map> -->
+		<!-- </property> -->
+		<!-- <property name="osgiFactory" ref="osgiFactory.eclipseIde" /> -->
+		<!-- </bean> -->
+
+		<!-- RCP (platform + OS specific binaries) -->
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{version}" />
+			<property name="mavenGroupIndexes" value="true" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/eclipse/downloads/drops/@{release}/org.eclipse.rcp.source-@{version}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rcp.platform" />
+				</map>
+			</property>
+			<property name="osgiFactory" ref="osgiFactory.eclipseIde" />
+		</bean>
+	</flow:flow>
+
+	<bean id="osgiFactory.eclipseIde" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+		init-method="init" destroy-method="destroy">
+		<property name="workspace" value="eclipse-ide-3.8" />
+		<property name="mirrors">
+			<map>
+				<entry key="http://www.eclipse.org/downloads">
+					<list>
+						<value>http://mirror.netcologne.de/eclipse</value>
+						<value>http://mirror.selfnet.de/eclipse</value>
+						<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
+					</list>
+				</entry>
+			</map>
+		</property>
+
+		<property name="nodeIndexers">
+			<list>
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+				<bean class="org.argeo.slc.repo.JarFileIndexer" />
+				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+			</list>
+		</property>
+		<property name="javaRepository" ref="javaRepository" />
+		<property name="distRepository" ref="distRepository" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
new file mode 100644
index 0000000..17dea18
--- /dev/null
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -0,0 +1,52 @@
+<?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-0.12.xsd">
+
+	<flow:flow name="eclipse/org.argeo.tp.jetty"
+		parent="template.importJettyZip">
+		<flow:arg name="jettyVersion" value="8.1.16.v20140903" />
+	</flow:flow>
+
+	<!-- Jetty specs and templates -->
+	<flow:spec id="jettyVersion.spec">
+		<flow:primitive name="jettyVersion" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.importJettyZip" spec="jettyVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="includes">
+				<map>
+					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-*.jar"
+						value="org.argeo.tp.jetty" />
+					<entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
+						value="org.argeo.tp.javax" />
+				</map>
+			</property>
+			<property name="excludes">
+				<list>
+					<value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
+				</list>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
new file mode 100644
index 0000000..0000d26
--- /dev/null
+++ b/META-INF/spring/eclipse.rap.xml
@@ -0,0 +1,176 @@
+<?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-0.12.xsd">
+
+	<!-- RAP 2.2 -->
+	<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="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" />
+	</flow:flow>
+
+	<!-- RAP ADDONS - experimental: use a zip that has been manually uploaded 
+		in the dist repo -->
+	<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="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" />
+	</flow:flow>
+
+	<flow:flow id="template.importRapAddonsZip" spec="rapVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{rapVersion}" />
+			<property name="mavenGroupIndexes" value="true" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-addons-@{rapVersion}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" />
+				</map>
+			</property>
+			<property name="osgiFactory">
+				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+					init-method="init" destroy-method="destroy">
+					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
+
+					<property name="nodeIndexers">
+						<list>
+							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+							<bean class="org.argeo.slc.repo.JarFileIndexer" />
+							<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+							<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+						</list>
+					</property>
+					<property name="javaRepository" ref="javaRepository" />
+					<property name="distRepository" ref="distRepository" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+
+	<!-- RAP 2.1 -->
+	<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="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="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" />
+	</flow:flow>
+
+	<!-- RAP specs and templates -->
+	<flow:spec id="rapVersion.spec">
+		<flow:primitive name="rapBranch" isParameter="true" />
+		<flow:primitive name="rapVersion" isParameter="true" />
+	</flow:spec>
+
+	<flow:flow id="template.importRapZip" spec="rapVersion.spec"
+		abstract="true">
+		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+			<property name="version" value="@{rapVersion}" />
+			<property name="mavenGroupIndexes" value="true" />
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" />
+			<property name="includes">
+				<map>
+					<entry key="plugins/*.jar" value="org.argeo.tp.rap.platform" />
+				</map>
+			</property>
+			<property name="osgiFactory">
+				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
+					init-method="init" destroy-method="destroy">
+					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
+					<property name="mirrors">
+						<map>
+							<entry key="http://www.eclipse.org/downloads">
+								<list>
+									<value>http://mirror.netcologne.de/eclipse</value>
+									<value>http://mirror.selfnet.de/eclipse</value>
+									<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
+								</list>
+							</entry>
+						</map>
+					</property>
+
+					<property name="nodeIndexers">
+						<list>
+							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+							<bean class="org.argeo.slc.repo.JarFileIndexer" />
+							<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+							<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+						</list>
+					</property>
+					<property name="javaRepository" ref="javaRepository" />
+					<property name="distRepository" ref="distRepository" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+
+
+
+	<!-- WORK IN PROGRESS add bundle from the incubator to the platform <flow:flow 
+		id="org.argeo.tp.rap.addons/org.argeo.tp.rap.dropdown_2.2" spec="rapVersion.spec" 
+		abstract="true"> <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" 
+		value="0.2.0.20131212-1229" /> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> 
+		<property name="version" value="@{rapVersion}" /> <property name="mavenGroupIndexes" 
+		value="true" /> <property name="uri" value="file:///tmp/" /> <property name="includes"> 
+		<map> <entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" /> </map> 
+		</property> <property name="osgiFactory"> <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" 
+		init-method="init" destroy-method="destroy"> <property name="workspace" value="eclipse-rap-@{rapBranch}" 
+		/> <property name="mirrors"> <map> <entry key="http://www.eclipse.org/downloads"> 
+		<list> <value>http://mirror.netcologne.de/eclipse</value> <value>http://mirror.selfnet.de/eclipse</value> 
+		<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value> 
+		</list> </entry> </map> </property> <property name="nodeIndexers"> <list> 
+		<bean class="org.argeo.slc.repo.ArtifactIndexer" /> <bean class="org.argeo.slc.repo.JarFileIndexer" 
+		/> <bean class="org.argeo.slc.repo.ModularDistributionIndexer" /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" 
+		/> </list> </property> <property name="javaRepository" ref="javaRepository" 
+		/> <property name="distRepository" ref="distRepository" /> </bean> </property> 
+		</bean> </flow:flow> -->
+
+	<!-- Import bundles zip -->
+	<!-- <flow:spec id="importZip.spec"> -->
+	<!-- <flow:primitive name="groupId" /> -->
+	<!-- <flow:primitive name="workspace" /> -->
+	<!-- <flow:primitive name="zipFile" value="file:///tmp/" /> -->
+	<!-- </flow:spec> -->
+
+	<!-- <flow:flow id="importZip.template" spec="importZip.spec" -->
+	<!-- abstract="true"> -->
+	<!-- <bean class="org.argeo.slc.repo.osgi.ImportBundlesZip"> -->
+	<!-- <property name="workspace" value="@{workspace}" /> -->
+	<!-- <property name="groupId" value="@{groupId}" /> -->
+	<!-- <property name="zipFile" value="@{zipFile}" /> -->
+	<!-- <property name="repository" ref="javaRepository" /> -->
+	<!-- </bean> -->
+	<!-- </flow:flow> -->
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
new file mode 100644
index 0000000..3a2ff20
--- /dev/null
+++ b/META-INF/spring/javax.xml
@@ -0,0 +1,31 @@
+<?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">
+
+	<!-- 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.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="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 -->
+	<bean id="template.javax" parent="template.bndWrapper" abstract="true">
+		<property name="groupId" value="org.argeo.tp.javax" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
new file mode 100644
index 0000000..08207c8
--- /dev/null
+++ b/META-INF/spring/misc.xml
@@ -0,0 +1,125 @@
+<?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">
+
+	<!-- REGISTER -->
+	<bean id="org.aspectj.weaver" parent="template.bndWrapper">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*,
+					com.bea.jvm;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
+		parent="template.bndWrapper">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*,
+					com.ibm.uvm.tools;resolution:=optional,
+					com.sun.jdmk.comm;resolution:=optional,
+					javax.jmdns;resolution:=optional,
+					javax.jms;resolution:=optional,
+					javax.mail;resolution:=optional,
+					javax.mail.internet;resolution:=optional,
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
+	<bean id="org.slf4j.api" parent="template.org.slf4j" />
+	<bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
+
+	<bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+		</property>
+	</bean>
+
+	<bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+		</property>
+	</bean>
+
+	<!-- Log4j12 Factory -->
+	<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"
+				value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="apache-log4j-@{version}/log4j-@{version}.jar"
+						value-ref="org.apache.log4j" />
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+					<property name="base" value="apache-log4j-@{version}/src/main/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<!-- AspectJ Factory -->
+	<flow:flow name="misc/org.aspectj" spec="spec.version">
+		<flow:arg name="version" value="1.7.3" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<!-- SLF4J Factory -->
+	<bean id="template.org.slf4j" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp" />
+	</bean>
+
+	<flow:flow name="misc/org.slf4j" spec="spec.version">
+		<flow:arg name="version" value="1.7.5" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"
+						value-ref="org.slf4j.log4j12" />
+					<entry key="slf4j-@{version}/slf4j-api-@{version}.jar"
+						value-ref="org.slf4j.api" />
+					<entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"
+						value-ref="org.slf4j.commons.logging" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.ant.xml b/META-INF/spring/org.argeo.tp.apache.ant.xml
deleted file mode 100644
index 9c85385..0000000
--- a/META-INF/spring/org.argeo.tp.apache.ant.xml
+++ /dev/null
@@ -1,44 +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.ant" spec="spec.version">
-		<flow:arg name="version" value="1.9.2" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="apache-ant-@{version}/lib/ant.jar">
-						<bean id="org.apache.ant" parent="template.org.apache.ant" />
-					</entry>
-					<entry key="apache-ant-@{version}/lib/ant-launcher.jar">
-						<bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
-					</entry>
-				</map>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://archive.apache.org/dist/ant/source/apache-ant-@{version}-src.zip" />
-					<property name="base" value="apache-ant-@{version}/src/main/" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- Specs and templates -->
-	<bean id="template.org.apache.ant" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.ant" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.commons.xml b/META-INF/spring/org.argeo.tp.apache.commons.xml
deleted file mode 100644
index e4b0162..0000000
--- a/META-INF/spring/org.argeo.tp.apache.commons.xml
+++ /dev/null
@@ -1,126 +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.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"
-		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"
-		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"
-		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"
-		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"
-		spec="spec.commons">
-		<flow:arg name="project" value="fileupload" />
-		<flow:arg name="version" value="1.3.1" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="uri"
-				value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-@{project}-@{version}-bin/lib/commons-@{project}-@{version}.jar">
-						<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons" />
-					</entry>
-				</map>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://archive.apache.org/dist/commons/@{project}/source/commons-@{project}-@{version}-src.zip" />
-					<property name="base"
-						value="commons-@{project}-@{version}-src/src/main/java/" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<flow:flow name="org.argeo.tp.apache/org.apache.commons.httpclient"
-		spec="spec.version">
-		<flow:arg name="version" value="3.1" />
-		<bean parent="template.commonsArchiveWrapper">
-			<property name="version" value="@{version}.0" />
-			<property name="uri"
-				value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/binary/commons-httpclient-@{version}.zip" />
-			<property name="wrappers">
-				<map>
-					<entry
-						key="commons-httpclient-@{version}/commons-httpclient-@{version}.jar">
-						<bean id="org.apache.commons.httpclient" parent="template.org.apache.commons" />
-					</entry>
-				</map>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-@{version}-src.zip" />
-					<property name="base" value="commons-httpclient-@{version}/src/java/" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- Specs and templates -->
-	<flow:spec id="spec.commons">
-		<flow:primitive name="version" isParameter="true" />
-		<flow:primitive name="project" isParameter="true" />
-	</flow:spec>
-
-	<bean id="template.commonsArchiveWrapper" parent="template.archiveWrapper"
-		abstract="true">
-		<property name="version" value="@{version}" />
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-		</property>
-		<property name="uri"
-			value="http://archive.apache.org/dist/commons/@{project}/binaries/commons-@{project}-@{version}-bin.zip" />
-		<property name="wrappers">
-			<map>
-				<entry
-					key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
-					<bean p:name="org.apache.commons.@{project}" parent="template.org.apache.commons" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="template.org.apache.commons" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.apache.commons" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.felix.xml b/META-INF/spring/org.argeo.tp.apache.felix.xml
deleted file mode 100644
index 4019764..0000000
--- a/META-INF/spring/org.argeo.tp.apache.felix.xml
+++ /dev/null
@@ -1,39 +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">
-
-	<!-- REGISTER -->
-	<bean id="org.apache.felix.framework" p:version="4.2.1"
-		parent="template.org.apache.felix">
-	</bean>
-	<bean id="org.apache.felix.bundlerepository" p:version="1.6.6"
-		parent="template.org.apache.felix">
-	</bean>
-	<bean id="org.apache.felix.gogo.command" p:version="0.12.0"
-		parent="template.org.apache.felix">
-	</bean>
-	<bean id="org.apache.felix.gogo.runtime" p:version="0.10.0"
-		parent="template.org.apache.felix">
-	</bean>
-	<bean id="org.apache.felix.gogo.shell" p:version="0.10.0"
-		parent="template.org.apache.felix">
-	</bean>
-
-	<!-- FACTORY -->
-	<!-- TODO sources -->
-	<bean id="template.org.apache.felix" class="org.argeo.slc.repo.osgi.UriWrapper"
-		abstract="true">
-		<property name="baseUri" value="http://archive.apache.org/dist/felix" />
-		<property name="groupId" value="org.argeo.tp.apache.felix" />
-		<property name="doNotModify" value="true" />
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-		</property>
-		<property name="osgiFactory" ref="osgiFactory" />
-	</bean>
-</beans>
\ No newline at end of file
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.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
deleted file mode 100644
index 42f83ae..0000000
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ /dev/null
@@ -1,109 +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">
-
-	<!-- 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.eclipse.ide.xml b/META-INF/spring/org.argeo.tp.eclipse.ide.xml
deleted file mode 100644
index 20a533c..0000000
--- a/META-INF/spring/org.argeo.tp.eclipse.ide.xml
+++ /dev/null
@@ -1,83 +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-0.12.xsd">
-
-	<!-- RCP 3.8 -->
-	<flow:flow name="org.argeo.tp.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" />
-	</flow:flow>
-
-	<!-- RAP specs and templates -->
-	<flow:spec id="spec.eclipseIde">
-		<flow:primitive name="version" isParameter="true" />
-		<flow:primitive name="release" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.eclipseIde" spec="spec.eclipseIde"
-		abstract="true">
-		<!-- IDE -->
-		<!-- Using Windows because we cannot yet deal with tar.gz --><!-- <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> -->
-		<!-- <property name="version" value="@{version}" /> -->
-		<!-- <property name="mavenGroupIndexes" value="true" /> -->
-		<!-- <property name="uri" -->
-		<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/@{release}/eclipse-SDK-@{version}-win32.zip" 
-			/> -->
-		<!-- <property name="includes"> -->
-		<!-- <map> -->
-		<!-- <entry key="eclipse/plugins/*.jar" value="org.argeo.tp.eclipse.ide" 
-			/> -->
-		<!-- </map> -->
-		<!-- </property> -->
-		<!-- <property name="osgiFactory" ref="osgiFactory.eclipseIde" /> -->
-		<!-- </bean> -->
-
-		<!-- RCP (platform + OS specific binaries) -->
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="version" value="@{version}" />
-			<property name="mavenGroupIndexes" value="true" />
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/eclipse/downloads/drops/@{release}/org.eclipse.rcp.source-@{version}.zip" />
-			<property name="includes">
-				<map>
-					<entry key="plugins/*.jar" value="org.argeo.tp.rcp.platform" />
-				</map>
-			</property>
-			<property name="osgiFactory" ref="osgiFactory.eclipseIde" />
-		</bean>
-	</flow:flow>
-
-	<bean id="osgiFactory.eclipseIde" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
-		init-method="init" destroy-method="destroy">
-		<property name="workspace" value="eclipse-ide-3.8" />
-		<property name="mirrors">
-			<map>
-				<entry key="http://www.eclipse.org/downloads">
-					<list>
-						<value>http://mirror.netcologne.de/eclipse</value>
-						<value>http://mirror.selfnet.de/eclipse</value>
-						<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
-					</list>
-				</entry>
-			</map>
-		</property>
-
-		<property name="nodeIndexers">
-			<list>
-				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
-				<bean class="org.argeo.slc.repo.JarFileIndexer" />
-				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
-			</list>
-		</property>
-		<property name="javaRepository" ref="javaRepository" />
-		<property name="distRepository" ref="distRepository" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.equinox.xml b/META-INF/spring/org.argeo.tp.equinox.xml
deleted file mode 100644
index c1d8cb7..0000000
--- a/META-INF/spring/org.argeo.tp.equinox.xml
+++ /dev/null
@@ -1,41 +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-0.12.xsd">
-
-	<!-- Equinox Kepler SR2 (3.9.1) -->
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.equinox"
-		parent="template.importEquinox">
-		<!-- <flow:arg name="version" value="3.9.1" /> -->
-		<flow:arg name="equinoxRelease" value="KeplerSR2" />
-		<flow:arg name="equinoxTimestamp" value="201402211700" />
-	</flow:flow>
-
-	<!-- Equinox specs and templates -->
-	<flow:spec id="equinoxVersion.spec">
-		<!-- <flow:primitive name="version" isParameter="true" /> -->
-		<flow:primitive name="equinoxRelease" isParameter="true" />
-		<flow:primitive name="equinoxTimestamp" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.importEquinox" spec="equinoxVersion.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
-			<property name="includes">
-				<map>
-					<entry key="plugins/org.eclipse.osgi_*.jar" value="org.argeo.tp.equinox" />
-					<entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
-					<entry key="plugins/org.eclipse.osgi.equinox.security_*.jar"
-						value="org.argeo.tp.equinox" />
-				</map>
-			</property>
-			<property name="osgiFactory" ref="osgiFactory" />
-		</bean>
-	</flow:flow>
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.gemini.xml b/META-INF/spring/org.argeo.tp.gemini.xml
deleted file mode 100644
index 4e07217..0000000
--- a/META-INF/spring/org.argeo.tp.gemini.xml
+++ /dev/null
@@ -1,85 +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">
-
-	<!-- REGISTER -->
-	<!-- Gemini Blueprint -->
-	<bean id="org.eclipse.gemini.blueprint.core" parent="template.gemini" />
-	<bean id="org.eclipse.gemini.blueprint.extender" parent="template.gemini" />
-	<bean id="org.eclipse.gemini.blueprint.io" parent="template.gemini" />
-
-	<!-- Gemini Web -->
-	<!-- <flow:flow name="org.argeo.tp.gemini/org.gemini.web" -->
-	<!-- spec="spec.version"> -->
-	<!-- <flow:arg name="version" value="2.2.2.RELEASE" /> -->
-	<!-- <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven" -->
-	<!-- p:version="@{version}" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core:@{version}" 
-		/> -->
-	<!-- <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven" -->
-	<!-- p:version="@{version}" -->
-	<!-- p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender:@{version}" 
-		/> -->
-	<!-- <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven" -->
-	<!-- p:version="@{version}" -->
-	<!-- p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat:@{version}" 
-		/> -->
-	<!-- </flow:flow> -->
-
-	<!-- <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven" -->
-	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core" 
-		/> -->
-	<!-- <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven" -->
-	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender" 
-		/> -->
-	<!-- <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven" -->
-	<!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat" 
-		/> -->
-
-
-	<!-- FACTORY -->
-	<bean id="template.gemini" parent="template.bndWrapper" abstract="true">
-		<property name="groupId" value="org.argeo.tp.gemini" />
-		<property name="doNotModify" value="true" />
-	</bean>
-
-	<bean id="template.geminiMaven" parent="template.mavenWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.gemini" />
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-		</property>
-		<property name="doNotModify" value="true" />
-	</bean>
-
-	<!-- Gemini Blueprint -->
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.gemini"
-		spec="spec.version">
-		<flow:arg name="version" value="1.0.2.RELEASE" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/blueprint/gemini-blueprint-@{version}.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry
-						key="gemini-blueprint-@{version}/dist/gemini-blueprint-core-@{version}.jar"
-						value-ref="org.eclipse.gemini.blueprint.core" />
-					<entry
-						key="gemini-blueprint-@{version}/dist/gemini-blueprint-extender-@{version}.jar"
-						value-ref="org.eclipse.gemini.blueprint.extender" />
-					<entry
-						key="gemini-blueprint-@{version}/dist/gemini-blueprint-io-@{version}.jar"
-						value-ref="org.eclipse.gemini.blueprint.io" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
deleted file mode 100644
index a2bf71d..0000000
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ /dev/null
@@ -1,31 +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">
-
-	<!-- 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.inject" flow:as-flow="org.argeo.tp.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"
-		parent="template.mavenWrapper" />
-
-	<!-- FACTORY -->
-	<bean id="template.javax" parent="template.bndWrapper" abstract="true">
-		<property name="groupId" value="org.argeo.tp.javax" />
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.jetty.xml b/META-INF/spring/org.argeo.tp.jetty.xml
deleted file mode 100644
index 0b44693..0000000
--- a/META-INF/spring/org.argeo.tp.jetty.xml
+++ /dev/null
@@ -1,52 +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-0.12.xsd">
-
-	<flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.jetty"
-		parent="template.importJettyZip">
-		<flow:arg name="jettyVersion" value="8.1.16.v20140903" />
-	</flow:flow>
-
-	<!-- Jetty specs and templates -->
-	<flow:spec id="jettyVersion.spec">
-		<flow:primitive name="jettyVersion" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.importJettyZip" spec="jettyVersion.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="includes">
-				<map>
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-*.jar"
-						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
-						value="org.argeo.tp.javax" />
-				</map>
-			</property>
-			<property name="excludes">
-				<list>
-					<value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
-				</list>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-			<property name="osgiFactory" ref="osgiFactory" />
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.rap.xml b/META-INF/spring/org.argeo.tp.rap.xml
deleted file mode 100644
index 15a1ec9..0000000
--- a/META-INF/spring/org.argeo.tp.rap.xml
+++ /dev/null
@@ -1,176 +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-0.12.xsd">
-
-	<!-- RAP 2.2 -->
-	<flow:flow name="org.argeo.tp.rap/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"
-		parent="template.importRapZip">
-		<flow:arg name="rapBranch" value="2.2" />
-		<flow:arg name="rapVersion" value="2.2.0-M1-20130821-1618" />
-	</flow:flow>
-
-	<!-- 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"
-		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"
-		parent="template.importRapAddonsZip">
-		<flow:arg name="rapBranch" value="2.2" />
-		<flow:arg name="rapVersion" value="0.2.0.20131212-1229" />
-	</flow:flow>
-
-	<flow:flow id="template.importRapAddonsZip" spec="rapVersion.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="version" value="@{rapVersion}" />
-			<property name="mavenGroupIndexes" value="true" />
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-addons-@{rapVersion}.zip" />
-			<property name="includes">
-				<map>
-					<entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" />
-				</map>
-			</property>
-			<property name="osgiFactory">
-				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
-					init-method="init" destroy-method="destroy">
-					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
-
-					<property name="nodeIndexers">
-						<list>
-							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
-							<bean class="org.argeo.slc.repo.JarFileIndexer" />
-							<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-							<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
-						</list>
-					</property>
-					<property name="javaRepository" ref="javaRepository" />
-					<property name="distRepository" ref="distRepository" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-
-	<!-- RAP 2.1 -->
-	<flow:flow name="org.argeo.tp.rap/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"
-		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"
-		parent="template.importRapZip">
-		<flow:arg name="rapBranch" value="2.1" />
-		<flow:arg name="rapVersion" value="2.1.0-M1-20130318-2137" />
-	</flow:flow>
-
-	<!-- RAP specs and templates -->
-	<flow:spec id="rapVersion.spec">
-		<flow:primitive name="rapBranch" isParameter="true" />
-		<flow:primitive name="rapVersion" isParameter="true" />
-	</flow:spec>
-
-	<flow:flow id="template.importRapZip" spec="rapVersion.spec"
-		abstract="true">
-		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-			<property name="version" value="@{rapVersion}" />
-			<property name="mavenGroupIndexes" value="true" />
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" />
-			<property name="includes">
-				<map>
-					<entry key="plugins/*.jar" value="org.argeo.tp.rap.platform" />
-				</map>
-			</property>
-			<property name="osgiFactory">
-				<bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
-					init-method="init" destroy-method="destroy">
-					<property name="workspace" value="eclipse-rap-@{rapBranch}" />
-					<property name="mirrors">
-						<map>
-							<entry key="http://www.eclipse.org/downloads">
-								<list>
-									<value>http://mirror.netcologne.de/eclipse</value>
-									<value>http://mirror.selfnet.de/eclipse</value>
-									<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
-								</list>
-							</entry>
-						</map>
-					</property>
-
-					<property name="nodeIndexers">
-						<list>
-							<bean class="org.argeo.slc.repo.ArtifactIndexer" />
-							<bean class="org.argeo.slc.repo.JarFileIndexer" />
-							<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-							<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
-						</list>
-					</property>
-					<property name="javaRepository" ref="javaRepository" />
-					<property name="distRepository" ref="distRepository" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-
-
-
-	<!-- WORK IN PROGRESS add bundle from the incubator to the platform <flow:flow 
-		id="org.argeo.tp.rap.addons/org.argeo.tp.rap.dropdown_2.2" spec="rapVersion.spec" 
-		abstract="true"> <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" 
-		value="0.2.0.20131212-1229" /> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> 
-		<property name="version" value="@{rapVersion}" /> <property name="mavenGroupIndexes" 
-		value="true" /> <property name="uri" value="file:///tmp/" /> <property name="includes"> 
-		<map> <entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" /> </map> 
-		</property> <property name="osgiFactory"> <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" 
-		init-method="init" destroy-method="destroy"> <property name="workspace" value="eclipse-rap-@{rapBranch}" 
-		/> <property name="mirrors"> <map> <entry key="http://www.eclipse.org/downloads"> 
-		<list> <value>http://mirror.netcologne.de/eclipse</value> <value>http://mirror.selfnet.de/eclipse</value> 
-		<value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value> 
-		</list> </entry> </map> </property> <property name="nodeIndexers"> <list> 
-		<bean class="org.argeo.slc.repo.ArtifactIndexer" /> <bean class="org.argeo.slc.repo.JarFileIndexer" 
-		/> <bean class="org.argeo.slc.repo.ModularDistributionIndexer" /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" 
-		/> </list> </property> <property name="javaRepository" ref="javaRepository" 
-		/> <property name="distRepository" ref="distRepository" /> </bean> </property> 
-		</bean> </flow:flow> -->
-
-	<!-- Import bundles zip -->
-	<!-- <flow:spec id="importZip.spec"> -->
-	<!-- <flow:primitive name="groupId" /> -->
-	<!-- <flow:primitive name="workspace" /> -->
-	<!-- <flow:primitive name="zipFile" value="file:///tmp/" /> -->
-	<!-- </flow:spec> -->
-
-	<!-- <flow:flow id="importZip.template" spec="importZip.spec" -->
-	<!-- abstract="true"> -->
-	<!-- <bean class="org.argeo.slc.repo.osgi.ImportBundlesZip"> -->
-	<!-- <property name="workspace" value="@{workspace}" /> -->
-	<!-- <property name="groupId" value="@{groupId}" /> -->
-	<!-- <property name="zipFile" value="@{zipFile}" /> -->
-	<!-- <property name="repository" ref="javaRepository" /> -->
-	<!-- </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/org.argeo.tp.spring.security.xml
deleted file mode 100644
index 1f58bdd..0000000
--- a/META-INF/spring/org.argeo.tp.spring.security.xml
+++ /dev/null
@@ -1,54 +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">
-
-	<!-- FACTORY -->
-	<bean id="template.spring.security" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.spring.security" />
-		<property name="doNotModify" value="true" />
-	</bean>
-
-	<flow:flow name="org.argeo.tp.spring/org.springframework.security"
-		spec="spec.version">
-		<flow:arg name="version" value="3.2.5.RELEASE" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://repo.spring.io/libs-release-local/org/springframework/security/spring-security/@{version}/spring-security-@{version}-dist.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
-						<bean id="org.springframework.security.acls" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
-						<bean id="org.springframework.security.config" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
-						<bean id="org.springframework.security" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
-						<bean id="org.springframework.security.crypto" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
-						<bean id="org.springframework.security.ldap" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar">
-						<bean id="org.springframework.security.openid" parent="template.spring.security" />
-					</entry>
-					<entry key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
-						<bean id="org.springframework.security.web" parent="template.spring.security" />
-					</entry>
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.spring.xml b/META-INF/spring/org.argeo.tp.spring.xml
deleted file mode 100644
index 4a3dab7..0000000
--- a/META-INF/spring/org.argeo.tp.spring.xml
+++ /dev/null
@@ -1,205 +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">
-
-	<!-- REGISTER -->
-	<bean id="org.springframework.aop" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					com.jamonapi;resolution:=optional,
-					org.apache.commons.pool.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.aspects" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.beans" parent="template.org.springframework" />
-
-	<bean id="org.springframework.context" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					bsh;resolution:=optional,
-					com.sun.net.httpserver;resolution:=optional,
-					edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional,
-					groovy.lang;resolution:=optional,
-					javax.interceptor;resolution:=optional,
-					javax.jms;resolution:=optional,
-					javax.persistence.spi;resolution:=optional,
-					javax.validation.*;resolution:=optional,
-					org.codehaus.groovy.control;resolution:=optional,
-					org.hibernate.validator.*;resolution:=optional,
-					org.joda.time.*;resolution:=optional,
-					org.jruby.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.springframework.context.support" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.core" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					joptsimple;resolution:=optional,
-					org.springframework.asm.tree;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.springframework.expression" parent="template.org.springframework" />
-
-	<bean id="org.springframework.instrument" parent="template.org.springframework" />
-
-	<bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" />
-
-	<bean id="org.springframework.jdbc" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					com.mchange.v2.c3p0;resolution:=optional,
-					com.sun.rowset;resolution:=optional,
-					org.apache.derby.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.jms" parent="template.org.springframework" />
-
-	<bean id="org.springframework.orm" parent="template.org.springframework" />
-
-	<bean id="org.springframework.oxm" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					com.thoughtworks.xstream.*;resolution:=optional,
-					org.apache.xmlbeans.*;resolution:=optional,
-					org.exolab.castor.*;resolution:=optional,
-					org.jibx.runtime.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.test" parent="template.org.springframework" />
-
-	<bean id="org.springframework.tx" parent="template.org.springframework">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					com.ibm.wsspi.uow;resolution:=optional,
-					javax.resource.*;resolution:=optional,
-					*
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="org.springframework.web" parent="template.org.springframework" />
-
-	<bean id="org.springframework.web.servlet" parent="template.org.springframework" />
-
-	<!-- FACTORY -->
-	<bean id="template.org.springframework" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp.spring" />
-	</bean>
-
-	<flow:flow name="org.argeo.tp.spring/org.springframework"
-		spec="spec.version">
-		<flow:arg name="version" value="3.2.4" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}.RELEASE/spring-framework-@{version}.RELEASE-dist.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-aop-@{version}.RELEASE.jar"
-						value-ref="org.springframework.aop" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-aspects-@{version}.RELEASE.jar"
-						value-ref="org.springframework.aspects" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-beans-@{version}.RELEASE.jar"
-						value-ref="org.springframework.beans" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-context-@{version}.RELEASE.jar"
-						value-ref="org.springframework.context" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-context-support-@{version}.RELEASE.jar"
-						value-ref="org.springframework.context.support" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-core-@{version}.RELEASE.jar"
-						value-ref="org.springframework.core" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
-						value-ref="org.springframework.expression" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar"
-						value-ref="org.springframework.instrument" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar"
-						value-ref="org.springframework.instrument.tomcat" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar"
-						value-ref="org.springframework.jdbc" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar"
-						value-ref="org.springframework.jms" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar"
-						value-ref="org.springframework.orm" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar"
-						value-ref="org.springframework.oxm" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar"
-						value-ref="org.springframework.test" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
-						value-ref="org.springframework.tx" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-web-@{version}.RELEASE.jar"
-						value-ref="org.springframework.web" />
-					<entry
-						key="spring-framework-@{version}.RELEASE/libs/spring-webmvc-@{version}.RELEASE.jar"
-						value-ref="org.springframework.web.servlet" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
deleted file mode 100644
index 2b325a5..0000000
--- a/META-INF/spring/org.argeo.tp.xml
+++ /dev/null
@@ -1,125 +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">
-
-	<!-- REGISTER -->
-	<bean id="org.aspectj.weaver" parent="template.bndWrapper">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					*,
-					com.bea.jvm;resolution:=optional,
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.apache.log4j" p:groupId="org.argeo.tp.apache"
-		parent="template.bndWrapper">
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Import-Package">
-					*,
-					com.ibm.uvm.tools;resolution:=optional,
-					com.sun.jdmk.comm;resolution:=optional,
-					javax.jmdns;resolution:=optional,
-					javax.jms;resolution:=optional,
-					javax.mail;resolution:=optional,
-					javax.mail.internet;resolution:=optional,
-				</prop>
-			</props>
-		</property>
-	</bean>
-	<bean id="org.slf4j.log4j12" parent="template.org.slf4j" />
-	<bean id="org.slf4j.api" parent="template.org.slf4j" />
-	<bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
-
-	<bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
-		parent="template.mavenWrapper">
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
-		</property>
-	</bean>
-
-	<bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
-		parent="template.mavenWrapper">
-		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-		</property>
-	</bean>
-
-	<!-- Log4j12 Factory -->
-	<flow:flow name="org.argeo.tp/org.apache.log4j" spec="spec.version">
-		<flow:arg name="version" value="1.2.17" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="apache-log4j-@{version}/log4j-@{version}.jar"
-						value-ref="org.apache.log4j" />
-				</map>
-			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
-					<property name="base" value="apache-log4j-@{version}/src/main/java/" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- AspectJ Factory -->
-	<flow:flow name="org.argeo.tp/org.aspectj" spec="spec.version">
-		<flow:arg name="version" value="1.7.3" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- SLF4J Factory -->
-	<bean id="template.org.slf4j" parent="template.bndWrapper"
-		abstract="true">
-		<property name="groupId" value="org.argeo.tp" />
-	</bean>
-
-	<flow:flow name="org.argeo.tp/org.slf4j" spec="spec.version">
-		<flow:arg name="version" value="1.7.5" />
-		<bean parent="template.archiveWrapper">
-			<property name="uri"
-				value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
-			</property>
-			<property name="wrappers">
-				<map>
-					<entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"
-						value-ref="org.slf4j.log4j12" />
-					<entry key="slf4j-@{version}/slf4j-api-@{version}.jar"
-						value-ref="org.slf4j.api" />
-					<entry key="slf4j-@{version}/jcl-over-slf4j-@{version}.jar"
-						value-ref="org.slf4j.commons.logging" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/spring.security.xml b/META-INF/spring/spring.security.xml
new file mode 100644
index 0000000..c21f48d
--- /dev/null
+++ b/META-INF/spring/spring.security.xml
@@ -0,0 +1,54 @@
+<?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">
+
+	<!-- FACTORY -->
+	<bean id="template.spring.security" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.spring.security" />
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<flow:flow name="spring/org.springframework.security"
+		spec="spec.version">
+		<flow:arg name="version" value="3.2.5.RELEASE" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://repo.spring.io/libs-release-local/org/springframework/security/spring-security/@{version}/spring-security-@{version}-dist.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="spring-security-@{version}/dist/spring-security-acl-@{version}.jar">
+						<bean id="org.springframework.security.acls" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-config-@{version}.jar">
+						<bean id="org.springframework.security.config" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-core-@{version}.jar">
+						<bean id="org.springframework.security" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-crypto-@{version}.jar">
+						<bean id="org.springframework.security.crypto" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-ldap-@{version}.jar">
+						<bean id="org.springframework.security.ldap" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-openid-@{version}.jar">
+						<bean id="org.springframework.security.openid" parent="template.spring.security" />
+					</entry>
+					<entry key="spring-security-@{version}/dist/spring-security-web-@{version}.jar">
+						<bean id="org.springframework.security.web" parent="template.spring.security" />
+					</entry>
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
new file mode 100644
index 0000000..57057fd
--- /dev/null
+++ b/META-INF/spring/spring.xml
@@ -0,0 +1,205 @@
+<?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">
+
+	<!-- REGISTER -->
+	<bean id="org.springframework.aop" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.jamonapi;resolution:=optional,
+					org.apache.commons.pool.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.aspects" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.beans" parent="template.org.springframework" />
+
+	<bean id="org.springframework.context" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					bsh;resolution:=optional,
+					com.sun.net.httpserver;resolution:=optional,
+					edu.emory.mathcs.backport.java.util.concurrent;resolution:=optional,
+					groovy.lang;resolution:=optional,
+					javax.interceptor;resolution:=optional,
+					javax.jms;resolution:=optional,
+					javax.persistence.spi;resolution:=optional,
+					javax.validation.*;resolution:=optional,
+					org.codehaus.groovy.control;resolution:=optional,
+					org.hibernate.validator.*;resolution:=optional,
+					org.joda.time.*;resolution:=optional,
+					org.jruby.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.springframework.context.support" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.core" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					joptsimple;resolution:=optional,
+					org.springframework.asm.tree;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="org.springframework.expression" parent="template.org.springframework" />
+
+	<bean id="org.springframework.instrument" parent="template.org.springframework" />
+
+	<bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" />
+
+	<bean id="org.springframework.jdbc" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.mchange.v2.c3p0;resolution:=optional,
+					com.sun.rowset;resolution:=optional,
+					org.apache.derby.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.jms" parent="template.org.springframework" />
+
+	<bean id="org.springframework.orm" parent="template.org.springframework" />
+
+	<bean id="org.springframework.oxm" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.thoughtworks.xstream.*;resolution:=optional,
+					org.apache.xmlbeans.*;resolution:=optional,
+					org.exolab.castor.*;resolution:=optional,
+					org.jibx.runtime.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.test" parent="template.org.springframework" />
+
+	<bean id="org.springframework.tx" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.ibm.wsspi.uow;resolution:=optional,
+					javax.resource.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.web" parent="template.org.springframework" />
+
+	<bean id="org.springframework.web.servlet" parent="template.org.springframework" />
+
+	<!-- FACTORY -->
+	<bean id="template.org.springframework" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.spring" />
+	</bean>
+
+	<flow:flow name="spring/org.springframework"
+		spec="spec.version">
+		<flow:arg name="version" value="3.2.4" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}.RELEASE/spring-framework-@{version}.RELEASE-dist.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-aop-@{version}.RELEASE.jar"
+						value-ref="org.springframework.aop" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-aspects-@{version}.RELEASE.jar"
+						value-ref="org.springframework.aspects" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-beans-@{version}.RELEASE.jar"
+						value-ref="org.springframework.beans" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-context-@{version}.RELEASE.jar"
+						value-ref="org.springframework.context" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-context-support-@{version}.RELEASE.jar"
+						value-ref="org.springframework.context.support" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-core-@{version}.RELEASE.jar"
+						value-ref="org.springframework.core" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
+						value-ref="org.springframework.expression" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar"
+						value-ref="org.springframework.instrument" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar"
+						value-ref="org.springframework.instrument.tomcat" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar"
+						value-ref="org.springframework.jdbc" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar"
+						value-ref="org.springframework.jms" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar"
+						value-ref="org.springframework.orm" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar"
+						value-ref="org.springframework.oxm" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar"
+						value-ref="org.springframework.test" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
+						value-ref="org.springframework.tx" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-web-@{version}.RELEASE.jar"
+						value-ref="org.springframework.web" />
+					<entry
+						key="spring-framework-@{version}.RELEASE/libs/spring-webmvc-@{version}.RELEASE.jar"
+						value-ref="org.springframework.web.servlet" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+</beans>
\ No newline at end of file