Adapt to SLC 2

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 190da804b21919db70c01d174cd390e24986b564..c3ee416913c21c551901453cd68b3a3234e1447c 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,31 +1,44 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1423823659707\r
-Build-Jdk: 1.7.0_75\r
-Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
  as parent pom\r
-Bundle-DocURL: http://www.argeo.org\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-ManifestVersion: 2\r
 Bundle-Name: Third Party Factory\r
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Vendor: Argeo\r
-Bundle-Version: 1.2.0.r150213_1134\r
-Created-By: Apache Maven Bundle Plugin\r
+Bundle-Version: 2.1.1.SNAPSHOT-r201502172005\r
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
- ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.\r
- proxy;version="[2.1,3)",net.sf.cglib.reflect;version="[2.1,3)",org.aopa\r
- lliance.aop;version="[1.0,2)",org.argeo.security.core;version="[1.2,2)"\r
- ,org.argeo.slc.core.execution;version="[1.2,2)",org.argeo.slc.core.exec\r
- ution.tasks;version="[1.2,2)",org.argeo.slc.execution;version="[1.2,2)"\r
- ,org.argeo.slc.osgi;version="[1.2,2)",org.argeo.slc.repo;version="[1.2,\r
- 2)",org.argeo.slc.repo.osgi;version="[1.2,2)",org.argeo.slc.test;versio\r
- n="[1.2,2)",org.springframework.aop;version="[2.5,3)",org.springframewo\r
- rk.aop.framework;version="[2.5,3)",org.springframework.aop.scope;versio\r
- n="[2.5,3)",org.springframework.beans.factory.config;version="[2.5,3)",\r
- org.springframework.core.io;version="[2.5,3)",org.springframework.secur\r
- ity;version="[2.0,3)"\r
+ ;resolution:=optional,org.aopalliance.aop;version="[1.0,2)",org.argeo.s\r
+ ecurity.core;version="[2.1,3)",org.argeo.slc.core.execution;version="[2\r
+ .1,3)",org.argeo.slc.core.execution.tasks;version="[2.1,3)",org.argeo.s\r
+ lc.execution;version="[2.1,3)",org.argeo.slc.osgi;version="[2.1,3)",org\r
+ .argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1\r
+ ,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;versi\r
+ on="[3.2,4)",org.springframework.aop.framework;version="[3.2,4)",org.sp\r
+ ringframework.aop.scope;version="[3.2,4)",org.springframework.beans.fac\r
+ tory.config;version="[3.2,4)",org.springframework.cglib.core;version="[\r
+ 3.2,4)",org.springframework.cglib.proxy;version="[3.2,4)",org.springfra\r
+ mework.cglib.reflect;version="[3.2,4)",org.springframework.core.io;vers\r
+ ion="[3.2,4)",org.springframework.security.authentication;version="[3.2\r
+ ,4)"\r
+Include-Resource: META-INF/spring/apache.ant.xml=META-INF/spring/apache.\r
+ ant.xml,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse.rap.xml\r
+ ,META-INF/spring/eclipse.ide.xml=META-INF/spring/eclipse.ide.xml,META-I\r
+ NF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-IN\r
+ F/spring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/distribution\r
+ .xml=META-INF/spring/distribution.xml,META-INF/spring/bouncycastle.xml=\r
+ META-INF/spring/bouncycastle.xml,META-INF/spring/apache.xml=META-INF/sp\r
+ ring/apache.xml,META-INF/spring/templates.xml=META-INF/spring/templates\r
+ .xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.equino\r
+ x.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.jack\r
+ rabbit.xml,META-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF\r
+ /spring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/\r
+ spring/spring.security.xml=META-INF/spring/spring.security.xml,META-INF\r
+ /spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/spri\r
+ ng/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/\r
+ osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/apache.tomcat.xml=MET\r
+ A-INF/spring/apache.tomcat.xml,META-INF/spring/spring.xml=META-INF/spri\r
+ ng/spring.xml\r
+Private-Package: .\r
+SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r
-SLC-GroupId: org.argeo.tp.factory\r
-Tool: Bnd-1.50.0\r

diff --git a/META-INF/spring/osgi.xml b/META-INF/spring/osgi.xml
index 618c464e617deee86d399fb7f7686a36c87d3fd4..553350ee31f7c912828b4886809496e556d4c5d4 100644 (file)
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@ -16,7 +16,7 @@
 \r
        <!-- REFERENCES -->\r
        <reference id="authenticationManager"\r
-               interface="org.springframework.security.AuthenticationManager" />\r
+               interface="org.springframework.security.authentication.AuthenticationManager" />\r
        <reference id="javaRepository" interface="javax.jcr.Repository"\r
                filter="(argeo.jcr.repository.alias=java)" />\r
        <reference id="distRepository" interface="javax.jcr.Repository"\r

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/pom.xml b/pom.xml
index 5d44d7fa34ce19c52c3af8adc7487ab7213397f5..5d7d0c6cdf81603f48d3a1b1ab9c8d5b13fecad9 100644 (file)
--- 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>