Restructure modules

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

diff --git a/runtime/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs
index 134aca25fef6fd3a1d15235d4ac69cdf2dfd62ad..1f10056c3f997f381064e03618fc4f2d0732160f 100644 (file)
--- a/runtime/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs
+++ b/runtime/org.argeo.slc.detached/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon Nov 17 12:10:39 CET 2008
+#Sat Nov 22 15:15:12 CET 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml
index b61db4c52a75e418e9f4affe2685fab9a9aad7f1..02b08109e22ab922aeaf3f7d0229fb43cb0c56ad 100644 (file)
--- a/runtime/org.argeo.slc.detached/pom.xml
+++ b/runtime/org.argeo.slc.detached/pom.xml
@@ -40,8 +40,8 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
                                <configuration>
-                                       <source>1.3</source>
-                                       <target>1.3</target>
+                                       <source>1.4</source>
+                                       <target>1.4</target>
                                </configuration>
                        </plugin>
                        <plugin>

diff --git a/runtime/org.argeo.slc.hibernate/pom.xml b/runtime/org.argeo.slc.hibernate/pom.xml
index fffe4ca7c87224e38e38c5f891537a0074890e21..4e707e06e6d4b82dade3d11ad8e7b2850df7858f 100644 (file)
--- a/runtime/org.argeo.slc.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.hibernate/pom.xml
@@ -5,17 +5,13 @@
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
                <version>0.11.2-SNAPSHOT</version>
-               <relativePath>../org.argeo.slc</relativePath>
+               <relativePath>../../org.argeo.slc</relativePath>
        </parent>
+       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.hibernate</artifactId>
        <name>Argeo SLC Hibernate</name>
-       <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.hibernate</connection>
-               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-hibernate</url>
-       </scm>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
@@ -47,8 +43,8 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
@@ -83,10 +79,18 @@
                        <artifactId>org.springframework.context.support</artifactId>
                </dependency>
 
+               <!-- Test dependencies -->
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
+                       <version>${project.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.hsqldb</groupId>
                        <artifactId>com.springsource.org.hsqldb</artifactId>
-                       <scope>testing</scope>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 </project>

diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 6e2c58c4f0ec2a15d636f087f9676010a40b2e06..1d010d091e8a398d36f851848980b881ea74a69a 100644 (file)
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -62,11 +62,6 @@
                </plugins>
        </build>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>

diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index 95fea4c2f5df715908bb4f68e5e6200b36466dbf..bbe38897cb380ab678eb0b65d73b87f2cb95452d 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -10,7 +10,7 @@
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.lib.detached</artifactId>
        <packaging>jar</packaging>
-       <name>Argeo SLC Agent</name>
+       <name>Argeo SLC Lib Detached</name>
        <build>
                <plugins>
                        <!-- Look to parent pom for inheritances -->
@@ -44,11 +44,6 @@
                </plugins>
        </build>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>

diff --git a/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF
index cc8dd67d88bdd598d0dc7bd65c12c0b69e6abeb5..9adc348a00f8c4f60b78dca3f7dc243656cfa374 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF
+++ b/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.argeo.slc.lib.detached;uses:="org.springframework.
  hed,org.argeo.slc.ant.structure,org.springframework.beans.factory";ve\r
  rsion="0.11.2.SNAPSHOT"\r
 Tool: Bnd-0.0.255\r
-Bundle-Name: Argeo SLC Agent\r
+Bundle-Name: Argeo SLC Lib Detached\r
 Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 Bundle-Vendor: Argeo\r
 Bundle-Version: 0.11.2.SNAPSHOT\r

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 0f629a7fd1add20d5a3322aaef6bbe8b3f4c864a..dfcfbd77addaf00c50dbbd90217ada77e4874893 100644 (file)
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -1,13 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.2-SNAPSHOT</version>
-               <relativePath>../org.argeo.slc</relativePath>
+               <relativePath>../../org.argeo.slc</relativePath>
        </parent>
+       <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.server</artifactId>
        <name>Argeo SLC Server</name>
        <description>SLC Server</description>
@@ -42,10 +42,10 @@
                                <artifactId>maven-jetty-plugin</artifactId>
                                <configuration>
                                        <webAppSourceDirectory>
-                                               ../org.argeo.slc.webapp/src/main/webapp
+                                               ../../org.argeo.slc.webapp/src/main/webapp
                                        </webAppSourceDirectory>
                                        <jettyConfig>
-                                               ../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+                                               ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
                                        </jettyConfig>
                                </configuration>
                        </plugin>
@@ -53,26 +53,14 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.hibernate</artifactId>
                        <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xerces</groupId>
-                                       <artifactId>xercesImpl</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.hibernate</artifactId>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
                        <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xerces</groupId>
-                                       <artifactId>xercesImpl</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index 396e3793417e183074027caa754b1dae7c7a17e4..11320996e5a48c0b2397c913499ed9a6e9059abe 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -44,11 +44,6 @@
                </plugins>
        </build>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>

diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
index 410098d212aceee51bdc7d31a8c87edd0b66e0a1..1ff4d3059ac335717b5bcc465125a2837d13dc5e 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
+++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
@@ -260,7 +260,7 @@ public class AntSlcApplication {
                        }
                }
 
-               //project.addBuildListener(new CommonsLoggingListener());
+               // project.addBuildListener(new CommonsLoggingListener());
 
                ListableBeanFactory context = (ListableBeanFactory) project
                                .getReference(AntConstants.REF_ROOT_CONTEXT);
@@ -290,11 +290,11 @@ public class AntSlcApplication {
                                AntConstants.SLC_TASKDEFS_RESOURCE_PATH);
                for (Object o : taskdefs.keySet()) {
                        String name = o.toString();
+                       String className = taskdefs.getProperty(name);
                        try {
-                               project.addTaskDefinition(name, Class.forName(taskdefs
-                                               .getProperty(name)));
+                               project.addTaskDefinition(name, Class.forName(className));
                        } catch (ClassNotFoundException e) {
-                               log.error("Unknown class for task " + name, e);
+                               log.warn("Unknown class " + className + " for task " + name);
                        }
                }
                Properties typedefs = getDefs(project,

diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 0dbb3304674b935b29f86f170f0311c7c18db704..0af0f021fea5b230d3f828576071fa61e9810566 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -52,29 +52,6 @@
                        <version>${project.version}</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>
-                                       com.springsource.org.apache.log4j
-                               </artifactId>
-               </dependency>
-               <!--
-                       <dependency> <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.log4j</artifactId>
-                       <version>1.5.3</version> </dependency> <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-                       <version>1.5.3</version> </dependency>
-               -->
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.context</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.ws</groupId>
                        <artifactId>org.springframework.oxm</artifactId>
@@ -89,38 +66,10 @@
                        <groupId>org.apache.xerces</groupId>
                        <artifactId>com.springsource.org.apache.xerces</artifactId>
                </dependency>
-               <!--
-                       <dependency> <groupId>org.apache.xalan</groupId>
-                       <artifactId>com.springsource.org.apache.xalan</artifactId>
-                       </dependency>
-               -->
-               <dependency>
-                       <groupId>edu.emory.mathcs.backport</groupId>
-                       <artifactId>
-                               com.springsource.edu.emory.mathcs.backport
-                       </artifactId>
-               </dependency>
+
                <dependency>
                        <groupId>javax.xml.stream</groupId>
                        <artifactId>com.springsource.javax.xml.stream</artifactId>
                </dependency>
-               <!--
-                       <dependency> <groupId>javax.xml.stream</groupId>
-                       <artifactId>stax-api</artifactId> </dependency>
-               -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>
-                               com.springsource.org.apache.commons.io
-                       </artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.dbunit</groupId>
-                       <artifactId>com.springsource.org.dbunit</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
-               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 429f9362f05816ef1c4e2df0f8501c2b69f50ee0..dcaf695cf174ff653e26bfe3a12a9341d35d0863 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -8,7 +8,7 @@
                <relativePath>../../org.argeo.slc</relativePath>
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
-       <artifactId>org.argeo.slc.support.ws</artifactId>
+       <artifactId>org.argeo.slc.support.ws.client</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Support Web Services Client</name>
        <build>
@@ -46,12 +46,12 @@
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.specs</artifactId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
                        <version>${project.version}</version>
                </dependency>
 

diff --git a/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF
index ef97c49480995f70baae961b1c59aa13390a63e2..bad316436fab5af02a866d44f71751dca0df0bfa 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF
+++ b/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF
@@ -24,24 +24,25 @@ Bundle-Version: 0.11.2.SNAPSHOT
 Bundle-ManifestVersion: 2\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-Description: SLC Distribution\r
-Import-Package: javax.xml.namespace,javax.xml.transform,javax.xml.tran\r
- sform.dom,org.apache.commons.logging;version="1.1",org.argeo.slc.core\r
- .process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0\r
- .11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT\r
- ",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.m\r
- sg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;versio\r
- n="0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SN\r
- APSHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.\r
- slc.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.oxm;ve\r
- rsion="1.5.5.A",org.springframework.ws;version="1.5.5.A",org.springfr\r
- amework.ws.client;version="1.5.5.A",org.springframework.ws.client.cor\r
- e;version="1.5.5.A",org.springframework.ws.client.support.interceptor\r
- ;version="1.5.5.A",org.springframework.ws.context;version="1.5.5.A",o\r
- rg.springframework.ws.soap;version="1.5.5.A",org.springframework.ws.s\r
- oap.client;version="1.5.5.A",org.springframework.xml.transform;versio\r
- n="1.5.5.A",org.springframework.xml.validation;version="1.5.5.A",org.\r
- w3c.dom,org.xml.sax\r
-Bundle-SymbolicName: org.argeo.slc.support.ws\r
+Import-Package: javax.xml.namespace;version="1.3",javax.xml.transform;\r
+ version="1.3",javax.xml.transform.dom;version="1.3",org.apache.common\r
+ s.logging;version="1.1",org.argeo.slc.core.process;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.s\r
+ lc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.process\r
+ ;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.\r
+ 2.SNAPSHOT",org.argeo.slc.ws.client;version="0.11.2.SNAPSHOT",org.arg\r
+ eo.slc.ws.client.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.pr\r
+ ocess;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0\r
+ .11.2.SNAPSHOT",org.springframework.oxm;version="1.5.5.A",org.springf\r
+ ramework.ws;version="1.5.5.A",org.springframework.ws.client;version="\r
+ 1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.spr\r
+ ingframework.ws.client.support.interceptor;version="1.5.5.A",org.spri\r
+ ngframework.ws.context;version="1.5.5.A",org.springframework.ws.soap;\r
+ version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5.A\r
+ ",org.springframework.xml.transform;version="1.5.5.A",org.springframe\r
+ work.xml.validation;version="1.5.5.A",org.w3c.dom;version="1.3",org.x\r
+ ml.sax;version="1.3"\r
+Bundle-SymbolicName: org.argeo.slc.support.ws.client\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 \r