Work on including rap platform to base distribution.

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 36a55b995bf717e2ec01eb1cc080be457b6301d4..0d0e3cbb68a3677f29419d137097acec7f7db8c7 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -19,8 +19,6 @@
                                <ref bean="org.junit" />
                                <ref bean="org.h2" />
                                <ref bean="org.joda.time" />
-                               <!-- This has been defined as optional via bnd -->
-                               <!-- <ref bean="com.jcraft.jzlib" /> -->
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="javax.el" />
@@ -53,6 +51,9 @@
                                <ref bean="eclipse/org.argeo.tp.jetty" />
                                <ref bean="eclipse/org.argeo.tp.equinox" />
                                <ref bean="eclipse/org.argeo.tp.gemini" />
+                               
+                               <!-- Rap -->
+                               <ref bean="eclipse/org.argeo.tp.rap.platform" />
                                <!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
                                <!-- <ref bean="org.eclipse.gemini.web.core" /> -->
                                <!-- <ref bean="org.eclipse.gemini.web.extender" /> -->

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 094514aff8c72becf54f3f6ab642606e7fc9e98e..e663799279d95b226b01c234cd2d9adc63d62a6a 100644 (file)
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -7,118 +7,74 @@
        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">
 
-       <!-- RAP 2.2 -->
-       <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0"
-               parent="template.importRapZip">
-               <flow:arg name="rapBranch" value="2.2" />
-               <flow:arg name="rapVersion" value="2.2.0-R-20131204-0942" />
+       <!-- Eclipse rap platform -->
+       <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
+               <flow:arg name="rapRelease" value="2.3" />
+               <flow:arg name="rapTimestamp" value="2.3.1-SR1-20140909-1638" />
        </flow:flow>
-
-       <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0-M1"
-               parent="template.importRapZip">
-               <flow:arg name="rapBranch" value="2.2" />
-               <flow:arg name="rapVersion" value="2.2.0-M1-20130821-1618" />
+       <!--  <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
+               <flow:arg name="rapRelease" value="2.2.0" />
+               <flow:arg name="rapTimestamp" value="20131204-0942" />
        </flow:flow>
+        -->
 
-       <!-- RAP ADDONS - experimental: use a zip that has been manually uploaded 
-               in the dist repo -->
-       <flow:flow name="eclipse/org.argeo.tp.rap.addons_0.5.0"
-               parent="template.importRapAddonsZip">
-               <flow:arg name="rapBranch" value="2.2" />
-               <flow:arg name="rapVersion" value="0.5.0.argeo.20141029" />
-       </flow:flow>
-
-       <flow:flow name="eclipse/org.argeo.tp.rap.addons_0.2.0"
-               parent="template.importRapAddonsZip">
-               <flow:arg name="rapBranch" value="2.2" />
-               <flow:arg name="rapVersion" value="0.2.0.20131212-1229" />
-       </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.importRapAddonsZip" spec="rapVersion.spec"
+       <flow:flow id="template.importRap" spec="rapVersion.spec"
                abstract="true">
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-                       <property name="version" value="@{rapVersion}" />
-                       <property name="mavenGroupIndexes" value="true" />
                        <property name="uri"
-                               value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-addons-@{rapVersion}.zip" />
+                               value="http://www.eclipse.org/downloads/rt/rap/@{rapRelease}/rap-@{rapTimestamp}.zip" />
                        <property name="includes">
                                <map>
-                                       <entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" />
+                                       <entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/javax.xml_*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.apache.felix.gogo.*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.core.*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.jface.*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.rwt.*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.ui*.jar" value="org.argeo.tp.rap.platform" />
                                </map>
                        </property>
-                       <property name="osgiFactory">
-                               <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
-                                       init-method="init" destroy-method="destroy">
-                                       <property name="workspace" value="eclipse-rap-@{rapBranch}" />
-
-                                       <property name="nodeIndexers">
-                                               <list>
-                                                       <bean class="org.argeo.slc.repo.ArtifactIndexer" />
-                                                       <bean class="org.argeo.slc.repo.JarFileIndexer" />
-                                                       <bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
-                                                       <bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
-                                               </list>
-                                       </property>
-                                       <property name="javaRepository" ref="javaRepository" />
-                                       <property name="distRepository" ref="distRepository" />
-                               </bean>
-                       </property>
+                       <property name="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>
 
 
-       <!-- RAP 2.1 -->
-       <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.2"
-               parent="template.importRapZip">
-               <flow:arg name="rapBranch" value="2.1" />
-               <flow:arg name="rapVersion" value="2.1.2-R-20140210-0628" />
-       </flow:flow>
-
-       <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-R"
-               parent="template.importRapZip">
-               <flow:arg name="rapBranch" value="2.1" />
-               <flow:arg name="rapVersion" value="2.1.0-R-20130611-2139" />
-       </flow:flow>
-
-       <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-M1"
-               parent="template.importRapZip">
-               <flow:arg name="rapBranch" value="2.1" />
-               <flow:arg name="rapVersion" value="2.1.0-M1-20130318-2137" />
-       </flow:flow>
-
-       <!-- RAP specs and templates -->
-       <flow:spec id="rapVersion.spec">
-               <flow:primitive name="rapBranch" isParameter="true" />
-               <flow:primitive name="rapVersion" isParameter="false" />
-       </flow:spec>
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0" parent="template.importRapZip"> 
+               <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" value="2.2.0-R-20131204-0942" 
+               /> </flow:flow> <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.2.0-M1" 
+               parent="template.importRapZip"> <flow:arg name="rapBranch" value="2.2" /> 
+               <flow:arg name="rapVersion" value="2.2.0-M1-20130821-1618" /> </flow:flow> -->
 
-       <flow:flow id="template.importRapZip" spec="rapVersion.spec"
+       <!-- RAP ADDONS - experimental: use a zip that has been manually uploaded 
+               in the dist repo -->
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons_0.5.0" parent="template.importRapAddonsZip"> 
+               <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" value="0.5.0.argeo.20141029" 
+               /> </flow:flow> -->
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons_0.2.0" parent="template.importRapAddonsZip"> 
+               <flow:arg name="rapBranch" value="2.2" /> <flow:arg name="rapVersion" value="0.2.0.20131212-1229" 
+               /> </flow:flow> -->
+       <flow:flow id="template.importRapAddonsZip" spec="rapVersion.spec"
                abstract="true">
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
                        <property name="version" value="@{rapVersion}" />
                        <property name="mavenGroupIndexes" value="true" />
                        <property name="uri"
-                               value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" />
+                               value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-addons-@{rapVersion}.zip" />
                        <property name="includes">
                                <map>
-                                       <entry key="plugins/*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/*.jar" value="org.argeo.tp.rap.addons" />
                                </map>
                        </property>
                        <property name="osgiFactory">
                                <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl"
                                        init-method="init" destroy-method="destroy">
                                        <property name="workspace" value="eclipse-rap-@{rapBranch}" />
-                                       <property name="mirrors">
-                                               <map>
-                                                       <entry key="http://www.eclipse.org/downloads">
-                                                               <list>
-                                                                       <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>
-                                       </property>
 
                                        <property name="nodeIndexers">
                                                <list>
@@ -136,6 +92,32 @@
        </flow:flow>
 
 
+       <!-- RAP 2.1 -->
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.2" parent="template.importRapZip"> 
+               <flow:arg name="rapBranch" value="2.1" /> <flow:arg name="rapVersion" value="2.1.2-R-20140210-0628" 
+               /> </flow:flow> <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-R" 
+               parent="template.importRapZip"> <flow:arg name="rapBranch" value="2.1" /> 
+               <flow:arg name="rapVersion" value="2.1.0-R-20130611-2139" /> </flow:flow> 
+               <flow:flow name="eclipse/org.argeo.tp.rap.platform_2.1.0-M1" parent="template.importRapZip"> 
+               <flow:arg name="rapBranch" value="2.1" /> <flow:arg name="rapVersion" value="2.1.0-M1-20130318-2137" 
+               /> </flow:flow> <flow:flow id="template.importRapZip" spec="rapVersion.spec" 
+               abstract="true"> <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> <property 
+               name="version" value="@{rapVersion}" /> <property name="mavenGroupIndexes" 
+               value="true" /> <property name="uri" value="http://www.eclipse.org/downloads/rt/rap/@{rapBranch}/rap-@{rapVersion}.zip" 
+               /> <property name="includes"> <map> <entry key="plugins/*.jar" value="org.argeo.tp.rap.platform" 
+               /> </map> </property> <property name="osgiFactory"> <bean class="org.argeo.slc.repo.osgi.OsgiFactoryImpl" 
+               init-method="init" destroy-method="destroy"> <property name="workspace" value="eclipse-rap-@{rapBranch}" 
+               /> <property name="mirrors"> <map> <entry key="http://www.eclipse.org/downloads"> 
+               <list> <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> </property> <property name="nodeIndexers"> <list> 
+               <bean class="org.argeo.slc.repo.ModularDistributionIndexer" /> <bean class="org.argeo.slc.repo.JarFileIndexer" 
+               /> <bean class="org.argeo.slc.repo.ArtifactIndexer" /> <bean class="org.argeo.slc.repo.PdeSourcesIndexer" 
+               /> </list> </property> <property name="javaRepository" ref="javaRepository" 
+               /> <property name="distRepository" ref="distRepository" /> </bean> </property> 
+               </bean> </flow:flow> -->
+
+
 
 
        <!-- WORK IN PROGRESS add bundle from the incubator to the platform <flow:flow 

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index c7f33093cf25fee1e7125c813fb5f41099a02d66..ed8b0fc0bf97c3c4c2d6949225e4156f4912135f 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -78,7 +78,7 @@
                </property>
        </bean>
 
-       <!--  Needed by jsch -->
+       <!--  Needed by jsch: it is defined as optional via bnd -->
        <!--  <bean id="com.jcraft.jzlib" p:sourceCoords="com.jcraft:jzlib:1.1.3"
                parent="template.mavenWrapper">
                <property name="license">
@@ -88,7 +88,6 @@
 
        <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
                parent="template.mavenWrapper">
-               <!--  <property name="doNotModify" value="true" />  -->
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
                </property>