From af6cb5a9b76504ee2673e34079adb092ba7864cc Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Fri, 20 Jun 2014 16:33:57 +0200
Subject: [PATCH] Complete sources and licenses

---
 META-INF/spring/org.argeo.tp.apache.ant.xml   | 14 ++++++++++-
 META-INF/spring/org.argeo.tp.apache.felix.xml |  4 +++
 .../spring/org.argeo.tp.apache.tomcat.xml     |  8 ++++++
 META-INF/spring/org.argeo.tp.spring.xml       |  3 +++
 META-INF/spring/org.argeo.tp.xml              | 25 ++++++-------------
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/META-INF/spring/org.argeo.tp.apache.ant.xml b/META-INF/spring/org.argeo.tp.apache.ant.xml
index 4cecf98..be7816d 100644
--- a/META-INF/spring/org.argeo.tp.apache.ant.xml
+++ b/META-INF/spring/org.argeo.tp.apache.ant.xml
@@ -17,11 +17,15 @@
 		<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.ant/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" />
@@ -29,6 +33,14 @@
 						value-ref="org.apache.ant.launch" />
 				</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>
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.felix.xml b/META-INF/spring/org.argeo.tp.apache.felix.xml
index 23b9ca2..4019764 100644
--- a/META-INF/spring/org.argeo.tp.apache.felix.xml
+++ b/META-INF/spring/org.argeo.tp.apache.felix.xml
@@ -25,11 +25,15 @@
 	</bean>
 
 	<!-- FACTORY -->
+	<!-- TODO sources -->
 	<bean id="template.org.apache.felix" class="org.argeo.slc.repo.osgi.UriWrapper"
 		abstract="true">
 		<property name="baseUri" value="http://archive.apache.org/dist/felix" />
 		<property name="groupId" value="org.argeo.tp.apache.felix" />
 		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
 		<property name="osgiFactory" ref="osgiFactory" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 2f28be8..42f83ae 100644
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -95,6 +95,14 @@
 						value-ref="javax.servlet" />
 				</map>
 			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/src/apache-tomcat-@{version}-src.zip" />
+					<property name="base" value="apache-tomcat-@{version}-src/java/" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
 		</bean>
 	</flow:flow>
 
diff --git a/META-INF/spring/org.argeo.tp.spring.xml b/META-INF/spring/org.argeo.tp.spring.xml
index 11f53a5..4a3dab7 100644
--- a/META-INF/spring/org.argeo.tp.spring.xml
+++ b/META-INF/spring/org.argeo.tp.spring.xml
@@ -141,6 +141,9 @@
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
 				value="http://repo.springsource.org/libs-release-local/org/springframework/spring/@{version}.RELEASE/spring-framework-@{version}.RELEASE-dist.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
 			<property name="wrappers">
 				<map>
 					<entry
diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
index 8079217..8d81990 100644
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -45,23 +45,6 @@
 		</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>
-
 	<!-- Log4j12 Factory -->
 	<flow:flow name="org.argeo.tp/org.apache.log4j" spec="spec.version">
 		<flow:arg name="version" value="1.2.17" />
@@ -77,6 +60,14 @@
 						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>
 
-- 
2.39.2