From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 22 May 2016 07:47:16 +0000 (+0200)
Subject: Merge branch 'master' into dev/argeo-slc-2.1
X-Git-Tag: v2.3.9~91
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=89f1ec9f7bf43836641f6c229e9c3addc1770b58

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

89f1ec9f7bf43836641f6c229e9c3addc1770b58
diff --cc META-INF/MANIFEST.MF
index c3ee416,616aad6..7a06b41
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@@ -4,41 -7,25 +4,45 @@@ Bundle-Description: SLC execution modul
  Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
  Bundle-ManifestVersion: 2
  Bundle-Name: Third Party Factory
- Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-SymbolicName: org.argeo.tp.factory.core
- Bundle-Version: 2.1.1.SNAPSHOT-r201502172005
 -Bundle-Vendor: Argeo
 -Bundle-Version: 2.1.13.r151113_1734
 -Created-By: Apache Maven Bundle Plugin
--Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
-  ;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
 - ;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)"
++Bundle-Version: 2.1.13.r201605220946
++Import-Package: javax.jcr;version="[2.0,3)",
++ javax.security.auth.callback;resolution:=optional,
++ org.aopalliance.aop;version="[1.0,2)",
++ org.argeo.security.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.slc.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;version="[3.2,4)",
++ org.springframework.aop.framework;version="[3.2,4)",
++ org.springframework.aop.scope;version="[3.2,4)",
++ org.springframework.beans.factory.config;version="[3.2,4)",
++ org.springframework.cglib.core;version="[3.2,4)",
++ org.springframework.cglib.proxy;version="[3.2,4)",
++ org.springframework.cglib.reflect;version="[3.2,4)",
++ org.springframework.core.io;version="[3.2,4)"
++Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl
++ ipse.gemini.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncy
++ castle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.
++ equinox.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml
++ ,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse.rap.xml,META-I
++ NF/spring/apache.tomcat.xml=META-INF/spring/apache.tomcat.xml,META-INF/
++ spring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/s
++ pring/distribution.xml=META-INF/spring/distribution.xml,META-INF/spring
++ /misc.xml=META-INF/spring/misc.xml,META-INF/spring/spring.security.xml=
++ META-INF/spring/spring.security.xml,META-INF/spring/apache.xml=META-INF
++ /spring/apache.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,ME
++ TA-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF/spring/eclip
++ se.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/apache.f
++ elix.xml=META-INF/spring/apache.felix.xml,META-INF/spring/apache.ant.xm
++ l=META-INF/spring/apache.ant.xml,META-INF/spring/spring.xml=META-INF/sp
++ ring/spring.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/a
++ pache.jackrabbit.xml
 +Private-Package: .
 +SLC-Category: org.argeo.tp.factory
  SLC-ExecutionModule: default
 -SLC-GroupId: org.argeo.tp.factory
 -Tool: Bnd-1.50.0
diff --cc META-INF/spring/distribution.xml
index 90deecf,3a16faf..afbf0c5
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@@ -123,7 -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 --cc META-INF/spring/osgi.xml
index 553350e,618c464..1cfffc8
--- a/META-INF/spring/osgi.xml
+++ b/META-INF/spring/osgi.xml
@@@ -15,8 -15,8 +15,6 @@@
  	<service ref="argeo-tp" interface="org.argeo.slc.repo.ArgeoOsgiDistribution" />
  
  	<!-- REFERENCES -->
--	<reference id="authenticationManager"
- 		interface="org.springframework.security.authentication.AuthenticationManager" />
 -		interface="org.springframework.security.AuthenticationManager" />
  	<reference id="javaRepository" interface="javax.jcr.Repository"
  		filter="(argeo.jcr.repository.alias=java)" />
  	<reference id="distRepository" interface="javax.jcr.Repository"
diff --cc pom.xml
index 5d7d0c6,5b15213..e989642
--- a/pom.xml
+++ b/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.slc</groupId>
  		<artifactId>lib</artifactId>
- 		<version>2.1.1-SNAPSHOT</version>
 -		<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>
@@@ -47,7 -55,7 +55,7 @@@
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.slc</groupId>
- 			<artifactId>org.argeo.slc.dep.rap</artifactId>
 -			<artifactId>org.argeo.slc.dep.rcp</artifactId>
++			<artifactId>org.argeo.slc.dep.backend</artifactId>
  			<version>${version.slc}</version>
  			<scope>test</scope>
  		</dependency>