Adapt to changes in SLC.

[gpl/argeo-tp.git] / META-INF / spring / eclipse.equinox.xml

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 265de1f2fdf69ebf570772530811dc6747eb9190..3c86a80a25b8afd55b239344bca0c747d57138d6 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -7,16 +7,13 @@
        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">
 
-       <!-- Equinox Kepler SR2 (3.9.1) -->
        <flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-               <!-- <flow:arg name="version" value="3.9.1" /> -->
-               <flow:arg name="equinoxRelease" value="KeplerSR2" />
-               <flow:arg name="equinoxTimestamp" value="201402211700" />
+               <flow:arg name="equinoxRelease" value="4.13" />
+               <flow:arg name="equinoxTimestamp" value="201909161045" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->
        <flow:spec id="equinoxVersion.spec">
-               <!-- <flow:primitive name="version" isParameter="true" /> -->
                <flow:primitive name="equinoxRelease" isParameter="true" />
                <flow:primitive name="equinoxTimestamp" isParameter="true" />
        </flow:spec>
@@ -28,15 +25,81 @@
                                value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
                        <property name="includes">
                                <map>
+                                       <!-- Core OSGi framework -->
                                        <entry key="plugins/org.eclipse.osgi_*.jar" value="org.argeo.tp.equinox" />
-                                       <entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
-                                       <entry key="plugins/org.eclipse.equinox.security_*.jar"
+                                       <entry key="plugins/org.eclipse.osgi.source_*.jar" value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.osgi.util*.jar" value="org.argeo.tp.equinox" />
+                                       <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.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" />
+
+                                       <!-- 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" />
+                                       <entry key="plugins/org.eclipse.equinox.cm*.jar" value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.common*.jar" value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.console_*.jar" value="org.argeo.tp.equinox" />
+                                       <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" />
-                                       <entry key="plugins/org.eclipse.equinox.security.source_*.jar"
+                                       <entry key="plugins/org.eclipse.equinox.http.registry*.jar"
                                                value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.http.servlet*.jar"
+                                               value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.http.servletbridge*.jar"
+                                               value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.preferences*.jar"
+                                               value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.registry*.jar" value="org.argeo.tp.equinox" />
+                                       <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"> -->
+       <!-- <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