From 1f605077091f6bb2abced2b976e747b2e1337ff5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 22 Nov 2008 14:56:50 +0000 Subject: [PATCH] Restructure modules git-svn-id: https://svn.argeo.org/slc/trunk@1854 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../.settings/org.eclipse.jdt.core.prefs | 2 +- runtime/org.argeo.slc.detached/pom.xml | 4 +- runtime/org.argeo.slc.hibernate/pom.xml | 22 ++++---- runtime/org.argeo.slc.launcher/pom.xml | 5 -- runtime/org.argeo.slc.lib.detached/pom.xml | 7 +-- .../src/main/resources/META-INF/MANIFEST.MF | 2 +- runtime/org.argeo.slc.server/pom.xml | 30 ++++------- runtime/org.argeo.slc.support.ant/pom.xml | 5 -- .../org/argeo/slc/ant/AntSlcApplication.java | 8 +-- runtime/org.argeo.slc.support.castor/pom.xml | 53 +------------------ .../org.argeo.slc.support.ws.client/pom.xml | 6 +-- .../src/main/resources/META-INF/MANIFEST.MF | 37 ++++++------- 12 files changed, 54 insertions(+), 127 deletions(-) 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 134aca25f..1f10056c3 100644 --- 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 b61db4c52..02b08109e 100644 --- a/runtime/org.argeo.slc.detached/pom.xml +++ b/runtime/org.argeo.slc.detached/pom.xml @@ -40,8 +40,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.3 - 1.3 + 1.4 + 1.4 diff --git a/runtime/org.argeo.slc.hibernate/pom.xml b/runtime/org.argeo.slc.hibernate/pom.xml index fffe4ca7c..4e707e06e 100644 --- a/runtime/org.argeo.slc.hibernate/pom.xml +++ b/runtime/org.argeo.slc.hibernate/pom.xml @@ -5,17 +5,13 @@ org.argeo.slc argeo-slc 0.11.2-SNAPSHOT - ../org.argeo.slc + ../../org.argeo.slc + org.argeo.slc.runtime org.argeo.slc.hibernate Argeo SLC Hibernate - - scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.hibernate - https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-hibernate - - org.apache.maven.plugins maven-compiler-plugin @@ -47,8 +43,8 @@ - org.argeo.slc - org.argeo.slc.core + org.argeo.slc.runtime + org.argeo.slc.support.simple ${project.version} @@ -83,10 +79,18 @@ org.springframework.context.support + + + org.argeo.slc.runtime + org.argeo.slc.support.castor + ${project.version} + test + + org.hsqldb com.springsource.org.hsqldb - testing + test diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml index 6e2c58c4f..1d010d091 100644 --- a/runtime/org.argeo.slc.launcher/pom.xml +++ b/runtime/org.argeo.slc.launcher/pom.xml @@ -62,11 +62,6 @@ - - org.argeo.slc.runtime - org.argeo.slc.specs - ${project.version} - org.argeo.slc.runtime org.argeo.slc.support.simple diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml index 95fea4c2f..bbe38897c 100644 --- a/runtime/org.argeo.slc.lib.detached/pom.xml +++ b/runtime/org.argeo.slc.lib.detached/pom.xml @@ -10,7 +10,7 @@ org.argeo.slc.runtime org.argeo.slc.lib.detached jar - Argeo SLC Agent + Argeo SLC Lib Detached @@ -44,11 +44,6 @@ - - org.argeo.slc.runtime - org.argeo.slc.specs - ${project.version} - org.argeo.slc.runtime org.argeo.slc.support.simple 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 cc8dd67d8..9adc348a0 100644 --- 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 rsion="0.11.2.SNAPSHOT" Tool: Bnd-0.0.255 -Bundle-Name: Argeo SLC Agent +Bundle-Name: Argeo SLC Lib Detached Created-By: 1.6.0 (Sun Microsystems Inc.) Bundle-Vendor: Argeo Bundle-Version: 0.11.2.SNAPSHOT diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index 0f629a7fd..dfcfbd77a 100644 --- a/runtime/org.argeo.slc.server/pom.xml +++ b/runtime/org.argeo.slc.server/pom.xml @@ -1,13 +1,13 @@ - 4.0.0 org.argeo.slc argeo-slc 0.11.2-SNAPSHOT - ../org.argeo.slc + ../../org.argeo.slc + org.argeo.slc.runtime org.argeo.slc.server Argeo SLC Server SLC Server @@ -42,10 +42,10 @@ maven-jetty-plugin - ../org.argeo.slc.webapp/src/main/webapp + ../../org.argeo.slc.webapp/src/main/webapp - ../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml + ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml @@ -53,26 +53,14 @@ - org.argeo.slc - org.argeo.slc.core + org.argeo.slc.runtime + org.argeo.slc.hibernate ${project.version} - - - xerces - xercesImpl - - - org.argeo.slc - org.argeo.slc.hibernate + org.argeo.slc.runtime + org.argeo.slc.support.castor ${project.version} - - - xerces - xercesImpl - - diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml index 396e37934..11320996e 100644 --- a/runtime/org.argeo.slc.support.ant/pom.xml +++ b/runtime/org.argeo.slc.support.ant/pom.xml @@ -44,11 +44,6 @@ - - org.argeo.slc.runtime - org.argeo.slc.specs - ${project.version} - org.argeo.slc.runtime org.argeo.slc.support.simple 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 410098d21..1ff4d3059 100644 --- 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 0dbb33046..0af0f021f 100644 --- a/runtime/org.argeo.slc.support.castor/pom.xml +++ b/runtime/org.argeo.slc.support.castor/pom.xml @@ -52,29 +52,6 @@ ${project.version} - - org.apache.commons - com.springsource.org.apache.commons.logging - - - org.apache.log4j - - com.springsource.org.apache.log4j - - - - - - org.springframework - org.springframework.context - org.springframework.ws org.springframework.oxm @@ -89,38 +66,10 @@ org.apache.xerces com.springsource.org.apache.xerces - - - edu.emory.mathcs.backport - - com.springsource.edu.emory.mathcs.backport - - + javax.xml.stream com.springsource.javax.xml.stream - - - org.apache.commons - - com.springsource.org.apache.commons.io - - - - org.dbunit - com.springsource.org.dbunit - - - org.junit - com.springsource.junit - \ 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 429f9362f..dcaf695cf 100644 --- a/runtime/org.argeo.slc.support.ws.client/pom.xml +++ b/runtime/org.argeo.slc.support.ws.client/pom.xml @@ -8,7 +8,7 @@ ../../org.argeo.slc org.argeo.slc.runtime - org.argeo.slc.support.ws + org.argeo.slc.support.ws.client jar Argeo SLC Support Web Services Client @@ -46,12 +46,12 @@ org.argeo.slc.runtime - org.argeo.slc.specs + org.argeo.slc.support.simple ${project.version} org.argeo.slc.runtime - org.argeo.slc.support.simple + org.argeo.slc.support.castor ${project.version} 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 ef97c4948..bad316436 100644 --- 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 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution -Import-Package: javax.xml.namespace,javax.xml.transform,javax.xml.tran - sform.dom,org.apache.commons.logging;version="1.1",org.argeo.slc.core - .process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0 - .11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT - ",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.m - sg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;versio - n="0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SN - APSHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo. - slc.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.oxm;ve - rsion="1.5.5.A",org.springframework.ws;version="1.5.5.A",org.springfr - amework.ws.client;version="1.5.5.A",org.springframework.ws.client.cor - e;version="1.5.5.A",org.springframework.ws.client.support.interceptor - ;version="1.5.5.A",org.springframework.ws.context;version="1.5.5.A",o - rg.springframework.ws.soap;version="1.5.5.A",org.springframework.ws.s - oap.client;version="1.5.5.A",org.springframework.xml.transform;versio - n="1.5.5.A",org.springframework.xml.validation;version="1.5.5.A",org. - w3c.dom,org.xml.sax -Bundle-SymbolicName: org.argeo.slc.support.ws +Import-Package: javax.xml.namespace;version="1.3",javax.xml.transform; + version="1.3",javax.xml.transform.dom;version="1.3",org.apache.common + s.logging;version="1.1",org.argeo.slc.core.process;version="0.11.2.SN + APSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.s + lc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.process + ;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11. + 2.SNAPSHOT",org.argeo.slc.ws.client;version="0.11.2.SNAPSHOT",org.arg + eo.slc.ws.client.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.pr + ocess;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0 + .11.2.SNAPSHOT",org.springframework.oxm;version="1.5.5.A",org.springf + ramework.ws;version="1.5.5.A",org.springframework.ws.client;version=" + 1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.spr + ingframework.ws.client.support.interceptor;version="1.5.5.A",org.spri + ngframework.ws.context;version="1.5.5.A",org.springframework.ws.soap; + version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5.A + ",org.springframework.xml.transform;version="1.5.5.A",org.springframe + work.xml.validation;version="1.5.5.A",org.w3c.dom;version="1.3",org.x + ml.sax;version="1.3" +Bundle-SymbolicName: org.argeo.slc.support.ws.client Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) -- 2.39.2