X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Feclipse.rap.e4.xml;h=ed7c9b9ea91ad2dfb84e1f1359025ccd950c2af7;hb=585573bd4db81adf7c81abe52977390b74e0162e;hp=b100e24d42cbcf34e06ce444284b8601c884a967;hpb=3ed9517971c3151be7d42e8be27e3de9fd6237d7;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/eclipse.rap.e4.xml b/META-INF/spring/eclipse.rap.e4.xml
index b100e24..ed7c9b9 100644
--- a/META-INF/spring/eclipse.rap.e4.xml
+++ b/META-INF/spring/eclipse.rap.e4.xml
@@ -8,24 +8,31 @@
 	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 name="eclipse/org.argeo.tp.rap.e4" parent="template.importRapE4">
+		<flow:arg name="rapRelease" value="3.10" />
+		<flow:arg name="rapTimestamp" value="3.10.0-R-20190911-1524" />
 	</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"
 				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" />
 
@@ -52,9 +59,12 @@
 					<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" />
+					
+					<!-- Nebula -->
+					<entry key="plugins/org.eclipse.rap.nebula.*.jar" value="org.argeo.tp.rap.e4" />
 
 					<!-- Misc -->
-					<entry key="plugins/com.ibm.icu.base*.jar" value="org.argeo.tp.rap.e4" />
+					<entry key="plugins/com.ibm.icu*.jar" value="org.argeo.tp.rap.e4" />
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />