X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Fjavax.xml;h=a7920873945f38d8a37f00b0293354964e00e712;hb=aa5b1ad913de3cbb33e60804388ba21b5df45734;hp=3a7aa7ace1d3651ac9ffdb470441d014e8bdff84;hpb=f3c53c0efd474aa24e034583300182b0bc98b58b;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 3a7aa7a..a792087 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -1,44 +1,126 @@
 <?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">
 
-	<bean id="javax.inject" p:version="1.0.0" p:sourceCoords="javax.inject:javax.inject:1"
+	<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" />
+			<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"
+	<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-api"
+		p:sourceCoords="javax.transaction:javax.transaction-api:1.3"
+		parent="template.mavenJavax">
+		<property name="license">
+			<!-- GPL with classpath exception -->
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.activation"
+		p:sourceCoords="com.sun.activation:javax.activation:1.2.0"
 		parent="template.mavenJavax">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
 		</property>
+		<property name="doNotModify" value="true" />
 	</bean>
 
-	<bean id="javax.transaction" p:version="1.1.0" p:sourceCoords="javax.transaction:jta:1.1"
+	<bean id="javax.interceptor-api"
+		p:sourceCoords="javax.interceptor:javax.interceptor-api:1.2.2"
 		parent="template.mavenJavax">
 		<property name="license">
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
+			<!-- GPL with classpath exception -->
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.GPL" />
 		</property>
-		<property name="bndProperties">
-			<props merge="true">
-				<prop key="Fragment-Host">system.bundle; extension:=framework</prop>
-			</props>
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.el-api"
+		p:sourceCoords="javax.el:javax.el-api:2.2.5"
+		parent="template.mavenJavax">
+		<property name="license">
+			<!-- GPL with classpath exception -->
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.GPL" />
 		</property>
+		<property name="doNotModify" value="true" />
 	</bean>
 
-	<bean id="javax.mail" p:sourceCoords="com.sun.mail:javax.mail:1.5.2"
+	<bean id="javax.enterprise.cdi-api" p:version="2.0.0.SP1"
+		p:sourceCoords="javax.enterprise:cdi-api:2.0.SP1"
 		parent="template.mavenJavax">
 		<property name="license">
 			<!-- GPL with classpath exception -->
-			<util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.mail"
+		p:sourceCoords="javax.mail:javax.mail-api:1.6.2"
+		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.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 -->