Reduce Jetty and Equinox

diff --git a/META-INF/spring/apache.tomcat.xml b/META-INF/spring/apache.tomcat.xml
index 894cb7d3fdff23c22efb8968c442bbe619aad78e..06db0ec9a438dfb93cd87c1433f537186241da66 100644 (file)
--- a/META-INF/spring/apache.tomcat.xml
+++ b/META-INF/spring/apache.tomcat.xml
@@ -75,8 +75,8 @@
                                        <!-- value-ref="org.apache.catalina" /> -->
                                        <!-- <entry key="apache-tomcat-@{version}/lib/jasper.jar" -->
                                        <!-- value-ref="org.apache.jasper" /> -->
-                                       <entry key="apache-tomcat-@{version}/lib/jasper-el.jar"
-                                               value-ref="org.apache.el" />
+<!--                                   <entry key="apache-tomcat-@{version}/lib/jasper-el.jar" -->
+<!--                                           value-ref="org.apache.el" /> -->
                                        <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-coyote.jar" -->
                                        <!-- value-ref="org.apache.coyote" /> -->
                                        <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-api.jar" -->
@@ -84,12 +84,12 @@
                                        <!-- <entry key="apache-tomcat-@{version}/lib/tomcat-util.jar" -->
                                        <!-- value-ref="org.apache.tomcat.util" /> -->
                                        <!-- Javax -->
-                                       <entry key="apache-tomcat-@{version}/lib/annotations-api.jar"
-                                               value-ref="javax.annotation" />
+<!--                                   <entry key="apache-tomcat-@{version}/lib/annotations-api.jar" -->
+<!--                                           value-ref="javax.annotation" /> -->
                                        <!-- <entry key="apache-tomcat-@{version}/lib/el-api.jar" -->
                                        <!-- value-ref="javax.el" /> -->
-                                       <entry key="apache-tomcat-@{version}/lib/jsp-api.jar"
-                                               value-ref="javax.servlet.jsp" />
+<!--                                   <entry key="apache-tomcat-@{version}/lib/jsp-api.jar" -->
+<!--                                           value-ref="javax.servlet.jsp" /> -->
                                        <!-- <entry key="apache-tomcat-@{version}/lib/servlet-api.jar" -->
                                        <!-- value-ref="javax.servlet" /> -->
                                </map>

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 2dc77a855a0f06bfaa92c6d40d99f62ea956829d..a48117be61498aabb886db64237f2e6bef48cd20 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -15,7 +15,6 @@
                        <list>
                                <ref bean="apache/org.apache.log4j" />
                                <ref bean="misc/org.slf4j" />
-                               <ref bean="apache/org.apache.tomcat" />
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
                                <ref bean="org.h2" />

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index a174c8f2e53f8ef6f53f8d00fb453b225e4b2e9f..265de1f2fdf69ebf570772530811dc6747eb9190 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,8 +8,7 @@
        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: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" />
@@ -33,7 +32,7 @@
                                        <entry key="plugins/org.eclipse.osgi.*.jar" value="org.argeo.tp.equinox" />
                                        <entry key="plugins/org.eclipse.equinox.security_*.jar"
                                                value="org.argeo.tp.equinox" />
-                                       <entry key="plugins/org.eclipse.equinox.security.*.jar"
+                                       <entry key="plugins/org.eclipse.equinox.security.source_*.jar"
                                                value="org.argeo.tp.equinox" />
                                </map>
                        </property>

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 17dea187bc1e9ed9a370564a040701b9403fda7d..7428e9bb05a6ed435308a192ae3d63012c7d2ac0 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -7,8 +7,7 @@
        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="eclipse/org.argeo.tp.jetty"
-               parent="template.importJettyZip">
+       <flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
                <flow:arg name="jettyVersion" value="8.1.16.v20140903" />
        </flow:flow>
 
@@ -27,10 +26,40 @@
                        </property>
                        <property name="includes">
                                <map>
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-*.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation.jar"
                                                value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-http.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-io.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-security.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-server.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-util.jar"
+                                               value="org.argeo.tp.jetty" />
+                                       <!-- Javax -->
                                        <entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
                                                value="org.argeo.tp.javax" />
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/annotations/javax.annotation-*.jar"
+                                               value="org.argeo.tp.javax" />
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/annotations/org.objectweb.asm-*.jar"
+                                               value="org.argeo.tp" />
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jndi/javax.activation-*.jar"
+                                               value="org.argeo.tp.javax" />
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jta/javax.transaction-*.jar"
+                                               value="org.argeo.tp.javax" />
                                </map>
                        </property>
                        <property name="excludes">

diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index a6701ab3d98ec09257b1aef6dcccb9b9f13cb5a1..386d12ede92155868eb1f97575f5babcd7a75964 100644 (file)
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -8,11 +8,13 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
        <!-- REGISTER -->
-       <bean id="javax.annotation" p:version="3.0.0" parent="template.javax" />
+       <!-- <bean id="javax.annotation" p:version="3.0.0" parent="template.javax" 
+               /> -->
        <!-- <bean id="javax.el" p:version="2.2.0" parent="template.javax" /> -->
        <!-- <bean id="javax.servlet" p:version="3.0.0" parent="template.javax" 
                /> -->
-       <bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" />
+       <!-- <bean id="javax.servlet.jsp" p:version="2.2.0" parent="template.javax" 
+               /> -->
 
        <bean id="javax.inject" p:version="1.0.0" p:groupId="org.argeo.tp.javax"
                p:sourceCoords="javax.inject:javax.inject:1" parent="template.mavenWrapper" />
@@ -25,10 +27,10 @@
                parent="template.mavenWrapper" />
 
        <!-- FACTORY -->
-       <bean id="template.javax" parent="template.bndWrapper" abstract="true">
-               <property name="groupId" value="org.argeo.tp.javax" />
-               <property name="license">
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" />
-               </property>
-       </bean>
+<!--   <bean id="template.javax" parent="template.bndWrapper" abstract="true"> -->
+<!--           <property name="groupId" value="org.argeo.tp.javax" /> -->
+<!--           <property name="license"> -->
+<!--                   <util:constant static-field="org.argeo.slc.repo.FreeLicense.CDDL" /> -->
+<!--           </property> -->
+<!--   </bean> -->
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/spring.xml b/META-INF/spring/spring.xml
index f4efc616885aeb1369a1a10326200b95704c5b10..487e7ba8c4e8b1d3748b7edff1a8c35b95087c37 100644 (file)
--- a/META-INF/spring/spring.xml
+++ b/META-INF/spring/spring.xml
@@ -76,42 +76,47 @@
        </bean>
        <bean id="org.springframework.expression" parent="template.org.springframework" />
 
-       <bean id="org.springframework.instrument" parent="template.org.springframework" />
-
-       <bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" />
-
-       <bean id="org.springframework.jdbc" parent="template.org.springframework">
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       com.mchange.v2.c3p0;resolution:=optional,
-                                       com.sun.rowset;resolution:=optional,
-                                       org.apache.derby.*;resolution:=optional,
-                                       *
-                               </prop>
-                       </props>
-               </property>
-       </bean>
-
-       <bean id="org.springframework.jms" parent="template.org.springframework" />
-
-       <bean id="org.springframework.orm" parent="template.org.springframework" />
-
-       <bean id="org.springframework.oxm" parent="template.org.springframework">
-               <property name="bndProperties">
-                       <props merge="true">
-                               <prop key="Import-Package">
-                                       com.thoughtworks.xstream.*;resolution:=optional,
-                                       org.apache.xmlbeans.*;resolution:=optional,
-                                       org.exolab.castor.*;resolution:=optional,
-                                       org.jibx.runtime.*;resolution:=optional,
-                                       *
-                               </prop>
-                       </props>
-               </property>
-       </bean>
-
-       <bean id="org.springframework.test" parent="template.org.springframework" />
+       <!-- <bean id="org.springframework.instrument" parent="template.org.springframework" 
+               /> -->
+
+       <!-- <bean id="org.springframework.instrument.tomcat" parent="template.org.springframework" 
+               /> -->
+
+       <!-- <bean id="org.springframework.jdbc" parent="template.org.springframework"> -->
+       <!-- <property name="bndProperties"> -->
+       <!-- <props merge="true"> -->
+       <!-- <prop key="Import-Package"> -->
+       <!-- com.mchange.v2.c3p0;resolution:=optional, -->
+       <!-- com.sun.rowset;resolution:=optional, -->
+       <!-- org.apache.derby.*;resolution:=optional, -->
+       <!-- * -->
+       <!-- </prop> -->
+       <!-- </props> -->
+       <!-- </property> -->
+       <!-- </bean> -->
+
+       <!-- <bean id="org.springframework.jms" parent="template.org.springframework" 
+               /> -->
+
+       <!-- <bean id="org.springframework.orm" parent="template.org.springframework" 
+               /> -->
+
+       <!-- <bean id="org.springframework.oxm" parent="template.org.springframework"> -->
+       <!-- <property name="bndProperties"> -->
+       <!-- <props merge="true"> -->
+       <!-- <prop key="Import-Package"> -->
+       <!-- com.thoughtworks.xstream.*;resolution:=optional, -->
+       <!-- org.apache.xmlbeans.*;resolution:=optional, -->
+       <!-- org.exolab.castor.*;resolution:=optional, -->
+       <!-- org.jibx.runtime.*;resolution:=optional, -->
+       <!-- * -->
+       <!-- </prop> -->
+       <!-- </props> -->
+       <!-- </property> -->
+       <!-- </bean> -->
+
+       <!-- <bean id="org.springframework.test" parent="template.org.springframework" 
+               /> -->
 
        <bean id="org.springframework.tx" parent="template.org.springframework">
                <property name="bndProperties">
@@ -166,27 +171,27 @@
                                        <entry
                                                key="spring-framework-@{version}.RELEASE/libs/spring-expression-@{version}.RELEASE.jar"
                                                value-ref="org.springframework.expression" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.instrument" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.instrument.tomcat" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.jdbc" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.jms" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.orm" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.oxm" />
-                                       <entry
-                                               key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar"
-                                               value-ref="org.springframework.test" />
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.instrument" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-instrument-tomcat-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.instrument.tomcat" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-jdbc-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.jdbc" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-jms-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.jms" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-orm-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.orm" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-oxm-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.oxm" /> -->
+                                       <!-- <entry -->
+                                       <!-- key="spring-framework-@{version}.RELEASE/libs/spring-test-@{version}.RELEASE.jar" -->
+                                       <!-- value-ref="org.springframework.test" /> -->
                                        <entry
                                                key="spring-framework-@{version}.RELEASE/libs/spring-tx-@{version}.RELEASE.jar"
                                                value-ref="org.springframework.tx" />