X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fspring.xml;h=487e7ba8c4e8b1d3748b7edff1a8c35b95087c37;hb=97978829285da021d51bcca60c24be4fc3e70bde;hp=f4efc616885aeb1369a1a10326200b95704c5b10;hpb=802f29eeaa54f7ea58b4d318d90b16806e24dea0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
index f4efc61..487e7ba 100644
--- 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">
@@ -166,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" />