Working rap Eclipse 4

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index d6208eb67429d26fd17dedae2de6842cdb2a1e36..4985932bd34559f3f0c84b4783c728326f3b1602 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.19.r201712291324\r
+Bundle-Version: 2.1.20.SNAPSHOT-r201801061235\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

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index f558095d67370dcac314bd300714f56929b6a394..0ba924e52cbcb8283ba2ee82d2dd6076ae484cfd 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,15 +10,15 @@
        <!-- REGISTER -->
        <bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.19" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.20-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
-                               <ref bean="javax.inject" />
+<!--                           <ref bean="javax.inject" /> -->
                                <ref bean="javax.jcr" />
                                <ref bean="javax.transaction" />
                                <ref bean="javax.mail" />
-                               <ref bean="javax.annotation" />
+<!--                           <ref bean="javax.annotation" /> -->
 
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
@@ -61,7 +61,7 @@
                                <ref bean="apache/org.apache.commons.vfs" />
                                <ref bean="apache/org.apache.commons.net" />
                                <ref bean="apache/org.apache.commons.exec" />
-                               <ref bean="apache/org.apache.commons.jxpath" />
+<!--                           <ref bean="apache/org.apache.commons.jxpath" /> -->
                                <!-- <ref bean="apache/org.apache.commons.jci" /> -->
                                <ref bean="apache/org.apache.commons.compress" />
                                <ref bean="apache/org.apache.commons.lang3" />
@@ -71,7 +71,7 @@
                                <ref bean="com.google.gson" />
 
                                <!-- Eclipse -->
-                               <ref bean="eclipse/org.argeo.tp.jetty" />
+<!--                           <ref bean="eclipse/org.argeo.tp.jetty" /> -->
                                <ref bean="eclipse/org.argeo.tp.equinox" />
                                <ref bean="eclipse/org.argeo.tp.gemini" />
 
@@ -103,7 +103,7 @@
 
        <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" />
+               <constructor-arg value="org.argeo.tp:argeo-tp-rap-e4:2.1.20-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index bbae7bcca4bd0f9ebf4dbae4b1770db6609762b5..c2d5a142eeb1c62b388fb0a36c6858e04f4d6a6c 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -35,9 +35,12 @@
                                        <entry key="plugins/javax.servlet*.jar" value="org.argeo.tp.javax" />
                                        <entry key="plugins/javax.el*.jar" value="org.argeo.tp.javax" />
 
+                                       <!-- Jetty -->
+                                       <entry key="plugins/org.eclipse.jetty*.jar" value="org.argeo.tp.jetty" />
+
                                        <!-- Felix -->
                                        <entry key="plugins/org.apache.felix.gogo.*.jar" value="org.argeo.tp.apache.felix" />
-                                       <entry key="plugins/org.apache.felix.scr_*.jar" value="org.argeo.tp.apache.felix" />
+                                       <entry key="plugins/org.apache.felix.scr*.jar" value="org.argeo.tp.apache.felix" />
 
                                        <!-- Required by RAP -->
                                        <entry key="plugins/org.eclipse.equinox.app*.jar" value="org.argeo.tp.equinox" />

diff --git a/META-INF/spring/eclipse.rap.e4.xml b/META-INF/spring/eclipse.rap.e4.xml
index ad7cd158930aeb57d9dfccd4755c5fc01379be61..282a6ab2607e93c81b9b9ad63a5949ce79591f33 100644 (file)
--- a/META-INF/spring/eclipse.rap.e4.xml
+++ b/META-INF/spring/eclipse.rap.e4.xml
@@ -26,6 +26,13 @@
                                value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/e4/rap-e4-@{rapTimestamp}.zip" />
                        <property name="includes">
                                <map>
+                                       <!-- Javax -->
+                                       <entry key="plugins/javax.inject*.jar" value="org.argeo.tp.javax" />
+                                       <entry key="plugins/javax.annotation*.jar" value="org.argeo.tp.javax" />
+
+                                       <!-- Apache Commons -->
+                                       <entry key="plugins/org.apache.commons.jxpath*.jar" value="org.argeo.tp.rap.e4" />
+
                                        <!-- Eclipse core -->
                                        <entry key="plugins/org.eclipse.core.*.jar" value="org.argeo.tp.rap.e4" />
 

diff --git a/pom.xml b/pom.xml
index 0466389a469540cec44b4146a14917642df9e80e..2236042bd093be7af86a5ec5b2b0973de4c1587f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.19</version>
+       <version>2.1.20-SNAPSHOT</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>