X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fjavax.xml;h=1daeb1e8f24cfe4d1f59d94a08c6e5233615477c;hb=70df887e075f3e4d2d67d6e65eb58e2ddc1eea0f;hp=386d12ede92155868eb1f97575f5babcd7a75964;hpb=97978829285da021d51bcca60c24be4fc3e70bde;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 386d12e..1daeb1e 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -1,36 +1,99 @@
 <?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"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-	<!-- REGISTER -->
-	<!-- <bean id="javax.annotation" p:version="3.0.0" parent="template.javax" 
-		/> -->
-	<!-- <bean id="javax.el" p:version="2.2.0" parent="template.javax" /> -->
-	<!-- <bean id="javax.servlet" p:version="3.0.0" parent="template.javax" 
-		/> -->
-	<!-- <bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" 
-		/> -->
-
-	<bean id="javax.inject" p:version="1.0.0" p:groupId="org.argeo.tp.javax"
-		p:sourceCoords="javax.inject:javax.inject:1" parent="template.mavenWrapper" />
-
-	<bean id="javax.el" p:version="2.2.5" p:groupId="org.argeo.tp.javax"
-		p:sourceCoords="javax.el:javax.el-api:2.2.5" parent="template.mavenWrapper" />
-
-	<bean id="javax.jcr" flow:as-flow="javax/javax.jcr" p:version="2.0.0"
-		p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"
-		parent="template.mavenWrapper" />
-
-	<!-- FACTORY -->
-<!-- 	<bean id="template.javax" parent="template.bndWrapper" abstract="true"> -->
-<!-- 		<property name="groupId" value="org.argeo.tp.javax" /> -->
-<!-- 		<property name="license"> -->
-<!-- 			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
-<!-- 		</property> -->
-<!-- 	</bean> -->
+	<bean id="javax.inject" p:version="1.0.0"
+		p:sourceCoords="javax.inject:javax.inject:1"
+		parent="template.mavenJavax">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
+	<bean id="javax.jcr" p:version="2.0.0"
+		p:sourceCoords="javax.jcr:jcr:2.0" parent="template.mavenJavax">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
+	<bean id="javax.transaction" p:version="1.1.0"
+		p:sourceCoords="javax.transaction:jta:1.1"
+		parent="template.mavenJavax">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+		</property>
+		<property name="bndProperties">
+			<props merge="true">
+				<prop key="Fragment-Host">system.bundle; extension:=framework</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- Javax transaction 1.3 has dependencies -->
+	<!-- <bean id="javax.transaction-api" p:version="1.3" -->
+	<!-- p:sourceCoords="javax.transaction:javax.transaction-api:1.3" -->
+	<!-- parent="template.mavenJavax"> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant -->
+	<!-- static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
+	<!-- </property> -->
+	<!-- <property name="doNotModify" value="true" /> -->
+	<!-- </bean> -->
+
+	<bean id="javax.mail"
+		p:sourceCoords="com.sun.mail:javax.mail:1.6.2"
+		parent="template.mavenJavax">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+		</property>
+	</bean>
+
+	<bean id="javax.annotation"
+		p:sourceCoords="javax.annotation:javax.annotation-api:1.3.2"
+		parent="template.mavenJavax">
+		<property name="license">
+			<!-- GPL with classpath exception -->
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+		</property>
+	</bean>
+
+	<!-- Hipster technologies -->
+	<bean id="javax.websocket"
+		p:sourceCoords="javax.websocket:javax.websocket-api:1.1"
+		parent="template.mavenJavax">
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.persistence"
+		p:sourceCoords="org.eclipse.persistence:javax.persistence:2.2.1"
+		parent="template.mavenJavax">
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.ws.rs"
+		p:sourceCoords="javax.ws.rs:javax.ws.rs-api:2.1.1"
+		parent="template.mavenJavax">
+	</bean>
+
+	<bean id="javax.xml.bind" p:version="2.4.0"
+		p:sourceCoords="javax.xml.bind:jaxb-api:2.4.0-b180830.0359"
+		parent="template.mavenJavax">
+	</bean>
+
+	<!-- Templates -->
+	<bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
+		abstract="true" parent="template.mavenWrapper" />
 </beans>
\ No newline at end of file