Delete or move to Argeo TP extras.
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 4 Oct 2019 06:57:28 +0000 (08:57 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 4 Oct 2019 06:57:28 +0000 (08:57 +0200)
META-INF/spring/aether.xml [deleted file]
META-INF/spring/apache.ant.xml [deleted file]
META-INF/spring/apache.felix.xml [deleted file]
META-INF/spring/apache.tomcat.xml [deleted file]
META-INF/spring/distribution.xml
META-INF/spring/eclipse.gemini.xml [deleted file]
META-INF/spring/spring.security.xml [deleted file]
META-INF/spring/spring.xml [deleted file]

diff --git a/META-INF/spring/aether.xml b/META-INF/spring/aether.xml
deleted file mode 100644 (file)
index b467bd9..0000000
+++ /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">
-
-       <!-- Aether -->
-       <flow:flow name="eclipse/org.eclipse.aether" spec="spec.version">
-               <flow:arg name="version" value="1.0.1" />
-               <bean parent="template.archiveWrapper">
-                       <property name="uri"
-                               value="http://www.eclipse.org/downloads/aether/aether-core/@{version}/dist/aether-@{version}-bin.zip" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-                       </property>
-                       <property name="includes">
-                               <map>
-                                       <entry key="aether-*/aether-*.jar" value="org.argeo.tp.aether" />
-                               </map>
-                       </property>
-                       <property name="excludes">
-                               <list>
-                                       <!-- Needs Apache Http Components -->
-                                       <value>aether-*/aether-transport-http-*.jar</value>
-                                       <!-- Needs Maven -->
-                                       <value>aether-*/aether-transport-wagon-*.jar</value>
-                               </list>
-                       </property>
-                       <property name="sourcesProvider">
-                               <!-- TODO make it more generic and include other sources -->
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="base"
-                                               value="/aether-1.0.1.v20141111/aether-api/src/main/java" />
-                                       <property name="uri"
-                                               value="http://www.eclipse.org/downloads/aether/aether-core/@{version}/dist/aether-@{version}-src.zip" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
-               </bean>
-       </flow:flow>
-</beans>
\ No newline at end of file
diff --git a/META-INF/spring/apache.ant.xml b/META-INF/spring/apache.ant.xml
deleted file mode 100644 (file)
index 2a61571..0000000
+++ /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="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.felix.xml b/META-INF/spring/apache.felix.xml
deleted file mode 100644 (file)
index 4019764..0000000
+++ /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/apache.tomcat.xml b/META-INF/spring/apache.tomcat.xml
deleted file mode 100644 (file)
index 06db0ec..0000000
+++ /dev/null
@@ -1,108 +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="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
index cd8de55b4f7ff9100a98cc1475c5aac65ad3aae1..fb67db34d3d03dc68171c00535270e89915c7784 100644 (file)
@@ -48,7 +48,6 @@
 
                                <!-- Apache -->
                                <ref bean="apache/org.apache.log4j" />
-                               <ref bean="apache/org.apache.ant" />
                                <ref bean="apache/org.apache.xmlgraphics" />
                                <ref bean="apache/org.apache.batik" />
                                <ref bean="apache/org.apache.httpcomponents.httpcore" />
                                <!-- Eclipse -->
                                <ref bean="eclipse/org.argeo.tp.jetty" />
                                <ref bean="eclipse/org.argeo.tp.equinox" />
-                               <ref bean="eclipse/org.argeo.tp.gemini" />
 
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />
                                <ref bean="apache/org.apache.lucene" />
                                <ref bean="apache/org.apache.jackrabbit" />
 
-                               <!-- Spring -->
-                               <ref bean="spring/org.springframework" />
-
                                <!-- Document generation and management -->
                                <ref bean="net.sf.jxl" />
                                <ref bean="apache/org.apache.pdfbox" />
diff --git a/META-INF/spring/eclipse.gemini.xml b/META-INF/spring/eclipse.gemini.xml
deleted file mode 100644 (file)
index f0309dd..0000000
+++ /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="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/spring.security.xml b/META-INF/spring/spring.security.xml
deleted file mode 100644 (file)
index 3ee412e..0000000
+++ /dev/null
@@ -1,60 +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="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-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/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
deleted file mode 100644 (file)
index f9e76e0..0000000
+++ /dev/null
@@ -1,270 +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">
-                                       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="http://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" />
-               <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