From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 19 Nov 2009 19:58:39 +0000 (+0000)
Subject: Adapt to version upgrade
X-Git-Tag: argeo-commons-2.1.30~1711
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=a92bbf66e3eab0e209cbaf52616fde01fae3d3b3

Adapt to version upgrade

git-svn-id: https://svn.argeo.org/commons/trunk@3121 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/pom.xml b/pom.xml
index cdf98d8bd..bcb7caf4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.dep</groupId>
 				<artifactId>versions</artifactId>
-				<version>1.0.0</version>
+				<version>1.0.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
index 0b18cd066..ba6505609 100644
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
@@ -44,7 +44,6 @@
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
-			<version>1.6.0.0003-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
@@ -55,7 +54,6 @@
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>com.springsource.org.apache.derby</artifactId>
-			<version>10.5.1000001.764942</version>
 		</dependency>
 
 		<!-- TEST -->
diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
index 6a5f57b86..49ad482ce 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
@@ -7,7 +7,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<service ref="_authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
+		interface="org.springframework.security.AuthenticationManager"
+		context-class-loader="service-provider" />
 
 	<service ref="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />
 
diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index cbc54821e..5f9cc85c5 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -45,7 +45,6 @@
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			<version>1.3.0.0003</version>
 		</dependency>
 
 		<!-- Security -->
@@ -72,21 +71,17 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.springsource.json</groupId>
 			<artifactId>com.springsource.json</artifactId>
-			<version>1.0.1.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>com.springsource.org.antlr</artifactId>
 		</dependency>
 
-
-
 		<!-- TEST -->
 		<dependency>
 			<groupId>org.junit</groupId>
diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index a7bfd1b0b..958b9ea48 100644
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -20,6 +20,9 @@
 				<configuration>
 					<bundlesPomArtifactId>org.argeo.server.demo</bundlesPomArtifactId>
 					<execDir>target/exec/server</execDir>
+					<argsToAppend>
+						<arg>-clean</arg>
+					</argsToAppend>
 					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
 					<systemProperties>
 						<slc.osgi.start>
diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml
index 4b3ba25db..1280a6581 100644
--- a/server/dep/org.argeo.server.dep.ads/pom.xml
+++ b/server/dep/org.argeo.server.dep.ads/pom.xml
@@ -22,27 +22,22 @@
 		<dependency>
 			<groupId>org.apache.directory</groupId>
 			<artifactId>com.springsource.org.apache.directory.server.core</artifactId>
-			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.directory.shared.asn.codec</artifactId>
-			<version>0.9.5.5.0001</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.mina.filter.ssl</artifactId>
-			<version>1.0.2.0001</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.directory</groupId>
 			<artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
-			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jdbm</groupId>
 			<artifactId>com.springsource.jdbm</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 		<!--
 			TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
@@ -51,7 +46,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
-			<version>2.4.0</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 698f9ed24..7a3cf0447 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
@@ -23,6 +24,10 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>com.springsource.javax.annotation</artifactId>
@@ -92,16 +97,20 @@
 			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.catalina</groupId>
-			<artifactId>com.springsource.org.apache.catalina</artifactId>
+			<groupId>org.apache.coyote.springsource</groupId>
+			<artifactId>com.springsource.org.apache.coyote.springsource</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.catalina.springsource</groupId>
+			<artifactId>com.springsource.org.apache.catalina.springsource</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.jasper</groupId>
-			<artifactId>com.springsource.org.apache.jasper</artifactId>
+			<groupId>org.apache.jasper.springsource</groupId>
+			<artifactId>com.springsource.org.apache.jasper.springsource</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
+			<groupId>org.apache.el.springsource</groupId>
+			<artifactId>com.springsource.org.apache.el.springsource</artifactId>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
index e77321ae4..2b5aa297a 100644
--- a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
@@ -4,5 +4,6 @@ Import-Package: org.apache.directory.server.configuration,
  org.apache.directory.server.core.partition.impl.btree,
  org.apache.directory.server.jndi,
  org.apache.directory.shared.asn1.codec,
+ org.springframework.ldap.core.support,
  org.springframework.security.config,
  org.springframework.security.ldap
diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
index 7313b4b36..bfd6f2b32 100644
--- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
+Fragment-Host: com.springsource.org.apache.catalina.springsource;bundle-version="[6
  .0.16,7.0.0)"
 Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.catalina
diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml
index 9e63ff94b..9e454636d 100644
--- a/server/runtime/org.argeo.server.json/pom.xml
+++ b/server/runtime/org.argeo.server.json/pom.xml
@@ -48,7 +48,6 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 
 		<!-- Spring -->