Integrate detached with standard SLC

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

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 2fd4119942a7ba5a5e7dce438b02dbe07846b6b7..61da5f740e88aeef8a72562ea3f1f8808451627c 100644 (file)
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,74 +1,81 @@
-<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.slc</groupId>
-               <artifactId>argeo-slc</artifactId>
-               <version>0.11.1-SNAPSHOT</version>
-               <relativePath>../org.argeo.slc</relativePath>
-       </parent>
-       <artifactId>argeo-slc-core</artifactId>
-       <name>Argeo SLC Core</name>
-       <description>SLC Core</description>
-       <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core</connection>
-               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core</url>
-       </scm>
-       <build>
-               <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-               </dependency>
+<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.slc</groupId>
+        <artifactId>argeo-slc</artifactId>
+        <version>0.11.1-SNAPSHOT</version>
+        <relativePath>../org.argeo.slc</relativePath>
+    </parent>
+    <artifactId>argeo-slc-core</artifactId>
+    <name>Argeo SLC Core</name>
+    <description>SLC Core</description>
+    <scm>
+        <connection>
+            scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+        </connection>
+        <url>
+            https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+        </url>
+    </scm>
+    <build>
+        <plugins>
+            <!-- Look to parent pom for inheritances -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.ws</groupId>
-                       <artifactId>spring-oxm</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-oxm</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.codehaus.castor</groupId>
-                       <artifactId>castor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>xerces</groupId>
-                       <artifactId>xercesImpl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>xalan</groupId>
-                       <artifactId>xalan</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.codehaus.castor</groupId>
+            <artifactId>castor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.dbunit</groupId>
-                       <artifactId>dbunit</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dbunit</groupId>
+            <artifactId>dbunit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
index 2b7569f882891cc29ee7e7ed070b19a3b5a4936a..798b5648e28e1f35bfe6433866f17f0ba8384e3a 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
@@ -55,9 +55,9 @@ public class SpringUtils {
        public static String extractRelativePath(Resource ancestor, Resource child) {\r
                try {\r
 \r
-                       return ancestor.getURI().relativize(child.getURI()).normalize()\r
-                                       .toString();\r
-               } catch (IOException e) {\r
+                       return ancestor.getURL().toURI().relativize(child.getURL().toURI())\r
+                                       .normalize().toString();\r
+               } catch (Exception e) {\r
                        throw new SlcException("Cannot extract relative path of " + child\r
                                        + " based on " + ancestor, e);\r
                }\r