Clean up and refactor

[gpl/argeo-tp.git] / META-INF / spring / org.argeo.tp.apache.ant.xml

diff --git a/META-INF/spring/org.argeo.tp.apache.ant.xml b/META-INF/spring/org.argeo.tp.apache.ant.xml
index 4cecf98c95090302fe68076cc000884efc009cdc..9c85385be8903d28224c783911f6f8478eded50e 100644 (file)
--- a/META-INF/spring/org.argeo.tp.apache.ant.xml
+++ b/META-INF/spring/org.argeo.tp.apache.ant.xml
@@ -7,28 +7,38 @@
        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"
                                value="http://archive.apache.org/dist/ant/binaries/apache-ant-@{version}-bin.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </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">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/ant/source/apache-ant-@{version}-src.zip" />
+                                       <property name="base" value="apache-ant-@{version}/src/main/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </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