Clean up and refactor

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

diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
index 155c11913f37e82aabb1391d30ebbda82859cb62..2b325a5b9b263fee09e64a15f01784dccdd1990a 100644 (file)
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -38,30 +38,19 @@
        <bean id="org.slf4j.api" parent="template.org.slf4j" />
        <bean id="org.slf4j.commons.logging" parent="template.org.slf4j" />
 
-       <bean id="org.aopalliance" p:version="1.0.0" 
-               p:sourceCoords="aopalliance:aopalliance:1.0" parent="template.mavenWrapper" />
-
-       <!-- AOP Alliance factory -->
-       <flow:flow name="org.argeo.tp/org.aopalliance">
-               <ref bean="org.aopalliance" />
-       </flow:flow>
+       <bean id="org.aopalliance" p:version="1.0.0" p:sourceCoords="aopalliance:aopalliance:1.0"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+               </property>
+       </bean>
 
-       <!-- Eclipse Batch Compiler (ECJ) factory -->
-       <flow:flow name="org.argeo.tp/org.eclipse.jdt.core.compiler.batch"
-               spec="spec.version">
-               <flow:arg name="version" value="4.3.1" />
-               <!-- <bean parent="template.archiveWrapper"> -->
-               <!-- <property name="uri" -->
-               <!-- value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" 
-                       /> -->
-               <!-- <property name="wrappers"> -->
-               <!-- <map> -->
-               <!-- <entry key="plugins/ecj-.jar" -->
-               <!-- value-ref="org.eclipse.jdt.core.compiler.batch" /> -->
-               <!-- </map> -->
-               <!-- </property> -->
-               <!-- </bean> -->
-       </flow:flow>
+       <bean id="org.junit" p:version="4.11.0" p:sourceCoords="junit:junit:4.11"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+               </property>
+       </bean>
 
        <!-- Log4j12 Factory -->
        <flow:flow name="org.argeo.tp/org.apache.log4j" spec="spec.version">
@@ -69,12 +58,23 @@
                <bean parent="template.archiveWrapper">
                        <property name="uri"
                                value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
                        <property name="wrappers">
                                <map>
                                        <entry key="apache-log4j-@{version}/log4j-@{version}.jar"
                                                value-ref="org.apache.log4j" />
                                </map>
                        </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/logging/log4j/@{version}/log4j-@{version}.zip" />
+                                       <property name="base" value="apache-log4j-@{version}/src/main/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
                </bean>
        </flow:flow>
 
@@ -84,6 +84,9 @@
                <bean parent="template.archiveWrapper">
                        <property name="uri"
                                value="http://www.eclipse.org/downloads/tools/aspectj/aspectj-@{version}.jar" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
+                       </property>
                        <property name="wrappers">
                                <map>
                                        <entry key="lib/aspectjweaver.jar" value-ref="org.aspectj.weaver" />
@@ -103,6 +106,9 @@
                <bean parent="template.archiveWrapper">
                        <property name="uri"
                                value="http://www.slf4j.org/dist/slf4j-@{version}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+                       </property>
                        <property name="wrappers">
                                <map>
                                        <entry key="slf4j-@{version}/slf4j-log4j12-@{version}.jar"