From 71a748acb782873a66dc87fa24a0b40172e35109 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 20 Mar 2020 08:27:34 +0100
Subject: [PATCH] Merge Argeo TP Extras to Argeo Distribution.

---
 .../META-INF/MANIFEST.MF                      |   6 +-
 org.argeo.tp.factory.core/pom.xml             |   2 +-
 org.argeo.tp.factory.extras/.gitignore        |   4 +
 org.argeo.tp.factory.extras/.project          |  25 ++
 .../META-INF/MANIFEST.MF                      |  55 ++++
 .../META-INF/spring/apache.ant.xml            |  44 +++
 .../META-INF/spring/apache.felix.xml          |  39 +++
 .../META-INF/spring/apache.tomcat.xml         | 108 +++++++
 .../META-INF/spring/distribution.xml          | 108 +++++++
 .../META-INF/spring/eclipse.gemini.xml        |  85 ++++++
 .../META-INF/spring/extras.xml                |  43 +++
 .../META-INF/spring/graalvm.xml               |  22 ++
 .../META-INF/spring/jersey.xml                | 106 +++++++
 .../META-INF/spring/osgi.xml                  |  20 ++
 .../META-INF/spring/payment.xml               |  17 ++
 .../META-INF/spring/scripting.xml             |  48 ++++
 .../META-INF/spring/spring.security.xml       |  60 ++++
 .../META-INF/spring/spring.xml                | 270 ++++++++++++++++++
 .../META-INF/spring/swagger.xml               |  56 ++++
 .../META-INF/spring/templates.xml             |  39 +++
 .../META-INF/spring/ws.xml                    |  35 +++
 org.argeo.tp.factory.extras/bnd.bnd           |   0
 org.argeo.tp.factory.extras/pom.xml           |  73 +++++
 pom.xml                                       |   3 +-
 24 files changed, 1263 insertions(+), 5 deletions(-)
 create mode 100644 org.argeo.tp.factory.extras/.gitignore
 create mode 100644 org.argeo.tp.factory.extras/.project
 create mode 100644 org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/apache.ant.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/apache.felix.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/apache.tomcat.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/distribution.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/eclipse.gemini.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/extras.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/graalvm.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/jersey.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/osgi.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/payment.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/scripting.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/spring.security.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/spring.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/swagger.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/templates.xml
 create mode 100644 org.argeo.tp.factory.extras/META-INF/spring/ws.xml
 create mode 100644 org.argeo.tp.factory.extras/bnd.bnd
 create mode 100644 org.argeo.tp.factory.extras/pom.xml

diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
index cf5d583..87c48c1 100644
--- a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
+++ b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Description: OSGi packaging of free / open source third party lib
  raries
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-ManifestVersion: 2
-Bundle-Name: Argeo Third Party Factory
+Bundle-Name: Core Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.28.SNAPSHOT-r20200313085348
+Bundle-Version: 2.1.28.SNAPSHOT-r20200320072510
 Import-Package: 
  javax.jcr;version="[2.0,3)",
  org.argeo.cms.spring;version="[2.1,3)",
@@ -50,6 +50,6 @@ Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli
  spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr
  ing/bouncycastle.xml
 Private-Package: !*
-SLC-Build-Timestamp: 20200313085348
+SLC-Build-Timestamp: 20200320072510
 SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
diff --git a/org.argeo.tp.factory.core/pom.xml b/org.argeo.tp.factory.core/pom.xml
index f4c2395..00c507d 100644
--- a/org.argeo.tp.factory.core/pom.xml
+++ b/org.argeo.tp.factory.core/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>org.argeo.tp.factory.core</artifactId>
 	<version>2.1.28-SNAPSHOT</version>
-	<name>Argeo Third Party Factory</name>
+	<name>Core Third Party Factory</name>
 	<description>OSGi packaging of free / open source third party libraries</description>
 	<properties>
 		<additionalImports.slc-lib>
diff --git a/org.argeo.tp.factory.extras/.gitignore b/org.argeo.tp.factory.extras/.gitignore
new file mode 100644
index 0000000..f14d255
--- /dev/null
+++ b/org.argeo.tp.factory.extras/.gitignore
@@ -0,0 +1,4 @@
+/target
+/*.target
+/feature.xml
+/modularDistribution.csv
diff --git a/org.argeo.tp.factory.extras/.project b/org.argeo.tp.factory.extras/.project
new file mode 100644
index 0000000..ed04aeb
--- /dev/null
+++ b/org.argeo.tp.factory.extras/.project
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.tp.factory.extras</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments />
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments />
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
+			<arguments />
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bac9325
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF
@@ -0,0 +1,55 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.argeo.tp.factory.extras
+Bundle-Description: SLC execution modules for generic tasks, to be used 
+ as parent pom
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: Extras Third Party Factory
+Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8
+Bundle-SymbolicName: org.argeo.tp.factory.extras
+Bundle-Version: 2.1.14.SNAPSHOT-r20200320072510
+Import-Package: 
+ javax.jcr;version="[2.0,3)",
+ org.argeo.cms.spring;version="[2.1,3)",
+ org.argeo.slc.repo;version="[2.1,3)",
+ org.argeo.slc.repo.osgi;version="[2.1,3)",
+ org.argeo.slc.spring.repo.osgi;version="[2.1,3)",
+ org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)",
+ org.springframework.cglib.core;resolution:=optional;version="[3.2,4)",
+ org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4)
+ ",
+ org.aopalliance.aop;resolution:=optional;version="[1.0,2)",
+ org.argeo.slc.runtime;version="[2.1,3)",
+ org.argeo.slc.core.execution;resolution:=optional;version="[2.1,3)",
+ org.argeo.slc.core.execution.tasks;resolution:=optional;version="[2.1,3
+ )",
+ org.argeo.slc.execution;version="[2.1,3)",
+ org.argeo.slc.osgi;resolution:=optional;version="[2.1,3)",
+ org.argeo.slc.test;version="[2.1,3)",
+ org.springframework.aop;resolution:=optional;version="[3.2,4)",
+ org.springframework.aop.framework;resolution:=optional;version="[3.2,4)
+ ",
+ org.springframework.aop.scope;resolution:=optional;version="[3.2,4)",
+ org.springframework.beans.factory.config;resolution:=optional;version="
+ [3.2,4)",
+ org.springframework.core.io;resolution:=optional;version="[3.2,4)",
+ javax.security.auth.callback;resolution:=optional
+Include-Resource: META-INF/spring/scripting.xml=META-INF/spring/scriptin
+ g.xml,META-INF/spring/swagger.xml=META-INF/spring/swagger.xml,META-INF/
+ spring/templates.xml=META-INF/spring/templates.xml,META-INF/spring/graa
+ lvm.xml=META-INF/spring/graalvm.xml,META-INF/spring/jersey.xml=META-INF
+ /spring/jersey.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/ap
+ ache.tomcat.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache
+ .felix.xml,META-INF/spring/extras.xml=META-INF/spring/extras.xml,META-I
+ NF/spring/ws.xml=META-INF/spring/ws.xml,META-INF/spring/distribution.xm
+ l=META-INF/spring/distribution.xml,META-INF/spring/apache.ant.xml=META-
+ INF/spring/apache.ant.xml,META-INF/spring/eclipse.gemini.xml=META-INF/s
+ pring/eclipse.gemini.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.
+ xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spri
+ ng/spring.security.xml=META-INF/spring/spring.security.xml,META-INF/spr
+ ing/payment.xml=META-INF/spring/payment.xml,META-INF/MANIFEST.MF=META-I
+ NF/MANIFEST.MF
+Private-Package: !*
+SLC-Build-Timestamp: 20200320072510
+SLC-Category: org.argeo.tp.factory
+SLC-ExecutionModule: default
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/apache.ant.xml b/org.argeo.tp.factory.extras/META-INF/spring/apache.ant.xml
new file mode 100644
index 0000000..2a61571
--- /dev/null
+++ b/org.argeo.tp.factory.extras/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/org.argeo.tp.factory.extras/META-INF/spring/apache.felix.xml b/org.argeo.tp.factory.extras/META-INF/spring/apache.felix.xml
new file mode 100644
index 0000000..4019764
--- /dev/null
+++ b/org.argeo.tp.factory.extras/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/org.argeo.tp.factory.extras/META-INF/spring/apache.tomcat.xml b/org.argeo.tp.factory.extras/META-INF/spring/apache.tomcat.xml
new file mode 100644
index 0000000..06db0ec
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/apache.tomcat.xml
@@ -0,0 +1,108 @@
+<?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/org.argeo.tp.factory.extras/META-INF/spring/distribution.xml b/org.argeo.tp.factory.extras/META-INF/spring/distribution.xml
new file mode 100644
index 0000000..f678224
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/distribution.xml
@@ -0,0 +1,108 @@
+<?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="argeo-tp-extras"
+		class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+		init-method="init" destroy-method="destroy">
+		<constructor-arg
+			value="org.argeo.tp.extras:argeo-tp-extras:2.1.14-SNAPSHOT" />
+		<property name="modules">
+			<list>
+				<!-- Standalone -->
+				<ref bean="javassist" />
+				<ref bean="org.reflections" />
+
+				<!-- Apache -->
+				<ref bean="apache/org.apache.ant" />
+
+				<!-- Spring -->
+				<ref bean="spring/org.springframework" />
+				<ref bean="org.springframework.ldap" />
+				<ref bean="spring/org.springframework.security" />
+				<ref bean="eclipse/org.argeo.tp.gemini" />
+
+				<!-- Web services -->
+				<!-- <ref bean="org.atmosphere.runtime" /> -->
+				<!-- <ref bean="org.atmosphere.socketio" /> -->
+				<ref bean="ws/swagger" />
+
+				<!-- Payment providers -->
+				<ref bean="com.stripe" />
+
+				<!-- Scripting -->
+				<ref bean="black.ninia.jep" />
+				<ref bean="org.jython" />
+				<ref bean="org.graalvm.sdk" />
+			</list>
+		</property>
+	</bean>
+
+	<!-- Factory -->
+	<bean id="osgiFactory"
+		class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" init-method="init"
+		destroy-method="destroy">
+		<property name="workspace" value="argeo-extras-2.1" />
+		<property name="nodeIndexers">
+			<list>
+				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
+				<bean class="org.argeo.slc.repo.JarFileIndexer" />
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
+				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+			</list>
+		</property>
+		<property name="mirrors">
+			<map>
+				<entry key="http://archive.apache.org/dist">
+					<list>
+						<value>http://mirror.netcologne.de/apache.org</value>
+						<value>http://archive.apache.org/dist</value>
+					</list>
+				</entry>
+				<entry key="http://www.eclipse.org/downloads">
+					<list>
+						<value>http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/</value>
+						<value>http://ftp.fau.de/eclipse/</value>
+						<!-- <value>http://eclipse.mirror.garr.it/mirrors/eclipse</value> -->
+						<!-- <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="mavenRepositories">
+			<list>
+				<value>https://repo1.maven.org/maven2/</value>
+				<value>http://download.eclipse.org/gemini/mvn/</value>
+			</list>
+		</property>
+		<property name="javaRepository" ref="javaRepository" />
+		<property name="distRepository" ref="distRepository" />
+	</bean>
+
+	<flow:flow name="processDistribution">
+		<bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+			<property name="osgiDistribution" ref="argeo-tp-extras" />
+			<property name="osgiFactory" ref="osgiFactory" />
+		</bean>
+	</flow:flow>
+
+	<!-- Security -->
+	<bean
+		class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization">
+		<property name="beanNames">
+			<list>
+				<value>osgiFactory</value>
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/eclipse.gemini.xml b/org.argeo.tp.factory.extras/META-INF/spring/eclipse.gemini.xml
new file mode 100644
index 0000000..f0309dd
--- /dev/null
+++ b/org.argeo.tp.factory.extras/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/org.argeo.tp.factory.extras/META-INF/spring/extras.xml b/org.argeo.tp.factory.extras/META-INF/spring/extras.xml
new file mode 100644
index 0000000..dc93b51
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/extras.xml
@@ -0,0 +1,43 @@
+<?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">
+
+
+
+	<bean id="javassist" p:version="3.26.0"
+		p:sourceCoords="org.javassist:javassist:3.26.0-GA"
+		parent="template.mavenWrapper">
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
+	<bean id="org.reflections" p:version="0.9.11"
+		p:sourceCoords="org.reflections:reflections:0.9.11"
+		parent="template.mavenWrapper">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.google.common.*;version="0.0.0",
+					com.google.gson.*;resolution:=optional,
+					org.dom4j.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/graalvm.xml b/org.argeo.tp.factory.extras/META-INF/spring/graalvm.xml
new file mode 100644
index 0000000..f924a3d
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/graalvm.xml
@@ -0,0 +1,22 @@
+<?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">
+
+	<bean id="org.graalvm.sdk"
+		p:sourceCoords="org.graalvm.sdk:graal-sdk:19.2.0.1"
+		p:version="19.2.0.1" parent="template.mavenWrapper">
+		<!-- <property name="license"> -->
+		<!-- <util:constant -->
+		<!-- static-field="org.argeo.slc.repo.FreeLicense.UPL" /> -->
+		<!-- </property> -->
+		<property name="groupId" value="org.argeo.tp.graalvm" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/jersey.xml b/org.argeo.tp.factory.extras/META-INF/spring/jersey.xml
new file mode 100644
index 0000000..4ad1754
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/jersey.xml
@@ -0,0 +1,106 @@
+<?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="ws/jersey" spec="spec.version">
+		<flow:arg name="version" value="2.29.1" />
+		<bean id="org.glassfish.jersey.core.jersey-common"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-common:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.core.jersey-client"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-client:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.core.jersey-server"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-server:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Containers -->
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-servlet"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-servlet:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-servlet-core"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-servlet-core:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-jetty-http"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-jetty-http:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-jetty-servlet"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-jetty-servlet:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Media -->
+		<bean id="org.glassfish.jersey.media.jersey-media-json-jackson"
+			p:sourceCoords="org.glassfish.jersey.media:jersey-media-json-jackson:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Inject -->
+		<bean id="org.glassfish.jersey.inject.jersey-hk2"
+			p:sourceCoords="org.glassfish.jersey.inject:jersey-hk2:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Ext -->
+		<bean id="org.glassfish.jersey.ext.jersey-entity-filtering"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-entity-filtering:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.ext.jersey-mvc"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-mvc:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.ext.jersey-mvc-freemarker"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-mvc-freemarker:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="ws/hk2" spec="spec.version">
+		<flow:arg name="version" value="2.6.1" />
+		<bean id="org.glassfish.hk2.utils"
+			p:sourceCoords="org.glassfish.hk2:hk2-utils:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.api"
+			p:sourceCoords="org.glassfish.hk2:hk2-api:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.core"
+			p:sourceCoords="org.glassfish.hk2:hk2-core:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.locator"
+			p:sourceCoords="org.glassfish.hk2:hk2-locator:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.osgi-resource-locator"
+			p:sourceCoords="org.glassfish.hk2:osgi-resource-locator:1.0.3"
+			parent="template.jerseyMaven">
+		</bean>
+	</flow:flow>
+
+	<bean id="template.jerseyMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.jersey" />
+		<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/org.argeo.tp.factory.extras/META-INF/spring/osgi.xml b/org.argeo.tp.factory.extras/META-INF/spring/osgi.xml
new file mode 100644
index 0000000..f2b0cee
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/osgi.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<beans:import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
+	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
+
+	<!-- SERVICES -->
+	<service ref="argeo-tp-extras" interface="org.argeo.slc.repo.ArgeoOsgiDistribution" />
+
+	<!-- REFERENCES -->
+	<reference id="javaRepository" interface="javax.jcr.Repository"
+		filter="(cn=java)" />
+	<reference id="distRepository" interface="javax.jcr.Repository"
+		filter="(cn=dist)" />
+</beans:beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/payment.xml b/org.argeo.tp.factory.extras/META-INF/spring/payment.xml
new file mode 100644
index 0000000..0374005
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/payment.xml
@@ -0,0 +1,17 @@
+<?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">
+
+	<bean id="com.stripe" p:sourceCoords="com.stripe:stripe-java:jar:8.1.0"
+		parent="template.mavenWrapper">
+		<property name="groupId" value="org.argeo.tp.payment" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/scripting.xml b/org.argeo.tp.factory.extras/META-INF/spring/scripting.xml
new file mode 100644
index 0000000..c1ca80b
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/scripting.xml
@@ -0,0 +1,48 @@
+<?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">
+
+	<bean id="black.ninia.jep" p:sourceCoords="black.ninia:jep:3.9.0"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="groupId" value="org.argeo.tp.scripting" />
+	</bean>
+
+	<bean id="org.jython"
+		p:sourceCoords="org.python:jython-standalone:2.7.1"
+		parent="template.mavenWrapper">
+		<!-- <property name="license"> -->
+		<!-- <util:constant -->
+		<!-- static-field="org.argeo.slc.repo.FreeLicense.PYTHON" /> -->
+		<!-- </property> -->
+		<property name="groupId" value="org.argeo.tp.scripting" />
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Export-Package">
+					org.python.core.*,
+					org.python.modules.*,
+					org.python.util,
+					org.python,
+					com.xhaus.modjy,
+					com.ziclix.python.sql,
+					Lib.*
+				</prop>
+				<prop key="Import-Package">
+					*;resolution:=optional
+				</prop>
+				<prop key="Private-Package">*</prop>
+				<prop key="Main-Class">org.python.util.jython</prop>
+			</props>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/spring.security.xml b/org.argeo.tp.factory.extras/META-INF/spring/spring.security.xml
new file mode 100644
index 0000000..737092a
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/spring.security.xml
@@ -0,0 +1,60 @@
+<?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="https://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-aspects-@{version}.jar">
+						<bean id="org.springframework.security.aspects" 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.core" 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/org.argeo.tp.factory.extras/META-INF/spring/spring.xml b/org.argeo.tp.factory.extras/META-INF/spring/spring.xml
new file mode 100644
index 0000000..def6824
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/spring.xml
@@ -0,0 +1,270 @@
+<?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">
+					org.springframework.orm.jpa;resolution:=optional,
+					*
+				</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">
+					javax.ejb;resolution:=optional,
+					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">
+					*;resolution:=optional
+				</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,
+					org.apache.tools.ant.*;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.ejb;resolution:=optional,
+					javax.resource.*;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="org.springframework.web" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.caucho.hessian.*;resolution:=optional,
+					com.caucho.burlap.*;resolution:=optional,
+					com.fasterxml.jackson.*;resolution:=optional,
+					com.sun.net.httpserver.*;resolution:=optional,
+					com.sun.syndication.*;resolution:=optional,
+					javax.faces.*;resolution:=optional,
+					javax.portlet;resolution:=optional,
+					javax.servlet.jsp.*;resolution:=optional,
+					javax.xml.rpc.*;resolution:=optional,
+					org.apache.http.*;resolution:=optional,
+					org.codehaus.jackson.*;resolution:=optional,
+					org.apache.commons.fileupload.*;resolution:=optional,
+					org.springframework.oxm;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+
+	<bean id="org.springframework.web.servlet" parent="template.org.springframework">
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					com.fasterxml.jackson.*;resolution:=optional,
+					com.lowagie.text.*;resolution:=optional,
+					com.sun.syndication.*;resolution:=optional,
+					freemarker.*;resolution:=optional,
+					javax.servlet.jsp.*;resolution:=optional,
+					jxl.*;resolution:=optional,
+					net.sf.jasperreports.engine.*;resolution:=optional,
+					org.apache.poi.*;resolution:=optional,
+					org.apache.tiles.*;resolution:=optional,
+					org.apache.velocity.*;resolution:=optional,
+					org.codehaus.jackson.*;resolution:=optional,
+					org.springframework.oxm;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- 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.13.RELEASE" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="https://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}/spring-framework-@{version}-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}/libs/spring-aop-@{version}.jar"
+						value-ref="org.springframework.aop" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-aspects-@{version}.jar"
+						value-ref="org.springframework.aspects" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-beans-@{version}.jar"
+						value-ref="org.springframework.beans" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-context-@{version}.jar"
+						value-ref="org.springframework.context" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-context-support-@{version}.jar"
+						value-ref="org.springframework.context.support" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-core-@{version}.jar"
+						value-ref="org.springframework.core" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-expression-@{version}.jar"
+						value-ref="org.springframework.expression" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-instrument-@{version}.jar"
+						value-ref="org.springframework.instrument" />
+					<!-- <entry -->
+					<!-- key="spring-framework-@{version}/libs/spring-instrument-tomcat-@{version}.jar" -->
+					<!-- value-ref="org.springframework.instrument.tomcat" /> -->
+					<entry
+						key="spring-framework-@{version}/libs/spring-jdbc-@{version}.jar"
+						value-ref="org.springframework.jdbc" />
+					<!-- <entry -->
+					<!-- key="spring-framework-@{version}/libs/spring-jms-@{version}.jar" -->
+					<!-- value-ref="org.springframework.jms" /> -->
+					<!-- <entry -->
+					<!-- key="spring-framework-@{version}/libs/spring-orm-@{version}.jar" -->
+					<!-- value-ref="org.springframework.orm" /> -->
+					<!-- <entry -->
+					<!-- key="spring-framework-@{version}/libs/spring-oxm-@{version}.jar" -->
+					<!-- value-ref="org.springframework.oxm" /> -->
+					<!-- <entry -->
+					<!-- key="spring-framework-@{version}/libs/spring-test-@{version}.jar" -->
+					<!-- value-ref="org.springframework.test" /> -->
+					<entry key="spring-framework-@{version}/libs/spring-tx-@{version}.jar"
+						value-ref="org.springframework.tx" />
+					<entry key="spring-framework-@{version}/libs/spring-web-@{version}.jar"
+						value-ref="org.springframework.web" />
+					<entry
+						key="spring-framework-@{version}/libs/spring-webmvc-@{version}.jar"
+						value-ref="org.springframework.web.servlet" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<bean id="org.springframework.ldap" p:sourceCoords="org.springframework.ldap:spring-ldap-core:1.3.2.RELEASE"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="groupId" value="org.argeo.tp.spring.ldap" />
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Import-Package">
+					org.apache.commons.lang.*;resolution:=optional,
+					com.sun.jndi.ldap.*;resolution:=optional,
+					org.springframework.data.*;resolution:=optional,
+					org.springframework.orm.hibernate3;resolution:=optional,
+					*
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/swagger.xml b/org.argeo.tp.factory.extras/META-INF/spring/swagger.xml
new file mode 100644
index 0000000..251038b
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/swagger.xml
@@ -0,0 +1,56 @@
+<?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="ws/swagger" spec="spec.version">
+		<flow:arg name="version" value="1.5.24" />
+		<bean id="io.swagger.core"
+			p:sourceCoords="io.swagger:swagger-core:@{version}"
+			parent="template.swaggerMaven">
+		</bean>
+		<bean id="io.swagger.models"
+			p:sourceCoords="io.swagger:swagger-models:@{version}"
+			parent="template.swaggerMaven">
+		</bean>
+		<bean id="io.swagger.annotations"
+			p:sourceCoords="io.swagger:swagger-annotations:@{version}"
+			parent="template.swaggerMaven">
+		</bean>
+		<bean id="io.swagger.servlet"
+			p:sourceCoords="io.swagger:swagger-servlet:@{version}"
+			parent="template.swaggerMaven">
+			<property name="doNotModify" value="false" />
+		</bean>
+		<!-- Parser -->
+		<bean id="io.swagger.parser"
+			p:sourceCoords="io.swagger:swagger-parser:1.0.47"
+			parent="template.swaggerMaven">
+			<property name="doNotModify" value="false" />
+		</bean>
+		<!-- Old validation API -->
+		<bean id="javax.validation.api" p:version="1.1.0"
+			p:sourceCoords="javax.validation:validation-api:1.1.0.Final"
+			parent="template.swaggerMaven">
+		</bean>
+	</flow:flow>
+
+	<bean id="template.swaggerMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.swagger" />
+		<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/org.argeo.tp.factory.extras/META-INF/spring/templates.xml b/org.argeo.tp.factory.extras/META-INF/spring/templates.xml
new file mode 100644
index 0000000..0b62147
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/templates.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">
+
+	<!-- Specs and templates -->
+	<flow:spec id="spec.version">
+		<flow:primitive name="version" isParameter="true" />
+	</flow:spec>
+
+	<bean id="template.archiveWrapper" class="org.argeo.slc.repo.osgi.ArchiveWrapper"
+		init-method="init" destroy-method="destroy" abstract="true">
+		<property name="version" value="@{version}" />
+		<property name="osgiFactory" ref="osgiFactory" />
+	</bean>
+	<bean id="template.bndWrapper" class="org.argeo.slc.spring.repo.osgi.BndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.extras" />
+		<property name="bndProperties">
+			<props>
+				<prop key="Export-Package">*</prop>
+			</props>
+		</property>
+	</bean>
+	<bean id="template.mavenWrapper" class="org.argeo.slc.spring.repo.osgi.MavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.extras" />
+		<property name="bndProperties">
+			<props>
+				<prop key="Export-Package">*</prop>
+			</props>
+		</property>
+		<property name="osgiFactory" ref="osgiFactory" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.tp.factory.extras/META-INF/spring/ws.xml b/org.argeo.tp.factory.extras/META-INF/spring/ws.xml
new file mode 100644
index 0000000..cf0c288
--- /dev/null
+++ b/org.argeo.tp.factory.extras/META-INF/spring/ws.xml
@@ -0,0 +1,35 @@
+<?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">
+
+
+	<bean id="org.atmosphere.runtime"
+		p:sourceCoords="org.atmosphere:atmosphere-runtime:2.4.32"
+		parent="template.wsMaven">
+	</bean>
+
+	<bean id="org.atmosphere.socketio"
+		p:sourceCoords="org.atmosphere:atmosphere-socketio:2.4.21"
+		parent="template.wsMaven">
+		<property name="doNotModify" value="false" />
+	</bean>
+
+	<bean id="template.wsMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.ws" />
+		<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/org.argeo.tp.factory.extras/bnd.bnd b/org.argeo.tp.factory.extras/bnd.bnd
new file mode 100644
index 0000000..e69de29
diff --git a/org.argeo.tp.factory.extras/pom.xml b/org.argeo.tp.factory.extras/pom.xml
new file mode 100644
index 0000000..5bef932
--- /dev/null
+++ b/org.argeo.tp.factory.extras/pom.xml
@@ -0,0 +1,73 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>lib</artifactId>
+		<version>2.1.17-SNAPSHOT</version>
+	</parent>
+	<groupId>org.argeo.tp.factory</groupId>
+	<artifactId>org.argeo.tp.factory.extras</artifactId>
+	<version>2.1.14-SNAPSHOT</version>
+	<name>Extras Third Party Factory</name>
+	<properties>
+		<additionalImports.slc-lib>
+			javax.security.auth.callback;resolution:="optional"
+		</additionalImports.slc-lib>
+	</properties>
+	<build>
+		<resources>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>argeo-osgi-plugin</artifactId>
+				<version>2.1.1</version>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>argeo</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+		</repository>
+	</repositories>
+</project>
diff --git a/pom.xml b/pom.xml
index 420dba1..f770537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,11 @@
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>argeo-distribution</artifactId>
 	<version>2.1.28-SNAPSHOT</version>
-	<name>Argeo Java OSGi Distribution</name>
+	<name>Argeo Java OSGi Distributions</name>
 	<description>OSGi packaging of free / open source third party libraries</description>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.argeo.tp.factory.core</module>
+		<module>org.argeo.tp.factory.extras</module>
 	</modules>
 </project>
-- 
2.30.2