From e21e644239dc87e64f692d526e52828d7cbdb33d Mon Sep 17 00:00:00 2001
From: mbaudier <mbaudier@argeo.org>
Date: Fri, 29 Aug 2014 15:42:40 +0200
Subject: [PATCH] Argeo TP v2.1.2 - JCR - Junit - Commons IO - Commons
 Fileupload

---
 META-INF/MANIFEST.MF                          |  6 +-
 META-INF/spring/distribution.xml              |  7 +-
 .../spring/org.argeo.tp.apache.commons.xml    | 66 +++++++++++++++++++
 META-INF/spring/org.argeo.tp.javax.xml        |  4 ++
 .../spring/org.argeo.tp.spring.security.xml   | 39 +++++++++++
 META-INF/spring/org.argeo.tp.xml              |  7 ++
 6 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 META-INF/spring/org.argeo.tp.apache.commons.xml
 create mode 100644 META-INF/spring/org.argeo.tp.spring.security.xml

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index efd1687..f7dfbf7 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1401865871630
-Build-Jdk: 1.6.0_30
+Bnd-LastModified: 1409307022380
+Build-Jdk: 1.7.0_65
 Built-By: mbaudier
 Bundle-Description: SLC execution modules for generic tasks, to be used 
  as parent pom
@@ -11,7 +11,7 @@ Bundle-Name: Argeo Distribution Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-SymbolicName: org.argeo.tp.slc.factory
 Bundle-Vendor: Argeo
-Bundle-Version: 1.1.19.SNAPSHOT-r140604_0911
+Bundle-Version: 1.1.19.SNAPSHOT-r140829_1210
 Created-By: Apache Maven Bundle Plugin
 Import-Package: com.jcraft.jsch;resolution:=optional,javax.jcr;version="
  [2.0,3)",net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.proxy;version
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index bcb1745..56ea078 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,16 +10,19 @@
 	<!-- REGISTER -->
 	<bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
 		init-method="init" destroy-method="destroy">
-		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.1" />
+		<constructor-arg value="org.argeo.tp:argeo-tp:2.1.2" />
 		<property name="modules">
 			<list>
 				<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.aopalliance" />
+				<ref bean="org.junit" />
 				<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" />
+				<ref bean="org.argeo.tp.apache.commons/org.apache.commons.io" />
+				<ref bean="org.argeo.tp.apache.commons/org.apache.commons.fileupload" />
 				<!-- Felix -->
 				<ref bean="org.apache.felix.framework" />
 				<ref bean="org.apache.felix.bundlerepository" />
@@ -32,6 +35,8 @@
 				<ref bean="org.eclipse.gemini.web.core" />
 				<ref bean="org.eclipse.gemini.web.extender" />
 				<ref bean="org.eclipse.gemini.web.tomcat" />
+				<!-- Jackrabbit -->
+				<ref bean="org.argeo.tp.javax/javax.jcr" />
 			</list>
 		</property>
 	</bean>
diff --git a/META-INF/spring/org.argeo.tp.apache.commons.xml b/META-INF/spring/org.argeo.tp.apache.commons.xml
new file mode 100644
index 0000000..d935ed3
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.apache.commons.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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.commons.io" parent="template.org.apache.commons" />
+	<bean id="org.apache.commons.fileupload" parent="template.org.apache.commons" />
+
+	<!-- Ant Factory -->
+	<bean id="template.org.apache.commons" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.apache.commons" />
+	</bean>
+
+	<flow:flow name="org.argeo.tp.apache.commons/org.apache.commons.io"
+		spec="spec.version">
+		<flow:arg name="version" value="2.4" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/io/binaries/commons-io-@{version}-bin.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="commons-io-@{version}/commons-io-@{version}.jar"
+						value-ref="org.apache.commons.io" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="org.argeo.tp.apache.commons/org.apache.commons.fileupload"
+		spec="spec.version">
+		<flow:arg name="version" value="1.3.1" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://archive.apache.org/dist/commons/fileupload/binaries/commons-fileupload-@{version}-bin.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry
+						key="commons-fileupload-@{version}-bin/lib/commons-fileupload-@{version}.jar"
+						value-ref="org.apache.commons.fileupload" />
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-@{version}-src.zip" />
+					<property name="base"
+						value="commons-fileupload-@{version}-src/src/main/java/" />
+					<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.javax.xml b/META-INF/spring/org.argeo.tp.javax.xml
index 1fc9ecd..876cd57 100644
--- a/META-INF/spring/org.argeo.tp.javax.xml
+++ b/META-INF/spring/org.argeo.tp.javax.xml
@@ -17,6 +17,10 @@
 		p:version="1.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.inject:javax.inject:1"
 		parent="template.mavenWrapper" />
 
+	<bean id="javax.jcr" flow:as-flow="org.argeo.tp.javax/javax.jcr"
+		p:version="2.0.0" p:groupId="org.argeo.tp.javax" p:sourceCoords="javax.jcr:jcr:2.0"
+		parent="template.mavenWrapper" />
+
 	<!-- FACTORY -->
 	<bean id="template.javax" parent="template.bndWrapper" abstract="true">
 		<property name="groupId" value="org.argeo.tp.javax" />
diff --git a/META-INF/spring/org.argeo.tp.spring.security.xml b/META-INF/spring/org.argeo.tp.spring.security.xml
new file mode 100644
index 0000000..6538977
--- /dev/null
+++ b/META-INF/spring/org.argeo.tp.spring.security.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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.springframework.security.acls" parent="template.spring.security" />
+
+
+	<!-- FACTORY -->
+	<bean id="template.spring.security" parent="template.bndWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.spring.security" />
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<flow:flow name="org.argeo.tp.spring.security/org.springframework.security"
+		spec="spec.version">
+		<flow:arg name="version" value="3.2.4.RELEASE" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://repo.spring.io/libs-release-local/org/springframework/security/spring-security/@{version}/spring-security-@{version}-dist.zip" />
+			<property name="license">
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="spring-security-@{version}/libs/spring-acl-@{version}.jar"
+						value-ref="org.springframework.security.acls" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+</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 8d81990..2b325a5 100644
--- a/META-INF/spring/org.argeo.tp.xml
+++ b/META-INF/spring/org.argeo.tp.xml
@@ -45,6 +45,13 @@
 		</property>
 	</bean>
 
+	<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">
 		<flow:arg name="version" value="1.2.17" />
-- 
2.30.2