Work on Argeo TP v2.1.19

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 32cf16df3a536d75a7fe738474371b5a8774b3e9..515c4b8ee1eab1bc74ae031b5abd045368d8548a 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -61,6 +61,12 @@
                <bean p:version="1.3.0" parent="template.commonsArchiveWrapper" />
        </flow:flow>
 
+       <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" />
+       </flow:flow>
+
        <flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
                <flow:arg name="project" value="net" />
                <flow:arg name="version" value="3.3" />

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index b9a4117ac8e5d4200f953e2b8c0fb0edf51bd7eb..b532eb4a5dad81338dae13fbcb33e79ff515f215 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- 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.18" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.19" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -21,26 +21,26 @@
 
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
-<!--                           <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
+                               <!-- <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
 
                                <!-- Standalone projects -->
                                <ref bean="misc/org.slf4j" />
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
-<!--                           <ref bean="org.joda.time" /> -->
+                               <!-- <ref bean="org.joda.time" /> -->
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="org.objectweb.asm" />
                                <ref bean="org.aspectj.weaver" />
                                <ref bean="misc/org.bouncycastle" />
-<!--                           <ref bean="org.quartz-scheduler.quartz" /> -->
-<!--                           <ref bean="org.quartz-scheduler.quartz.jobs" /> -->
+                               <!-- <ref bean="org.quartz-scheduler.quartz" /> -->
+                               <!-- <ref bean="org.quartz-scheduler.quartz.jobs" /> -->
                                <ref bean="bitronix.tm" />
-<!--                           <ref bean="misc/org.w3c.css.sac" /> -->
-<!--                           <ref bean="com.steadystate.css" /> -->
+                               <!-- <ref bean="misc/org.w3c.css.sac" /> -->
+                               <!-- <ref bean="com.steadystate.css" /> -->
                                <ref bean="com.googlecode.javaewah.JavaEWAH" />
                                <ref bean="org.w3c.dom.svg" />
-                               
+
                                <!-- Apache -->
                                <ref bean="apache/org.apache.log4j" />
                                <ref bean="apache/org.apache.ant" />
@@ -60,7 +60,8 @@
                                <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.jci" /> -->
+                               <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" />
 
@@ -92,10 +93,9 @@
                                <ref bean="org.h2" />
                                <ref bean="org.dbunit" />
                                <!-- ALM -->
-                               <ref bean="eclipse/org.eclipse.aether" />
                                <ref bean="org.redline-rpm" />
                                <ref bean="org.eclipse.jgit" />
-<!--                           <ref bean="misc/org.tmatesoft.svnkit" /> -->
+                               <!-- <ref bean="misc/org.tmatesoft.svnkit" /> -->
                        </list>
                </property>
        </bean>
@@ -122,10 +122,12 @@
                                </entry>
                                <entry key="http://www.eclipse.org/downloads">
                                        <list>
-                                               <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>http://ftp-stud.hs-esslingen.de/Mirrors/eclipse/</value>
+                                               <value>http://ftp.fau.de/eclipse/</value>
+                                               <!-- <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> -->
                                        </list>
                                </entry>
                        </map>

diff --git a/META-INF/spring/eclipse.rap.e4.xml b/META-INF/spring/eclipse.rap.e4.xml
new file mode 100644 (file)
index 0000000..b100e24
--- /dev/null
+++ b/META-INF/spring/eclipse.rap.e4.xml
@@ -0,0 +1,89 @@
+<?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"
+       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-0.12.xsd">
+
+       <!-- Eclipse rap platform -->
+       <flow:flow name="eclipse/org.argeo.tp.rap.e4" parent="template.importRap">
+               <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:flow id="template.importRap" spec="rapVersion.spec"
+               abstract="true">
+               <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+                       <property name="uri"
+                               value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/e4/rap-e4-@{rapTimestamp}.zip" />
+                       <property name="includes">
+                               <map>
+                                       <!-- Eclipse core -->
+                                       <entry key="plugins/org.eclipse.core.*.jar" value="org.argeo.tp.rap.e4" />
+
+                                       <!-- RWT -->
+                                       <entry key="plugins/org.eclipse.rap.rwt_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.rwt.source_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.rwt.osgi_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar"
+                                               value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.fileupload*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.filedialog*.jar" value="org.argeo.tp.rap.e4" />
+
+                                       <!-- Eclipse 4 -->
+                                       <entry key="plugins/org.eclipse.e4*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.emf*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.e4_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.e4.source_*.jar" value="org.argeo.tp.rap.e4" />
+
+                                       <!-- RAP UI with the workbench -->
+                                       <entry key="plugins/org.eclipse.rap.ui.workbench*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.ui_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.ui.source_*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.ui.views*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.jface*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.rap.ui.forms*.jar" value="org.argeo.tp.rap.e4" />
+                                       <entry key="plugins/org.eclipse.help*.jar" value="org.argeo.tp.rap.e4" />
+
+                                       <!-- Misc -->
+                                       <entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.e4" />
+                               </map>
+                       </property>
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
+       </flow:flow>
+
+       <!-- Addons -->
+
+       <!-- The corresponding zip must be manually imported in the dist repo at 
+               path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ -->
+
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons" parent="template.importRapAddons"> -->
+       <!-- <flow:arg name="rapRelease" value="0.6" /> -->
+       <!-- <flow:arg name="rapTimestamp" value="0.6.0.v20150207" /> -->
+       <!-- </flow:flow> -->
+
+       <!-- <flow:flow id="template.importRapAddons" spec="rapVersion.spec" -->
+       <!-- abstract="true"> -->
+       <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> -->
+       <!-- <property name="uri" -->
+       <!-- value="http://www.eclipse.org/downloads/rt/rap/addons/@{rapRelease}/addons-@{rapTimestamp}.zip" 
+               /> -->
+       <!-- <property name="includes"> -->
+       <!-- <map> -->
+       <!-- <entry key="plugins/org.eclipse.rap.addons.*.jar" value="org.argeo.tp.rap" 
+               /> -->
+       <!-- </map> -->
+       <!-- </property> -->
+       <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+       <!-- </bean> -->
+       <!-- </flow:flow> -->
+</beans>
\ No newline at end of file

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 80eb2c6bd4598e6b95c142c630bab4e5601fbc9b..cb43a4caa677e20cab57565e0fde45b2c7256888 100644 (file)
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -9,8 +9,8 @@
 
        <!-- Eclipse rap platform -->
        <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-               <flow:arg name="rapRelease" value="3.2" />
-               <flow:arg name="rapTimestamp" value="3.2.0-R-20170614-1509" />
+               <flow:arg name="rapRelease" value="3.4" />
+               <flow:arg name="rapTimestamp" value="3.4.0-R-20171204-1637" />
        </flow:flow>
 
        <!-- Rap specs and templates -->