Reduce Jetty and Equinox

[gpl/argeo-tp.git] / META-INF / spring / spring.xml

diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
index 57057fd164e0061434e6f9ac6ce3bcb5a2c10950..487e7ba8c4e8b1d3748b7edff1a8c35b95087c37 100644 (file)
--- a/META-INF/spring/spring.xml
+++ b/META-INF/spring/spring.xml
@@ -76,42 +76,47 @@
        </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.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">
@@ -135,8 +140,7 @@
                <property name="groupId" value="org.argeo.tp.spring" />
        </bean>
 
-       <flow:flow name="spring/org.springframework"
-               spec="spec.version">
+       <flow:flow name="spring/org.springframework" spec="spec.version">
                <flow:arg name="version" value="3.2.4" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
@@ -167,27 +171,27 @@
                                        <entry
                                                key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
                                                value-ref="org.springframework.expression" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.instrument" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.instrument.tomcat" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.jdbc" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.jms" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.orm" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.oxm" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.test" />
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.instrument" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.instrument.tomcat" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.jdbc" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.jms" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.orm" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.oxm" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.test" /> -->
                                        <entry
                                                key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
                                                value-ref="org.springframework.tx" />
@@ -202,4 +206,11 @@
                </bean>
        </flow:flow>
 
+       <bean id="org.springframework.ldap" p:sourceCoords="org.springframework.ldap:spring-ldap-core:2.0.2.RELEASE"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+       </bean>
+
 </beans>
\ No newline at end of file