From: mbaudier <mbaudier@argeo.org>
Date: Tue, 17 Feb 2015 19:36:41 +0000 (+0100)
Subject: Adapt to SLC 2
X-Git-Tag: v2.3.9~92
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=41c10bb31b2d80c2ea14b039e834f594d26942b1

Adapt to SLC 2
---

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 190da80..c3ee416 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,31 +1,44 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1423823659707
-Build-Jdk: 1.7.0_75
-Built-By: mbaudier
 Bundle-Description: SLC execution modules for generic tasks, to be used 
  as parent pom
-Bundle-DocURL: http://www.argeo.org
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-ManifestVersion: 2
 Bundle-Name: Third Party Factory
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Vendor: Argeo
-Bundle-Version: 1.2.0.r150213_1134
-Created-By: Apache Maven Bundle Plugin
+Bundle-Version: 2.1.1.SNAPSHOT-r201502172005
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
- ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.
- proxy;version="[2.1,3)",net.sf.cglib.reflect;version="[2.1,3)",org.aopa
- lliance.aop;version="[1.0,2)",org.argeo.security.core;version="[1.2,2)"
- ,org.argeo.slc.core.execution;version="[1.2,2)",org.argeo.slc.core.exec
- ution.tasks;version="[1.2,2)",org.argeo.slc.execution;version="[1.2,2)"
- ,org.argeo.slc.osgi;version="[1.2,2)",org.argeo.slc.repo;version="[1.2,
- 2)",org.argeo.slc.repo.osgi;version="[1.2,2)",org.argeo.slc.test;versio
- n="[1.2,2)",org.springframework.aop;version="[2.5,3)",org.springframewo
- rk.aop.framework;version="[2.5,3)",org.springframework.aop.scope;versio
- n="[2.5,3)",org.springframework.beans.factory.config;version="[2.5,3)",
- org.springframework.core.io;version="[2.5,3)",org.springframework.secur
- ity;version="[2.0,3)"
+ ;resolution:=optional,org.aopalliance.aop;version="[1.0,2)",org.argeo.s
+ ecurity.core;version="[2.1,3)",org.argeo.slc.core.execution;version="[2
+ .1,3)",org.argeo.slc.core.execution.tasks;version="[2.1,3)",org.argeo.s
+ lc.execution;version="[2.1,3)",org.argeo.slc.osgi;version="[2.1,3)",org
+ .argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1
+ ,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;versi
+ on="[3.2,4)",org.springframework.aop.framework;version="[3.2,4)",org.sp
+ ringframework.aop.scope;version="[3.2,4)",org.springframework.beans.fac
+ tory.config;version="[3.2,4)",org.springframework.cglib.core;version="[
+ 3.2,4)",org.springframework.cglib.proxy;version="[3.2,4)",org.springfra
+ mework.cglib.reflect;version="[3.2,4)",org.springframework.core.io;vers
+ ion="[3.2,4)",org.springframework.security.authentication;version="[3.2
+ ,4)"
+Include-Resource: META-INF/spring/apache.ant.xml=META-INF/spring/apache.
+ ant.xml,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse.rap.xml
+ ,META-INF/spring/eclipse.ide.xml=META-INF/spring/eclipse.ide.xml,META-I
+ NF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-IN
+ F/spring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/distribution
+ .xml=META-INF/spring/distribution.xml,META-INF/spring/bouncycastle.xml=
+ META-INF/spring/bouncycastle.xml,META-INF/spring/apache.xml=META-INF/sp
+ ring/apache.xml,META-INF/spring/templates.xml=META-INF/spring/templates
+ .xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.equino
+ x.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.jack
+ rabbit.xml,META-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF
+ /spring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/
+ spring/spring.security.xml=META-INF/spring/spring.security.xml,META-INF
+ /spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/spri
+ ng/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/
+ osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/apache.tomcat.xml=MET
+ A-INF/spring/apache.tomcat.xml,META-INF/spring/spring.xml=META-INF/spri
+ ng/spring.xml
+Private-Package: .
+SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
-SLC-GroupId: org.argeo.tp.factory
-Tool: Bnd-1.50.0
diff --git a/META-INF/spring/osgi.xml b/META-INF/spring/osgi.xml
index 618c464..553350e 100644
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@ -16,7 +16,7 @@
 
 	<!-- REFERENCES -->
 	<reference id="authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
+		interface="org.springframework.security.authentication.AuthenticationManager" />
 	<reference id="javaRepository" interface="javax.jcr.Repository"
 		filter="(argeo.jcr.repository.alias=java)" />
 	<reference id="distRepository" interface="javax.jcr.Repository"
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 5d44d7f..5d7d0c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>lib</artifactId>
-		<version>1.2.0</version>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>org.argeo.tp.factory.core</artifactId>
@@ -47,7 +47,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.dep.rcp</artifactId>
+			<artifactId>org.argeo.slc.dep.rap</artifactId>
 			<version>${version.slc}</version>
 			<scope>test</scope>
 		</dependency>
@@ -55,7 +55,7 @@
 	<repositories>
 		<repository>
 			<id>argeo-slc</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-slc-1.2</url>
+			<url>http://repo.argeo.org/data/public/java/argeo-slc-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>