Add Jetty and Equinox

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 56ea078d96ec63a640780b2677902c6eceb54a99..c57d5df0d87c304d571daf162aadb86c9b7350ae 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -15,7 +15,7 @@
                        <list>
                                <ref bean="org.argeo.tp/org.apache.log4j" />
                                <ref bean="org.argeo.tp/org.slf4j" />
-                               <ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" />
+<!--                           <ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" /> -->
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
                                <ref bean="org.argeo.tp/org.aspectj" />
@@ -24,17 +24,19 @@
                                <ref bean="org.argeo.tp.apache.commons/org.apache.commons.io" />
                                <ref bean="org.argeo.tp.apache.commons/org.apache.commons.fileupload" />
                                <!-- Felix -->
-                               <ref bean="org.apache.felix.framework" />
-                               <ref bean="org.apache.felix.bundlerepository" />
-                               <ref bean="org.apache.felix.gogo.command" />
-                               <ref bean="org.apache.felix.gogo.runtime" />
-                               <ref bean="org.apache.felix.gogo.shell" />
-                               <!-- Gemini -->
-                               <ref bean="org.argeo.tp.gemini/org.gemini.blueprint" />
+                               <!-- <ref bean="org.apache.felix.framework" /> -->
+                               <!-- <ref bean="org.apache.felix.bundlerepository" /> -->
+                               <!-- <ref bean="org.apache.felix.gogo.command" /> -->
+                               <!-- <ref bean="org.apache.felix.gogo.runtime" /> -->
+                               <!-- <ref bean="org.apache.felix.gogo.shell" /> -->
+                               <!-- Eclipse -->
+                               <ref bean="org.argeo.tp.eclipse/org.argeo.tp.jetty" />
+                               <ref bean="org.argeo.tp.eclipse/org.argeo.tp.equinox" />
+                               <ref bean="org.argeo.tp.eclipse/org.argeo.tp.gemini" />
                                <!-- <ref bean="org.argeo.tp.gemini/org.gemini.web" /> -->
-                               <ref bean="org.eclipse.gemini.web.core" />
-                               <ref bean="org.eclipse.gemini.web.extender" />
-                               <ref bean="org.eclipse.gemini.web.tomcat" />
+                               <!-- <ref bean="org.eclipse.gemini.web.core" /> -->
+                               <!-- <ref bean="org.eclipse.gemini.web.extender" /> -->
+                               <!-- <ref bean="org.eclipse.gemini.web.tomcat" /> -->
                                <!-- Jackrabbit -->
                                <ref bean="org.argeo.tp.javax/javax.jcr" />
                        </list>
@@ -57,7 +59,7 @@
                        <map>
                                <entry key="http://archive.apache.org/dist">
                                        <list>
-                                               <value>http://mirror.derwebwolf.net/apache</value>
+                                               <value>http://mirror.netcologne.de/apache.org</value>
                                                <value>http://archive.apache.org/dist</value>
                                        </list>
                                </entry>

diff --git a/META-INF/spring/org.argeo.tp.equinox.xml b/META-INF/spring/org.argeo.tp.equinox.xml
index b208816461e34238bf9a6cf18125cbf27da685c6..c1d8cb758cbf30b0c74c835bde753ea87eb69daf 100644 (file)
--- a/META-INF/spring/org.argeo.tp.equinox.xml
+++ b/META-INF/spring/org.argeo.tp.equinox.xml
@@ -7,25 +7,17 @@
        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">
 
-       <!-- REGISTER -->
-       <bean id="org.eclipse.osgi" parent="template.org.eclipse.osgi" />
-
-       <!-- FACTORY -->
-       <bean id="template.org.eclipse.osgi" parent="template.bndWrapper"
-               abstract="true">
-               <property name="groupId" value="org.argeo.tp.equinox" />
-       </bean>
-
-       <!-- Equinox Kepler SR1 (3.9.1) -->
-       <flow:flow name="org.argeo.tp.equinox/org.argeo.tp.equinox_KeplerSR1"
+       <!-- Equinox Kepler SR2 (3.9.1) -->
+       <flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.equinox"
                parent="template.importEquinox">
-               <flow:arg name="equinoxRelease" value="KeplerSR1" />
-               <flow:arg name="equinoxTimestamp" value="201309111000" />
+               <!-- <flow:arg name="version" value="3.9.1" /> -->
+               <flow:arg name="equinoxRelease" value="KeplerSR2" />
+               <flow:arg name="equinoxTimestamp" value="201402211700" />
        </flow:flow>
 
-
-       <!-- RAP specs and templates -->
+       <!-- 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>
@@ -35,17 +27,14 @@
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
                        <property name="uri"
                                value="http://www.eclipse.org/downloads/equinox/drops/R-@{equinoxRelease}-@{equinoxTimestamp}/equinox-SDK-@{equinoxRelease}.zip" />
-                       <property name="wrappers">
+                       <property name="includes">
                                <map>
-                                       <!-- Tomcat -->
-                                       <entry key="plugins/org.eclipse.osgi_*.jar" value-ref="org.eclipse.osgi" />
+                                       <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.osgi.equinox.security_*.jar"
+                                               value="org.argeo.tp.equinox" />
                                </map>
                        </property>
-                       <!-- <property name="includes"> -->
-                       <!-- <map> -->
-                       <!-- <entry key="plugins/*.jar" value="org.argeo.tp.equinox" /> -->
-                       <!-- </map> -->
-                       <!-- </property> -->
                        <property name="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>

diff --git a/META-INF/spring/org.argeo.tp.gemini.xml b/META-INF/spring/org.argeo.tp.gemini.xml
index ab1a0e56046cabe4ce2e75556640728f0a56e82e..5b4c22e9f0af8d0a401d89ac02d5433a882ab512 100644 (file)
--- a/META-INF/spring/org.argeo.tp.gemini.xml
+++ b/META-INF/spring/org.argeo.tp.gemini.xml
@@ -54,7 +54,7 @@
        </bean>
 
        <!-- Gemini Blueprint -->
-       <flow:flow name="org.argeo.tp.gemini/org.gemini.blueprint"
+       <flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.gemini"
                spec="spec.version">
                <flow:arg name="version" value="1.0.2.RELEASE" />
                <bean parent="template.archiveWrapper">
@@ -66,13 +66,13 @@
                        <property name="wrappers">
                                <map>
                                        <entry
-                                               key="gemini-blueprint-1.0.2.RELEASE/dist/gemini-blueprint-core-@{version}.jar"
+                                               key="gemini-blueprint-@{version}/dist/gemini-blueprint-core-@{version}.jar"
                                                value-ref="org.eclipse.gemini.blueprint.core" />
                                        <entry
-                                               key="gemini-blueprint-1.0.2.RELEASE/dist/gemini-blueprint-extender-@{version}.jar"
+                                               key="gemini-blueprint-@{version}/dist/gemini-blueprint-extender-@{version}.jar"
                                                value-ref="org.eclipse.gemini.blueprint.extender" />
                                        <entry
-                                               key="gemini-blueprint-1.0.2.RELEASE/dist/gemini-blueprint-io-@{version}.jar"
+                                               key="gemini-blueprint-@{version}/dist/gemini-blueprint-io-@{version}.jar"
                                                value-ref="org.eclipse.gemini.blueprint.io" />
                                </map>
                        </property>

diff --git a/META-INF/spring/org.argeo.tp.jetty.xml b/META-INF/spring/org.argeo.tp.jetty.xml
new file mode 100644 (file)
index 0000000..0b44693
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.jetty.xml
@@ -0,0 +1,52 @@
+<?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">
+
+       <flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.jetty"
+               parent="template.importJettyZip">
+               <flow:arg name="jettyVersion" value="8.1.16.v20140903" />
+       </flow:flow>
+
+       <!-- Jetty specs and templates -->
+       <flow:spec id="jettyVersion.spec">
+               <flow:primitive name="jettyVersion" isParameter="true" />
+       </flow:spec>
+
+       <flow:flow id="template.importJettyZip" spec="jettyVersion.spec"
+               abstract="true">
+               <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
+                       <property name="uri"
+                               value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+                       <property name="includes">
+                               <map>
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-*.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
+                                               value="org.argeo.tp.javax" />
+                               </map>
+                       </property>
+                       <property name="excludes">
+                               <list>
+                                       <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
+                               </list>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+                       <property name="osgiFactory" ref="osgiFactory" />
+               </bean>
+       </flow:flow>
+
+</beans>
\ No newline at end of file