From: mbaudier <mbaudier@argeo.org>
Date: Wed, 18 Jun 2014 09:54:21 +0000 (+0200)
Subject: Manage licenses
X-Git-Tag: v2.3.9~148
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=b02978b5e3cb89efc0d09e13e746e19ed86b5446;p=gpl%2Fargeo-tp.git

Manage licenses
Use singletons
---

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index b5cd319..c905ec0 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -16,7 +16,7 @@
 				<ref bean="org.argeo.tp/org.apache.log4j" />
 				<ref bean="org.argeo.tp/org.slf4j" />
 				<ref bean="org.argeo.tp.apache.tomcat/org.apache.tomcat" />
-				<ref bean="org.argeo.tp/org.aopalliance" />
+				<ref bean="org.aopalliance" />
 				<ref bean="org.argeo.tp/org.aspectj" />
 				<ref bean="org.argeo.tp.spring/org.springframework" />
 				<ref bean="org.argeo.tp.apache.ant/org.apache.ant" />
@@ -36,10 +36,10 @@
 		<property name="workspace" value="argeo-tp-2.1" />
 		<property name="nodeIndexers">
 			<list>
-				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
 				<bean class="org.argeo.slc.repo.JarFileIndexer" />
 				<bean class="org.argeo.slc.repo.ModularDistributionIndexer" />
 				<bean class="org.argeo.slc.repo.PdeSourcesIndexer" />
+				<bean class="org.argeo.slc.repo.ArtifactIndexer" />
 			</list>
 		</property>
 		<property name="mirrors">
diff --git a/META-INF/spring/org.argeo.tp.apache.tomcat.xml b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
index 3f295e2..2f28be8 100644
--- a/META-INF/spring/org.argeo.tp.apache.tomcat.xml
+++ b/META-INF/spring/org.argeo.tp.apache.tomcat.xml
@@ -66,6 +66,9 @@
 		<bean parent="template.archiveWrapper">
 			<property name="uri"
 				value="http://archive.apache.org/dist/tomcat/tomcat-7/v@{version}/bin/apache-tomcat-@{version}.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
 			<property name="wrappers">
 				<map>
 					<!-- Tomcat -->
diff --git a/META-INF/spring/org.argeo.tp.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
index cb57e73..1fc9ecd 100644
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -20,5 +20,8 @@
 	<!-- 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>
 </beans>
\ No newline at end of file
diff --git a/META-INF/spring/org.argeo.tp.xml b/META-INF/spring/org.argeo.tp.xml
index 155c119..8079217 100644
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -38,13 +38,12 @@
 	<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"
@@ -69,6 +68,9 @@
 		<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"
@@ -84,6 +86,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 +108,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"
diff --git a/META-INF/spring/templates.xml b/META-INF/spring/templates.xml
index 8752489..9441144 100644
--- a/META-INF/spring/templates.xml
+++ b/META-INF/spring/templates.xml
@@ -18,10 +18,8 @@
 		<property name="osgiFactory" ref="osgiFactory" />
 	</bean>
 
-	<!-- Must be a prototype since wrapper are stateful objects, properties 
-		such as version can be set by caller. -->
 	<bean id="template.bndWrapper" class="org.argeo.slc.repo.osgi.BndWrapper"
-		abstract="true" scope="prototype">
+		abstract="true">
 		<property name="groupId" value="org.argeo.tp" />
 		<property name="bndProperties">
 			<props>
@@ -30,7 +28,7 @@
 		</property>
 	</bean>
 	<bean id="template.mavenWrapper" class="org.argeo.slc.repo.osgi.MavenWrapper"
-		abstract="true" scope="prototype">
+		abstract="true">
 		<property name="groupId" value="org.argeo.tp" />
 		<property name="bndProperties">
 			<props>