Update with Eclipse Oxygen SR2

Introduce RAP Eclipse 4

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index b64e0c2f767c20d7e81be7ffd8c8d1c0e4461c61..d6208eb67429d26fd17dedae2de6842cdb2a1e36 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.18.r201708261305\r
+Bundle-Version: 2.1.19.r201712291324\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r
@@ -20,24 +20,25 @@ Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  g.springframework.beans.factory.config;version="[3.2,4)",org.springfram\r
  ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution\r
  :=optional\r
-Include-Resource: META-INF/spring/spring.xml=META-INF/spring/spring.xml,\r
- META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/spring.\r
- security.xml=META-INF/spring/spring.security.xml,META-INF/spring/apache\r
- .jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/spring/m\r
- isc.xml=META-INF/spring/misc.xml,META-INF/spring/apache.tomcat.xml=META\r
- -INF/spring/apache.tomcat.xml,META-INF/spring/eclipse.jetty.xml=META-IN\r
- F/spring/eclipse.jetty.xml,META-INF/spring/apache.commons.xml=META-INF/\r
- spring/apache.commons.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi\r
- .xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml,META-I\r
- NF/spring/distribution.xml=META-INF/spring/distribution.xml,META-INF/sp\r
- ring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/apache.felix\r
- .xml=META-INF/spring/apache.felix.xml,META-INF/spring/eclipse.equinox.x\r
- ml=META-INF/spring/eclipse.equinox.xml,META-INF/spring/bouncycastle.xml\r
- =META-INF/spring/bouncycastle.xml,META-INF/spring/eclipse.rap.xml=META-\r
- INF/spring/eclipse.rap.xml,META-INF/spring/apache.ant.xml=META-INF/spri\r
- ng/apache.ant.xml,META-INF/spring/apache.xml=META-INF/spring/apache.xml\r
+Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl\r
+ ipse.rap.e4.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apac\r
+ he.commons.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/apache\r
+ .tomcat.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml\r
  ,META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,\r
- META-INF/spring/javax.xml=META-INF/spring/javax.xml\r
+ META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/\r
+ spring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.x\r
+ ml=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml\r
+ =META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF\r
+ /spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,MET\r
+ A-INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF\r
+ /spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-IN\r
+ F/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=MET\r
+ A-INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spri\r
+ ng/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/d\r
+ istribution.xml,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse\r
+ .rap.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF\r
+ /spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,MET\r
+ A-INF/spring/apache.xml=META-INF/spring/apache.xml\r
 Private-Package: !*\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 515c4b8ee1eab1bc74ae031b5abd045368d8548a..591cc7570c50792acad5e809779862d336493760 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -64,7 +64,27 @@
        <flow:flow name="apache/org.apache.commons.jxpath" spec="spec.commons">
                <flow:arg name="project" value="jxpath" />
                <flow:arg name="version" value="1.3" />
-               <bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
+               <bean p:version="1.3.0" parent="template.commonsArchiveWrapper">
+                       <property name="wrappers">
+                               <map>
+                                       <entry
+                                               key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+                                               <bean id="org.apache.commons.jxpath" parent="template.org.apache.commons">
+                                                       <property name="bndProperties">
+                                                               <props merge="true">
+                                                                       <prop key="Import-Package">
+                                                                               javax.servlet.jsp.*;resolution:=optional,
+                                                                               org.apache.commons.beanutils.*;resolution:=optional,
+                                                                               org.jdom.*;resolution:=optional,
+                                                                               *
+                                                                       </prop>
+                                                               </props>
+                                                       </property>
+                                               </bean>
+                                       </entry>
+                               </map>
+                       </property>
+               </bean>
        </flow:flow>
 
        <flow:flow name="apache/org.apache.commons.net" spec="spec.commons">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index b532eb4a5dad81338dae13fbcb33e79ff515f215..f558095d67370dcac314bd300714f56929b6a394 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -16,8 +16,9 @@
                                <!-- Javax -->
                                <ref bean="javax.inject" />
                                <ref bean="javax.jcr" />
-                               <ref bean="javax.mail" />
                                <ref bean="javax.transaction" />
+                               <ref bean="javax.mail" />
+                               <ref bean="javax.annotation" />
 
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
@@ -100,6 +101,16 @@
                </property>
        </bean>
 
+       <bean id="argeo-tp-rap-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
+               init-method="init" destroy-method="destroy">
+               <constructor-arg value="org.argeo.tp:argeo-tp-rap-e4:2.1.19" />
+               <property name="modules">
+                       <list>
+                               <ref bean="eclipse/org.argeo.tp.rap.e4" />
+                       </list>
+               </property>
+       </bean>
+
        <!-- Factory -->
        <bean id="osgiFactory" class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
                init-method="init" destroy-method="destroy">
@@ -127,7 +138,7 @@
                                                <!-- <value>http://eclipse.mirror.garr.it/mirrors/eclipse</value> -->
                                                <!-- <value>http://mirror.netcologne.de/eclipse</value> -->
                                                <!-- <value>http://mirror.selfnet.de/eclipse</value> -->
-<!--                                           <value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value> -->
+                                               <!-- <value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value> -->
                                        </list>
                                </entry>
                        </map>
@@ -147,6 +158,10 @@
                        <property name="osgiDistribution" ref="argeo-tp" />
                        <property name="osgiFactory" ref="osgiFactory" />
                </bean>
+               <bean class="org.argeo.slc.repo.osgi.ProcessDistribution">
+                       <property name="osgiDistribution" ref="argeo-tp-rap-e4" />
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
        </flow:flow>
 
        <!-- Security -->

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 87cc0c7fe59e43d051a8309ec7c3ec8a7560ce11..bbae7bcca4bd0f9ebf4dbae4b1770db6609762b5 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,8 +8,8 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-               <flow:arg name="equinoxRelease" value="Oxygen" />
-               <flow:arg name="equinoxTimestamp" value="201706120950" />
+               <flow:arg name="equinoxRelease" value="Oxygen.2" />
+               <flow:arg name="equinoxTimestamp" value="201711300510" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->
@@ -32,8 +32,7 @@
                                        <entry key="plugins/org.eclipse.osgi.services*.jar" value="org.argeo.tp.equinox" />
 
                                        <!-- Javax -->
-                                       <entry key="plugins/javax.servlet_*.jar" value="org.argeo.tp.javax" />
-                                       <entry key="plugins/javax.servlet.source_*.jar" value="org.argeo.tp.javax" />
+                                       <entry key="plugins/javax.servlet*.jar" value="org.argeo.tp.javax" />
                                        <entry key="plugins/javax.el*.jar" value="org.argeo.tp.javax" />
 
                                        <!-- Felix -->

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 23dab080bfe7cbbbb644b31766aac076808c9d2e..e0d4ed028384ee0d207a09a29d6092e8b99a576e 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -8,7 +8,7 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
-               <flow:arg name="jettyVersion" value="9.4.6.v20170531" />
+               <flow:arg name="jettyVersion" value="9.4.8.v20171121" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->

diff --git a/META-INF/spring/eclipse.rap.e4.xml b/META-INF/spring/eclipse.rap.e4.xml
index b100e24d42cbcf34e06ce444284b8601c884a967..ad7cd158930aeb57d9dfccd4755c5fc01379be61 100644 (file)
--- a/META-INF/spring/eclipse.rap.e4.xml
+++ b/META-INF/spring/eclipse.rap.e4.xml
@@ -8,18 +8,18 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <!-- Eclipse rap platform -->
-       <flow:flow name="eclipse/org.argeo.tp.rap.e4" parent="template.importRap">
+       <flow:flow name="eclipse/org.argeo.tp.rap.e4" parent="template.importRapE4">
                <flow:arg name="rapRelease" value="3.4" />
                <flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
        </flow:flow>
 
        <!-- Rap specs and templates -->
-       <flow:spec id="rapVersion.spec">
-               <flow:primitive name="rapRelease" isParameter="true" />
-               <flow:primitive name="rapTimestamp" isParameter="true" />
-       </flow:spec>
+<!--   <flow:spec id="rapVersion.spec"> -->
+<!--           <flow:primitive name="rapRelease" isParameter="true" /> -->
+<!--           <flow:primitive name="rapTimestamp" isParameter="true" /> -->
+<!--   </flow:spec> -->
 
-       <flow:flow id="template.importRap" spec="rapVersion.spec"
+       <flow:flow id="template.importRapE4" spec="rapVersion.spec"
                abstract="true">
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
                        <property name="uri"

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index cb43a4caa677e20cab57565e0fde45b2c7256888..b0ded129203d28e2c59b407029dcd7c861711fff 100644 (file)
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -35,8 +35,8 @@
                                        <entry key="plugins/org.eclipse.rap.rwt.osgi_*.jar" value="org.argeo.tp.rap.platform" />
                                        <entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar"
                                                value="org.argeo.tp.rap.platform" />
-                                       <entry key="plugins/org.eclipse.rap.fileupload_*.jar" value="org.argeo.tp.rap.platform" />
-                                       <entry key="plugins/org.eclipse.rap.filedialog_*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.fileupload*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.filedialog*.jar" value="org.argeo.tp.rap.platform" />
 
                                        <!-- RAP UI with the workbench -->
                                        <entry key="plugins/org.eclipse.rap.ui.workbench*.jar" value="org.argeo.tp.rap.platform" />

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 3a7aa7ace1d3651ac9ffdb470441d014e8bdff84..24ac8d0d000243321bc91df3a7024c660360ea6a 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -41,6 +41,14 @@
                </property>
        </bean>
 
+       <bean id="javax.annotation" p:version="1.2.0" p:sourceCoords="javax.annotation:javax.annotation-api:1.2"
+               parent="template.mavenJavax">
+               <property name="license">
+                       <!-- 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" />

diff --git a/pom.xml b/pom.xml
index fe293ef970eb82ade4bb59b9801309dca7abf257..0466389a469540cec44b4146a14917642df9e80e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.9</version>
+               <version>2.1.10</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.18</version>
+       <version>2.1.19</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>