Update with Eclipse Oxygen SR2

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

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index a6701ab3d98ec09257b1aef6dcccb9b9f13cb5a1..24ac8d0d000243321bc91df3a7024c660360ea6a 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -7,28 +7,49 @@
        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: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.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.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.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.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>
 
-       <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" />
+       <bean id="javax.mail" p:sourceCoords="com.sun.mail:javax.mail:1.5.2"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- GPL with classpath exception -->
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.GPL" />
+               </property>
+       </bean>
 
-       <!-- FACTORY -->
-       <bean id="template.javax" parent="template.bndWrapper" abstract="true">
-               <property name="groupId" value="org.argeo.tp.javax" />
+       <bean id="javax.annotation" p:version="1.2.0" p:sourceCoords="javax.annotation:javax.annotation-api:1.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>
        </bean>
+
+       <!-- Templates -->
+       <bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
+               abstract="true" parent="template.mavenWrapper" />
 </beans>
\ No newline at end of file