From 49dcdc7849c86df4d3631e38e069bcc5dea025e0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 28 Jun 2012 15:42:15 +0000
Subject: [PATCH] Fix remaining issues with migration

git-svn-id: https://svn.argeo.org/slc/trunk@5392 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../agent/org.argeo.slc.agent.ext.bsf/pom.xml |  2 +-
 .../agent/org.argeo.slc.ext.activemq/pom.xml  |  2 +-
 pom.xml                                       | 17 ++++++-------
 runtime/org.argeo.slc.core/build.properties   | 14 +++++------
 .../build.properties                          |  2 +-
 .../build.properties                          | 10 ++++----
 .../build.properties                          |  8 +++----
 runtime/org.argeo.slc.support.castor/pom.xml  | 12 ++++++----
 .../build.properties                          |  2 +-
 .../build.properties                          | 24 +++++++++----------
 .../build.properties                          |  6 ++---
 11 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml b/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml
index fd83e5f9e..0258d4766 100644
--- a/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml
+++ b/modules/agent/org.argeo.slc.agent.ext.bsf/pom.xml
@@ -15,7 +15,7 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Fragment-Host>com.springsource.org.apache.bsf</Fragment-Host>
+						<Fragment-Host>org.apache.bsf</Fragment-Host>
 						<Import-Package>
 							*,
 							bsh.util;resolution:=optional,
diff --git a/modules/agent/org.argeo.slc.ext.activemq/pom.xml b/modules/agent/org.argeo.slc.ext.activemq/pom.xml
index 1ae320bee..11d0a9a15 100644
--- a/modules/agent/org.argeo.slc.ext.activemq/pom.xml
+++ b/modules/agent/org.argeo.slc.ext.activemq/pom.xml
@@ -15,7 +15,7 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Fragment-Host>org.argeo.dep.osgi.activemq</Fragment-Host>
+						<Fragment-Host>org.apache.activemq</Fragment-Host>
 						<Import-Package>
 							*,
 							org.argeo.slc.runtime,
diff --git a/pom.xml b/pom.xml
index 6411eff6e..a26521b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-<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</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -110,16 +111,16 @@ limitations under the License.
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
 	</repositories>
 	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.slc-${version.slc}</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
diff --git a/runtime/org.argeo.slc.core/build.properties b/runtime/org.argeo.slc.core/build.properties
index d58192aeb..936a99f18 100644
--- a/runtime/org.argeo.slc.core/build.properties
+++ b/runtime/org.argeo.slc.core/build.properties
@@ -1,10 +1,10 @@
-additional.bundles = com.springsource.slf4j.api,\
-                     com.springsource.slf4j.log4j,\
-                     com.springsource.org.apache.log4j,\
-                     com.springsource.slf4j.org.apache.commons.logging,\
-                     com.springsource.org.aopalliance,\
-                     com.springsource.org.aspectj.weaver,\
-                     com.springsource.net.sf.cglib
+additional.bundles = slf4j.api,\
+                     slf4j.log4j,\
+                     org.apache.log4j,\
+                     slf4j.org.apache.commons.logging,\
+                     org.aopalliance,\
+                     org.aspectj.weaver,\
+                     net.sf.cglib
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\
diff --git a/runtime/org.argeo.slc.lib.detached/build.properties b/runtime/org.argeo.slc.lib.detached/build.properties
index f7b1a68c3..8dd9eb0ce 100644
--- a/runtime/org.argeo.slc.lib.detached/build.properties
+++ b/runtime/org.argeo.slc.lib.detached/build.properties
@@ -1,6 +1,6 @@
 additional.bundles = org.springframework.xml,\
                      org.argeo.slc.unit,\
-                     com.springsource.junit
+                     junit
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\
diff --git a/runtime/org.argeo.slc.support.aether/build.properties b/runtime/org.argeo.slc.support.aether/build.properties
index a77cc87b6..b6764ecc6 100644
--- a/runtime/org.argeo.slc.support.aether/build.properties
+++ b/runtime/org.argeo.slc.support.aether/build.properties
@@ -3,9 +3,9 @@ source.. = src/main/java/,\
 output.. = target/classes/
 bin.includes = META-INF/,\
                .
-additional.bundles = com.springsource.junit,\
-                     com.springsource.slf4j.api,\
-                     com.springsource.slf4j.log4j,\
-                     com.springsource.org.apache.log4j,\
-                     com.springsource.slf4j.org.apache.commons.logging
+additional.bundles = junit,\
+                     slf4j.api,\
+                     slf4j.log4j,\
+                     org.apache.log4j,\
+                     slf4j.org.apache.commons.logging
                      
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/build.properties b/runtime/org.argeo.slc.support.castor/build.properties
index d9f1c375b..9c722a511 100644
--- a/runtime/org.argeo.slc.support.castor/build.properties
+++ b/runtime/org.argeo.slc.support.castor/build.properties
@@ -1,8 +1,8 @@
 additional.bundles = org.argeo.slc.unit,\
-                     com.springsource.junit,\
-                     com.springsource.javax.xml.stream,\
-                     com.springsource.org.apache.xml.serializer,\
-                     com.springsource.org.apache.xerces
+                     junit,\
+                     javax.xml.stream,\
+                     org.apache.xml.serializer,\
+                     org.apache.xerces
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 44b0c937e..4ab0fe43d 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -41,17 +41,19 @@
 							org.argeo.slc.detached;resolution:=optional,
 							org.apache.xml.serialize;resolution:=optional,
 							org.apache.xerces.jaxp;resolution:=optional,
-							javax.xml.transform;resolution:=optional,
-							javax.xml.transform.stream;resolution:=optional,
-							javax.xml.transform.dom;resolution:=optional,
+							org.w3c.dom.*;version="0.0.0";resolution:=optional,
+							org.xml.sax.*;version="0.0.0";resolution:=optional,
+							javax.xml.transform.*;version="0.0.0";resolution:=optional,
+							javax.xml.parsers.*;version="0.0.0";resolution:=optional,
 							org.springframework.xml.validation;resolution:=optional,
 							org.apache.commons.io,
 							org.springframework.oxm,
 							org.springframework.core,
 							org.springframework.xml.transform,
-							org.springframework.core.io
+							org.springframework.core.io,
+							*
 						</Import-Package>
-						<Fragment-Host>com.springsource.org.castor</Fragment-Host>
+						<Fragment-Host>org.castor</Fragment-Host>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/runtime/org.argeo.slc.support.equinox/build.properties b/runtime/org.argeo.slc.support.equinox/build.properties
index d3a40a058..e71fabc68 100644
--- a/runtime/org.argeo.slc.support.equinox/build.properties
+++ b/runtime/org.argeo.slc.support.equinox/build.properties
@@ -1,7 +1,7 @@
 additional.bundles = org.argeo.slc.core,\
                      org.springframework.context,\
                      org.argeo.slc.unit,\
-                     com.springsource.junit,\
+                     junit,\
                      org.argeo.osgi.boot,\
                      org.eclipse.osgi
 source.. = src/main/java/,\
diff --git a/runtime/org.argeo.slc.support.hibernate/build.properties b/runtime/org.argeo.slc.support.hibernate/build.properties
index 298eb7e8a..d64d193ab 100644
--- a/runtime/org.argeo.slc.support.hibernate/build.properties
+++ b/runtime/org.argeo.slc.support.hibernate/build.properties
@@ -1,22 +1,22 @@
 additional.bundles = org.springframework.transaction,\
                      org.argeo.slc.unit,\
-                     com.springsource.junit,\
+                     junit,\
                      org.springframework.oxm,\
                      org.springframework.xml,\
-                     com.springsource.org.dom4j,\
+                     org.dom4j,\
                      org.springframework.jdbc,\
-                     com.springsource.javax.transaction,\
+                     javax.transaction,\
                      org.springframework.context.support,\
-                     com.springsource.net.sf.ehcache,\
-                     com.springsource.org.hsqldb,\
-                     com.springsource.org.apache.commons.collections,\
-                     com.springsource.antlr,\
+                     net.sf.ehcache,\
+                     org.hsqldb,\
+                     org.apache.commons.collections,\
+                     antlr,\
                      org.argeo.slc.support.castor,\
-                     com.springsource.javax.xml.stream,\
-                     com.springsource.org.castor,\
-                     com.springsource.org.apache.xml.serializer,\
-                     com.springsource.org.apache.xerces,\
-                     com.springsource.org.h2
+                     javax.xml.stream,\
+                     org.castor,\
+                     org.apache.xml.serializer,\
+                     org.apache.xerces,\
+                     org.h2
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\
diff --git a/runtime/org.argeo.slc.support.jcr/build.properties b/runtime/org.argeo.slc.support.jcr/build.properties
index 37deed377..284faa983 100644
--- a/runtime/org.argeo.slc.support.jcr/build.properties
+++ b/runtime/org.argeo.slc.support.jcr/build.properties
@@ -1,9 +1,9 @@
 additional.bundles = org.springframework.core,\
                      org.argeo.server.jackrabbit,\
-                     com.springsource.junit,\
+                     junit,\
                      org.argeo.slc.unit,\
-                     com.springsource.javax.xml.stream,\
-                     com.springsource.org.apache.xerces
+                     javax.xml.stream,\
+                     org.apache.xerces
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\
-- 
2.39.2