X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Feclipse.equinox.xml;h=d74d8cfe80a1ba2fadc67e4f08c854f1108402a3;hb=abfecf8c72b0fe119f6398afaa5aff278ca59456;hp=7ff099b3e5b59bb3870b9a9af63cf86fff2299d2;hpb=889e8ca3ade6deccd42daad263afd7065227d3f0;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 7ff099b..d74d8cf 100644
--- 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="LunaSR2" />
-		<flow:arg name="equinoxTimestamp" value="201502041700" />
+		<flow:arg name="equinoxRelease" value="Oxygen.2" />
+		<flow:arg name="equinoxTimestamp" value="201711300510" />
 	</flow:flow>
 
 	<!-- Equinox specs and templates -->
@@ -32,12 +32,18 @@
 					<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 console -->
+					<!-- 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" />
+
+					<!-- Apache -->
+					<entry key="plugins/org.apache.jasper.*.jar" value="org.argeo.tp.apache" />
 
 					<!-- Required by RAP -->
 					<entry key="plugins/org.eclipse.equinox.app*.jar" value="org.argeo.tp.equinox" />
@@ -47,6 +53,7 @@
 					<entry key="plugins/org.eclipse.equinox.console.source_*.jar"
 						value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.equinox.ds*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.metatype*.jar" value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.equinox.event*.jar" value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.equinox.http.jetty*.jar"
 						value="org.argeo.tp.equinox" />
@@ -62,35 +69,37 @@
 					<entry key="plugins/org.eclipse.equinox.servletbridge*.jar"
 						value="org.argeo.tp.equinox" />
 					<entry key="plugins/org.eclipse.equinox.util*.jar" value="org.argeo.tp.equinox" />
+					<entry key="plugins/org.eclipse.equinox.jsp.*.jar" value="org.argeo.tp.equinox" />
 				</map>
 			</property>
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>
 
-	<flow:flow name="eclipse/org.eclipse.jdt.core.compiler.batch"
-		spec="equinoxVersion.spec">
-		<flow:arg name="equinoxRelease" value="4.4.1" />
-		<flow:arg name="equinoxTimestamp" value="201409250400" />
-		<bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper">
-			<!-- TODO URI wrapper should be able to read OSGi metadata -->
-			<property name="version" value="3.10.0.v20140902-0626" />
-			<property name="uri"
-				value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" />
-			<property name="groupId" value="org.argeo.tp.equinox" />
-			<property name="doNotModify" value="true" />
-			<property name="license">
-				<util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-			</property>
-			<property name="osgiFactory" ref="osgiFactory" />
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecjsrc-@{equinoxRelease}.jar" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
-		</bean>
-	</flow:flow>
+	<!-- <flow:flow name="eclipse/org.eclipse.jdt.core.compiler.batch" -->
+	<!-- spec="equinoxVersion.spec"> -->
+	<!-- <flow:arg name="equinoxRelease" value="4.4.1" /> -->
+	<!-- <flow:arg name="equinoxTimestamp" value="201409250400" /> -->
+	<!-- <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper"> -->
+	<!-- <property name="version" value="3.10.0.v20140902-0626" /> -->
+	<!-- <property name="uri" -->
+	<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" 
+		/> -->
+	<!-- <property name="groupId" value="org.argeo.tp.equinox" /> -->
+	<!-- <property name="doNotModify" value="true" /> -->
+	<!-- <property name="license"> -->
+	<!-- <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" /> -->
+	<!-- </property> -->
+	<!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+	<!-- <property name="sourcesProvider"> -->
+	<!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+	<!-- <property name="uri" -->
+	<!-- value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecjsrc-@{equinoxRelease}.jar" 
+		/> -->
+	<!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+	<!-- </bean> -->
+	<!-- </property> -->
+	<!-- </bean> -->
+	<!-- </flow:flow> -->
 
 </beans>
\ No newline at end of file