Clean up and refactor

diff --git a/META-INF/spring/org.argeo.tp.apache.ant.xml b/META-INF/spring/org.argeo.tp.apache.ant.xml
index be7816d9fd76cdee3ae447909958e8a5aceb01ed..9c85385be8903d28224c783911f6f8478eded50e 100644 (file)
--- a/META-INF/spring/org.argeo.tp.apache.ant.xml
+++ b/META-INF/spring/org.argeo.tp.apache.ant.xml
@@ -7,18 +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-1.2.xsd">
 
-       <!-- REGISTER -->
-       <bean id="org.apache.ant" parent="template.org.apache.ant" />
-       <bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
-
-       <!-- Ant Factory -->
-       <bean id="template.org.apache.ant" parent="template.bndWrapper"
-               abstract="true">
-               <property name="groupId" value="org.argeo.tp.apache.ant" />
-       </bean>
-
-       <flow:flow name="org.argeo.tp.apache.ant/org.apache.ant"
-               spec="spec.version">
+       <flow:flow name="org.argeo.tp.apache/org.apache.ant" spec="spec.version">
                <flow:arg name="version" value="1.9.2" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
@@ -28,9 +17,12 @@
                        </property>
                        <property name="wrappers">
                                <map>
-                                       <entry key="apache-ant-@{version}/lib/ant.jar" value-ref="org.apache.ant" />
-                                       <entry key="apache-ant-@{version}/lib/ant-launcher.jar"
-                                               value-ref="org.apache.ant.launch" />
+                                       <entry key="apache-ant-@{version}/lib/ant.jar">
+                                               <bean id="org.apache.ant" parent="template.org.apache.ant" />
+                                       </entry>
+                                       <entry key="apache-ant-@{version}/lib/ant-launcher.jar">
+                                               <bean id="org.apache.ant.launch" parent="template.org.apache.ant" />
+                                       </entry>
                                </map>
                        </property>
                        <property name="sourcesProvider">
@@ -43,4 +35,10 @@
                        </property>
                </bean>
        </flow:flow>
+
+       <!-- Specs and templates -->
+       <bean id="template.org.apache.ant" parent="template.bndWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.apache.ant" />
+       </bean>
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/org.argeo.tp.eclipse.ide.xml b/META-INF/spring/org.argeo.tp.eclipse.ide.xml
index a41def4e7709f34383cb67df313c2a20e0c6f332..20a533cfdd8d51e080771e0cef6025e8f4973e0a 100644 (file)
--- a/META-INF/spring/org.argeo.tp.eclipse.ide.xml
+++ b/META-INF/spring/org.argeo.tp.eclipse.ide.xml
@@ -8,7 +8,7 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <!-- RCP 3.8 -->
-       <flow:flow name="org.argeo.tp.eclipse.ide/org.argeo.tp.eclipse.ide_3.8.2"
+       <flow:flow name="org.argeo.tp.eclipse/org.argeo.tp.eclipse.ide_3.8.2"
                parent="template.eclipseIde">
                <flow:arg name="version" value="3.8.2" />
                <flow:arg name="release" value="R-3.8.2-201301310800" />

diff --git a/META-INF/spring/org.argeo.tp.gemini.xml b/META-INF/spring/org.argeo.tp.gemini.xml
index 5b4c22e9f0af8d0a401d89ac02d5433a882ab512..4e07217d4ee34f3f11ca35a45044664e9f528d6b 100644 (file)
--- a/META-INF/spring/org.argeo.tp.gemini.xml
+++ b/META-INF/spring/org.argeo.tp.gemini.xml
@@ -30,12 +30,15 @@
                /> -->
        <!-- </flow:flow> -->
 
-       <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven"
-               p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core" />
-       <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven"
-               p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender" />
-       <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven"
-               p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat" />
+       <!-- <bean id="org.eclipse.gemini.web.core" parent="template.geminiMaven" -->
+       <!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.core" 
+               /> -->
+       <!-- <bean id="org.eclipse.gemini.web.extender" parent="template.geminiMaven" -->
+       <!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.extender" 
+               /> -->
+       <!-- <bean id="org.eclipse.gemini.web.tomcat" parent="template.geminiMaven" -->
+       <!-- p:version="2.2.2.RELEASE" p:sourceCoords="org.eclipse.gemini:org.eclipse.gemini.web.tomcat" 
+               /> -->
 
 
        <!-- FACTORY -->

diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
index 876cd570ffc58e6e5af7c5817d3191eef5a35392..a2bf71d319cab422c38b19ffbc6dd32c34f3eeac 100644 (file)
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -8,10 +8,10 @@
        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.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.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.inject" flow:as-flow="org.argeo.tp.javax/javax.inject"
                p:version="1.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.inject:javax.inject:1"