Merge branch 'master' into dev/argeo-slc-2.1

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 616aad63201686322620d2f69856f5716bcae04f..7a06b416f9039ffea9ea1370ba3c75725ca2c147 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,31 +1,48 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1447432473619\r
-Build-Jdk: 1.7.0_91\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.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Vendor: Argeo\r
-Bundle-Version: 2.1.13.r151113_1734\r
-Created-By: Apache Maven Bundle Plugin\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
+Bundle-Version: 2.1.13.r201605220946\r
+Import-Package: javax.jcr;version="[2.0,3)",\r
+ javax.security.auth.callback;resolution:=optional,\r
+ org.aopalliance.aop;version="[1.0,2)",\r
+ org.argeo.security.core;version="[2.1,3)",\r
+ org.argeo.slc.core.execution;version="[2.1,3)",\r
+ org.argeo.slc.core.execution.tasks;version="[2.1,3)",\r
+ org.argeo.slc.execution;version="[2.1,3)",\r
+ org.argeo.slc.osgi;version="[2.1,3)",\r
+ org.argeo.slc.repo;version="[2.1,3)",\r
+ org.argeo.slc.repo.osgi;version="[2.1,3)",\r
+ org.argeo.slc.test;version="[2.1,3)",\r
+ org.springframework.aop;version="[3.2,4)",\r
+ org.springframework.aop.framework;version="[3.2,4)",\r
+ org.springframework.aop.scope;version="[3.2,4)",\r
+ org.springframework.beans.factory.config;version="[3.2,4)",\r
+ org.springframework.cglib.core;version="[3.2,4)",\r
+ org.springframework.cglib.proxy;version="[3.2,4)",\r
+ org.springframework.cglib.reflect;version="[3.2,4)",\r
+ org.springframework.core.io;version="[3.2,4)"\r
+Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl\r
+ ipse.gemini.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncy\r
+ castle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.\r
+ equinox.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml\r
+ ,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse.rap.xml,META-I\r
+ NF/spring/apache.tomcat.xml=META-INF/spring/apache.tomcat.xml,META-INF/\r
+ spring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/s\r
+ pring/distribution.xml=META-INF/spring/distribution.xml,META-INF/spring\r
+ /misc.xml=META-INF/spring/misc.xml,META-INF/spring/spring.security.xml=\r
+ META-INF/spring/spring.security.xml,META-INF/spring/apache.xml=META-INF\r
+ /spring/apache.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,ME\r
+ TA-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF/spring/eclip\r
+ se.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/apache.f\r
+ elix.xml=META-INF/spring/apache.felix.xml,META-INF/spring/apache.ant.xm\r
+ l=META-INF/spring/apache.ant.xml,META-INF/spring/spring.xml=META-INF/sp\r
+ ring/spring.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/a\r
+ pache.jackrabbit.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/distribution.xml b/META-INF/spring/distribution.xml
index 3a16faf4f8a0ede5a1f8fcef838c1f727bd492a3..afbf0c5fe2a9045d96111ccee953d40aed2f9f6a 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -129,7 +129,6 @@
        <!-- Security -->
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <property name="authenticationManager" ref="authenticationManager" />
                <property name="beanNames">
                        <list>
                                <value>osgiFactory</value>

diff --git a/META-INF/spring/osgi.xml b/META-INF/spring/osgi.xml
index 618c464e617deee86d399fb7f7686a36c87d3fd4..1cfffc8cbbaacf6127569e1f6b35ec171e229553 100644 (file)
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@ -15,8 +15,6 @@
        <service ref="argeo-tp" interface="org.argeo.slc.repo.ArgeoOsgiDistribution" />\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="authenticationManager"\r
-               interface="org.springframework.security.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 5b152131b72968df7fbe7305a5b32be5633c5a94..e98964270e04ca46421607f3fcb2a57db21e038c 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.2-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
@@ -55,7 +55,7 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.dep.rcp</artifactId>
+                       <artifactId>org.argeo.slc.dep.backend</artifactId>
                        <version>${version.slc}</version>
                        <scope>test</scope>
                </dependency>
@@ -63,7 +63,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>