From 4af418ad1d16e736d7e205567d994eb73c8f7e83 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 16 Nov 2008 12:49:11 +0000 Subject: [PATCH] Merge from 0.11.mbaudier (OSGi libraries) git-svn-id: https://svn.argeo.org/slc/trunk@1825 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.agent/pom.xml | 131 +- .../org/argeo/slc/ant/AntSlcApplication.java | 3 +- .../main/java/org/argeo/slc/cli/SlcMain.java | 2 +- .../lib/detached/DetachedTestDefinition.java | 7 +- .../slc/maven/MavenDeployEnvironment.java | 4 +- .../org/argeo/slc/maven/MavenManager.java | 12 +- .../src/main/resources/META-INF/MANIFEST.MF | 122 ++ org.argeo.slc.core/pom.xml | 195 +-- .../src/main/resources/META-INF/MANIFEST.MF | 123 ++ org.argeo.slc.detached.launcher/pom.xml | 84 +- .../src/main/resources/META-INF/MANIFEST.MF | 19 + org.argeo.slc.detached/pom.xml | 65 +- .../src/main/resources/META-INF/MANIFEST.MF | 53 +- org.argeo.slc.dist/pom.xml | 65 +- org.argeo.slc.dist/provision.sh | 3 + org.argeo.slc.example/pom.xml | 25 +- .../java/org/argeo/slc/example/Activator.java | 78 ++ .../src/main/resources/META-INF/MANIFEST.MF | 36 + org.argeo.slc.hibernate/pom.xml | 53 +- .../src/main/resources/META-INF/MANIFEST.MF | 54 + org.argeo.slc.server/pom.xml | 66 +- .../src/main/resources/META-INF/MANIFEST.MF | 80 ++ org.argeo.slc.webapp/pom.xml | 13 +- org.argeo.slc/pom.xml | 1164 +++++++++-------- .../.settings/org.eclipse.jdt.core.prefs | 12 +- sandbox/argeo.slc.jemmytest/pom.xml | 11 +- .../src/main/resources/META-INF/MANIFEST.MF | 28 +- sandbox/argeo.slc.springtest/.classpath | 20 +- 28 files changed, 1662 insertions(+), 866 deletions(-) create mode 100644 org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.dist/provision.sh create mode 100644 org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java create mode 100644 org.argeo.slc.example/src/main/resources/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF create mode 100644 org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF diff --git a/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml index 41647751a..c9f75145e 100644 --- a/org.argeo.slc.agent/pom.xml +++ b/org.argeo.slc.agent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -6,12 +7,17 @@ 0.11.2-SNAPSHOT ../org.argeo.slc - argeo-slc-agent + org.argeo.slc.agent + jar Argeo SLC Agent - scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent - https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-agent - + + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent + + + https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent + + @@ -19,6 +25,10 @@ org.apache.maven.plugins maven-compiler-plugin + + org.apache.maven.plugins + maven-jar-plugin + org.apache.maven.plugins maven-source-plugin @@ -45,81 +55,98 @@ + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.* + + *,org.argeo.slc.core.test.spring,org.apache.commons.cli;resolution:=optional + + + + + org.argeo.slc - argeo-slc-core + org.argeo.slc.core ${project.version} - - org.argeo.slc - org.argeo.slc.detached - ${project.version} - - - log4j - log4j + org.argeo.slc + org.argeo.slc.detached + ${project.version} org.springframework.ws - spring-ws-core + org.springframework.ws javax.xml.soap - saaj-api + com.springsource.javax.xml.soap - com.sun.xml.messaging.saaj - saaj-impl + com.sun.xml + + com.springsource.com.sun.xml.messaging.saaj + + - javax.activation - activation + org.apache.ant + com.springsource.org.apache.tools.ant - + org.apache.ant - ant + ant-commons-logging - - org.apache.ant - ant-commons-logging - - - org.apache.ant - ant-commons-net - - - org.apache.ant - ant-apache-oro - - - org.apache.ant - ant-apache-bsf - - - commons-net - commons-net - - - oro - oro - - - org.apache.maven - maven-embedder + org.apache.ant + ant-commons-net - org.apache.maven - maven-settings + org.apache.ant + ant-apache-oro - + + org.apache.ant + ant-apache-bsf + + + commons-net + commons-net + + + oro + oro + + commons-cli commons-cli diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java index 37bdff0dc..410098d21 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java @@ -19,7 +19,6 @@ import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; -import org.apache.tools.ant.listener.CommonsLoggingListener; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.core.structure.SimpleSElement; @@ -261,7 +260,7 @@ public class AntSlcApplication { } } - project.addBuildListener(new CommonsLoggingListener()); + //project.addBuildListener(new CommonsLoggingListener()); ListableBeanFactory context = (ListableBeanFactory) project .getReference(AntConstants.REF_ROOT_CONTEXT); diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java index dccced3e5..cf52581c8 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java @@ -158,7 +158,7 @@ public class SlcMain { DefaultSlcRuntime runtime = new DefaultSlcRuntime(); runtime.executeScript(runtimeStr, script, targets, properties, null, null); - System.exit(0); + //System.exit(0); } catch (SlcException e) { log.error("SLC client terminated with an error: ", e); System.exit(1); diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java index af392f2b7..becb4f8ce 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java @@ -10,13 +10,14 @@ import org.argeo.slc.core.SlcException; import org.argeo.slc.core.structure.tree.TreeSRelatedHelper; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.TestDefinition; +import org.argeo.slc.core.test.TestResult; import org.argeo.slc.core.test.TestRun; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.context.ContextUtils; -import org.argeo.slc.detached.DetachedClient; -import org.argeo.slc.detached.DetachedStep; import org.argeo.slc.detached.DetachedAnswer; +import org.argeo.slc.detached.DetachedClient; import org.argeo.slc.detached.DetachedRequest; +import org.argeo.slc.detached.DetachedStep; import org.argeo.slc.detached.ui.UiStep; import org.springframework.beans.BeansException; import org.springframework.beans.PropertyValue; @@ -107,7 +108,7 @@ public class DetachedTestDefinition extends TreeSRelatedHelper implements ContextUtils.compareReachedExpected(testData, testRun .getTestResult(), this); } else { - testRun.getTestResult().addResultPart( + ((TestResult)testRun.getTestResult()).addResultPart( new SimpleResultPart(TestStatus.PASSED, "Step " + stepBeanNameT + " executed successfully")); } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java index 223eb300f..744aa2c9e 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java @@ -12,7 +12,7 @@ import org.argeo.slc.ant.AntRunner; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.deploy.DeployEnvironment; -public class MavenDeployEnvironment implements DeployEnvironment { +public class MavenDeployEnvironment {/*implements DeployEnvironment { private static final Log log = LogFactory .getLog(MavenDeployEnvironment.class); private MavenManager mavenManager; @@ -69,5 +69,5 @@ public class MavenDeployEnvironment implements DeployEnvironment { public void setMavenManager(MavenManager mavenManager) { this.mavenManager = mavenManager; } - +*/ } diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java index 236d71850..9908c3b8b 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java @@ -6,14 +6,14 @@ import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.embedder.MavenEmbedder; -import org.apache.maven.embedder.MavenEmbedderException; +//import org.apache.maven.artifact.Artifact; +//import org.apache.maven.artifact.repository.ArtifactRepository; +//import org.apache.maven.embedder.MavenEmbedder; +//import org.apache.maven.embedder.MavenEmbedderException; import org.argeo.slc.core.SlcException; -public class MavenManager { +public class MavenManager {/* FIXME private final Log log = LogFactory.getLog(getClass()); private String localRepositoryPath; @@ -100,5 +100,5 @@ public class MavenManager { public void setRemoteRepositories(List remoteRepositories) { this.remoteRepositories = remoteRepositories; } - +*/ } diff --git a/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9201ca28b --- /dev/null +++ b/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,122 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.ws.client;uses:="org.springframework.ws. + client.core,org.springframework.oxm,org.apache.commons.logging,org.sp + ringframework.ws,org.springframework.ws.soap,org.springframework.ws.c + ontext,org.springframework.xml.transform,org.springframework.ws.clien + t,javax.xml.transform.dom,org.w3c.dom,org.springframework.xml.validat + ion,javax.xml.namespace,org.xml.sax,javax.xml.transform,org.springfra + mework.ws.soap.client,org.springframework.ws.client.support.intercept + or";version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version= + "0.11.2.SNAPSHOT",org.argeo.slc.ant.detached;uses:="org.argeo.slc.ant + .spring,org.apache.commons.logging,org.argeo.slc.core,org.argeo.slc.s + pring,org.springframework.context,org.argeo.slc.detached,org.argeo.sl + c.ant.structure,org.springframework.beans.factory";version="0.11.2.SN + APSHOT",org.argeo.slc.ws.test.tree;uses:="org.springframework.ws.clie + nt.core,org.apache.commons.logging,org.argeo.slc.msg.test.tree,org.ar + geo.slc.ws.client,org.springframework.ws.soap.client,org.springframew + ork.ws.client,org.argeo.slc.core.test.tree,org.argeo.slc.core.test";v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.maven;uses:="org.argeo.slc.cor + e.build,org.argeo.slc.core.deploy";version="0.11.2.SNAPSHOT",org.arge + o.slc.ant.structure;uses:="org.argeo.slc.core.structure,org.argeo.slc + .ant.spring,org.argeo.slc.core,org.springframework.context,org.apache + .tools.ant,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHO + T",org.argeo.slc.ant.unit;uses:="org.argeo.slc.ant,junit.framework,or + g.argeo.slc.unit,org.argeo.slc.cli,org.argeo.slc.runtime,org.springfr + amework.core.io,org.springframework.context,org.argeo.slc.core.proces + s";version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy;uses:="org.arge + o.slc.ant.spring,org.apache.commons.logging,org.argeo.slc.core,org.ar + geo.slc.core.build,org.springframework.context,org.argeo.slc.ant.stru + cture,org.argeo.slc.core.deploy,org.apache.tools.ant";version="0.11.2 + .SNAPSHOT",org.argeo.slc.ant.spring;uses:="org.apache.commons.logging + ,org.argeo.slc.core,org.springframework.beans,org.apache.tools.ant.ty + pes,org.springframework.context,org.argeo.slc.core.process,org.apache + .tools.ant,org.springframework.beans.factory";version="0.11.2.SNAPSHO + T",org.argeo.slc.ant;uses:="org.apache.commons.logging,org.apache.log + 4j,org.springframework.context.support,org.apache.log4j.spi,org.sprin + gframework.beans.factory.config,org.springframework.beans.factory.sup + port,org.argeo.slc.core.structure,org.argeo.slc.core,org.apache.tools + .ant.util,org.apache.commons.io,org.argeo.slc.core.process,org.argeo. + slc.core.structure.tree,org.springframework.beans.factory,org.apache. + tools.ant.helper,org.springframework.util,org.springframework.core.io + ,org.springframework.context,org.springframework.beans.factory.xml,or + g.argeo.slc.logging,org.apache.tools.ant,org.argeo.slc.runtime";versi + on="0.11.2.SNAPSHOT",org.argeo.slc.lib.detached;uses:="org.springfram + ework.oxm,org.apache.commons.logging,org.argeo.slc.detached.ui,org.sp + ringframework.beans,org.springframework.beans.factory.config,org.arge + o.slc.detached,org.argeo.slc.core.test,org.springframework.beans.fact + ory.support,org.argeo.slc.core,org.argeo.slc.core.test.context,javax. + xml.transform,org.argeo.slc.core.structure.tree,org.springframework.b + eans.factory";version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses + :="org.springframework.ws.client.core,org.apache.commons.logging,org. + argeo.slc.ws.client,org.springframework.ws.client,org.springframework + .ws.soap.client,org.argeo.slc.core.process,org.argeo.slc.msg.process" + ;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;uses:="org.apache.common + s.logging,org.apache.commons.cli,org.springframework.core.io,org.arge + o.slc.logging,org.argeo.slc.ant,org.argeo.slc.core,org.argeo.slc.spri + ng,org.argeo.slc.runtime,org.apache.commons.io,org.argeo.slc.core.pro + cess";version="0.11.2.SNAPSHOT",org.argeo.slc.ant.test;uses:="org.apa + che.commons.logging,org.springframework.beans,org.springframework.con + text,org.argeo.slc.ant.structure,org.apache.tools.ant,org.argeo.slc.c + ore.test,org.argeo.slc.core.structure,org.argeo.slc.ant.spring,org.ar + geo.slc.core,org.argeo.slc.core.test.context,org.argeo.slc.spring,org + .apache.tools.ant.types,org.argeo.slc.core.deploy,org.argeo.slc.core. + process,org.argeo.slc.core.structure.tree,org.springframework.beans.f + actory";version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy.ant;ve + rsion="0.11.2.SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Agent +Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +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,junit.framework;version="3.8",org.apache.commons.cli;resolu + tion:=optional,org.apache.commons.io;version="1.4",org.apache.commons + .logging;version="1.1",org.apache.log4j;version="1.2",org.apache.log4 + j.spi;version="1.2",org.apache.tools.ant;version="1.7",org.apache.too + ls.ant.helper;version="1.7",org.apache.tools.ant.types;version="1.7", + org.apache.tools.ant.util;version="1.7",org.argeo.slc.ant;version="0. + 11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2.SNAPSHOT",org + .argeo.slc.ant.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.s + pring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.structure;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.11.2.SNAPSHOT",org + .argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;versi + on="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",org + .argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.de + ploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;version="0. + 11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.arge + o.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.con + text;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version + ="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPS + HOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,org.argeo.slc.l + ib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SNAPSHOT",org.ar + geo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test. + tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;version="0.11.2. + SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT",org.argeo.sl + c.support.deploy.ant;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ver + sion="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version="0.11.2.SNAPSH + OT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAPSHOT",org.arge + o.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree + ;version="0.11.2.SNAPSHOT",org.springframework.beans;version="2.5",or + g.springframework.beans.factory;version="2.5",org.springframework.bea + ns.factory.config;version="2.5",org.springframework.beans.factory.sup + port;version="2.5",org.springframework.beans.factory.xml;version="2.5 + ",org.springframework.context;version="2.5.6.A",org.springframework.c + ontext.support;version="2.5.6.A",org.springframework.core.io;version= + "2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframewo + rk.util;version="2.5.6.A",org.springframework.ws;version="1.5.5.A",or + g.springframework.ws.client;version="1.5.5.A",org.springframework.ws. + client.core;version="1.5.5.A",org.springframework.ws.client.support.i + nterceptor;version="1.5.5.A",org.springframework.ws.context;version=" + 1.5.5.A",org.springframework.ws.soap;version="1.5.5.A",org.springfram + ework.ws.soap.client;version="1.5.5.A",org.springframework.xml.transf + orm;version="1.5.5.A",org.springframework.xml.validation;version="1.5 + .5.A",org.w3c.dom,org.xml.sax +Bundle-SymbolicName: org.argeo.slc.agent +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml index 9c9cf21e6..576a3333f 100644 --- a/org.argeo.slc.core/pom.xml +++ b/org.argeo.slc.core/pom.xml @@ -1,78 +1,125 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc - 0.11.2-SNAPSHOT - ../org.argeo.slc - - argeo-slc-core - Argeo SLC Core - SLC Core - - scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core - https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - log4j - log4j - + + 4.0.0 + + org.argeo.slc + argeo-slc + 0.11.2-SNAPSHOT + ../org.argeo.slc + + org.argeo.slc.core + Argeo SLC Core + SLC Core + + + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core + + + https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.* + + *,org.apache.commons.logging;version="1.1" + + + - - org.springframework - spring-context - - - org.springframework.ws - spring-oxm - + + + + + org.apache.commons + com.springsource.org.apache.commons.logging + + + org.apache.log4j + + com.springsource.org.apache.log4j + + + - - org.codehaus.castor - castor - - - xerces - xercesImpl - - - xalan - xalan - - - javax.xml.stream - stax-api - + + org.springframework + org.springframework.context + + + org.springframework.ws + org.springframework.oxm + - - commons-io - commons-io - - - org.dbunit - dbunit - - - junit - junit - - + + org.codehaus.castor + com.springsource.org.castor + + + org.apache.xerces + com.springsource.org.apache.xerces + + + org.apache.xalan + com.springsource.org.apache.xalan + + + 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/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..c433cbc5e --- /dev/null +++ b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,123 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.s + lc.dao.process;uses:="org.argeo.slc.core.process";version="0.11.2.SNA + PSHOT",org.argeo.slc.dao.test.tree;uses:="org.argeo.slc.dao.test,org. + apache.commons.logging,org.argeo.slc.core.test.tree,org.argeo.slc.cor + e.structure.tree,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",o + rg.argeo.slc.core.test;uses:="org.apache.commons.logging,org.argeo.sl + c.core,org.argeo.slc.core.test.context,org.argeo.slc.core.deploy,org. + argeo.slc.core.process,org.argeo.slc.core.structure.tree";version="0. + 11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.msg.test.tree;uses:="org.argeo.slc.core,org.argeo.slc. + core.test.tree,org.argeo.slc.core.structure.tree,org.argeo.slc.core.t + est";version="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2.SNA + PSHOT",org.argeo.slc.castor.test.tree;uses:="org.exolab.castor.mappin + g,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo.slc.co + re.test.context;uses:="org.argeo.slc.core.structure,org.apache.common + s.logging,org.argeo.slc.core,org.argeo.slc.core.test,org.argeo.slc.co + re.structure.tree,org.springframework.beans.factory";version="0.11.2. + SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arge + o.slc.core.process;uses:="org.springframework.oxm,org.argeo.slc.core, + javax.xml.transform,javax.xml.transform.stream,org.apache.commons.io" + ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;uses:="o + rg.argeo.slc.core.structure,org.argeo.slc.core";version="0.11.2.SNAPS + HOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.argeo.slc + .castor.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proces + s.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;uses:="org.apac + he.commons.logging,org.springframework.context.support,org.springfram + ework.context,org.springframework.xml.xsd,org.springframework.xml.val + idation,org.xml.sax,org.argeo.slc.core,junit.framework,javax.xml.tran + sform,org.argeo.slc.spring,org.springframework.beans.factory";version + ="0.11.2.SNAPSHOT",org.argeo.slc.diff;uses:="org.argeo.slc.core,org.s + pringframework.core.io";version="0.11.2.SNAPSHOT",org.argeo.slc.xml.s + pring;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;uses:="org.apac + he.log4j,org.argeo.slc.core,org.springframework.util,org.springframew + ork.core.io,org.apache.commons.io";version="0.11.2.SNAPSHOT",org.arge + o.slc.core.test.tree;uses:="org.springframework.oxm,org.apache.common + s.logging,org.springframework.xml.transform,org.springframework.core. + io,javax.xml.parsers,javax.xml.transform.dom,org.w3c.dom,org.argeo.sl + c.core.test,org.argeo.slc.core.structure,org.argeo.slc.core,javax.xml + .transform,javax.xml.transform.stream,org.apache.commons.io,org.argeo + .slc.core.structure.tree";version="0.11.2.SNAPSHOT",org.argeo.slc.cas + tor;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.test.tree;uses:="org + .apache.commons.logging,org.argeo.slc.unit,org.argeo.slc.core.test.tr + ee,org.argeo.slc.core.test,org.argeo.slc.core.structure,org.argeo.slc + .msg.test.tree,junit.framework,org.argeo.slc.core.build,org.argeo.slc + .unit.process,org.argeo.slc.core.deploy,org.argeo.slc.core.process,or + g.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT",org.argeo. + slc.dao.test;uses:="org.argeo.slc.core.test";version="0.11.2.SNAPSHOT + ",org.argeo.slc.castor.test;version="0.11.2.SNAPSHOT",org.argeo.slc.s + upport.deploy;uses:="org.apache.commons.logging,org.argeo.slc.core,or + g.argeo.slc.core.build,org.argeo.slc.core.deploy";version="0.11.2.SNA + PSHOT",org.argeo.slc.castor.structure.tree;uses:="org.exolab.castor.m + apping,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT",o + rg.argeo.slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.su + pport.deploy.db;uses:="org.apache.commons.logging,org.dbunit.operatio + n,org.springframework.core.io,org.dbunit.dataset,org.argeo.slc.core,j + avax.sql,org.argeo.slc.core.build,org.dbunit.dataset.xml,org.dbunit.d + atabase,org.dbunit,org.argeo.slc.core.deploy";version="0.11.2.SNAPSHO + T",org.argeo.slc.core.test.tree.htmlreport;version="0.11.2.SNAPSHOT", + org.argeo.slc.unit.process;uses:="junit.framework,org.argeo.slc.unit, + org.argeo.slc.core.process";version="0.11.2.SNAPSHOT",org.argeo.slc.s + pring;uses:="org.apache.commons.logging,org.argeo.slc.core,org.spring + framework.core.io,org.springframework.beans.factory";version="0.11.2. + SNAPSHOT",org.argeo.slc.runtime;uses:="org.argeo.slc.core.process";ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;uses:="org.apache.c + ommons.logging,org.argeo.slc.core,org.argeo.slc.core.build";version=" + 0.11.2.SNAPSHOT",org.argeo.slc.msg.process;uses:="org.argeo.slc.core. + process";version="0.11.2.SNAPSHOT",org.argeo.slc.xml;version="0.11.2. + SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Core +Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +Bundle-Version: 0.11.2.SNAPSHOT +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Description: SLC Core +Import-Package: javax.sql,javax.xml.parsers,javax.xml.transform,javax. + xml.transform.dom,javax.xml.transform.stream,junit.framework;version= + "3.8",org.apache.commons.io;version="1.4",org.apache.commons.logging; + version="1.1",org.apache.log4j;version="1.2",org.argeo.slc.castor;ver + sion="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPS + HOT",org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo + .slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.str + ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree; + version="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.S + NAPSHOT",org.argeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org + .argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNA + PSHOT",org.argeo.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo + .slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core + .structure;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tre + e;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.S + NAPSHOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",or + g.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc. + core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree + .htmlreport;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;versi + on="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc. + diff;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11.2. + SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.arg + eo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime; + version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSH + OT",org.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo. + slc.support.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SN + APSHOT",org.argeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.ar + geo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;versio + n="0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;vers + ion="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;ver + sion="2.2",org.dbunit.operation;version="2.2",org.exolab.castor.mappi + ng;version="1.2",org.springframework.beans.factory;version="2.5.6.A", + org.springframework.context;version="2.5.6.A",org.springframework.con + text.support;version="2.5.6.A",org.springframework.core.io;version="2 + .5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframework + .util;version="2.5.6.A",org.springframework.xml.transform;version="1. + 5.5.A",org.springframework.xml.validation;version="1.5.5.A",org.sprin + gframework.xml.xsd;version="1.5.5.A",org.w3c.dom,org.xml.sax +Bundle-SymbolicName: org.argeo.slc.core +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml index 3f787836a..363e000dc 100644 --- a/org.argeo.slc.detached.launcher/pom.xml +++ b/org.argeo.slc.detached.launcher/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -32,11 +33,22 @@ org.argeo.slc.detached.launcher.Main - + + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.* + + + + org.apache.maven.plugins maven-assembly-plugin @@ -62,7 +74,8 @@ org.apache.felix org.apache.felix.main - + + org.springframework org.springframework.context - 2.5.6.A + - commons-io - commons-io + org.apache.xerces + com.springsource.org.apache.xerces - org.apache.log4j + org.apache.xalan + com.springsource.org.apache.xalan + + + edu.emory.mathcs.backport - com.springsource.org.apache.log4j - - 1.2.15 + com.springsource.edu.emory.mathcs.backport + org.apache.commons - com.springsource.org.apache.commons.logging - - 1.1.1 + com.springsource.org.apache.commons.io + + + + org.junit + com.springsource.junit - xerces - xercesImpl + org.apache.log4j + com.springsource.org.apache.log4j - xalan - xalan + org.apache.commons + + com.springsource.org.apache.commons.logging + + - - - com.springsource.repository.bundles.release - - SpringSource Enterprise Bundle Repository - SpringSource - Bundle Releases - - - http://repository.springsource.com/maven/bundles/release - - - - com.springsource.repository.bundles.external - - SpringSource Enterprise Bundle Repository - External - Bundle Releases - - - http://repository.springsource.com/maven/bundles/external - - - \ No newline at end of file diff --git a/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..3f6f2008c --- /dev/null +++ b/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.detached.launcher;uses:="org.apache.comm + ons.logging,org.apache.felix.framework,org.apache.commons.io,org.apac + he.felix.main";version="0.11.2.SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Detached Launcher +Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +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: org.apache.commons.io;version="1.4",org.apache.commons + .logging;version="1.1",org.apache.felix.framework,org.apache.felix.ma + in,org.argeo.slc.detached.launcher;version="0.11.2.SNAPSHOT" +Bundle-SymbolicName: org.argeo.slc.detached.launcher +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml index 80edd1a86..ed3f0ba63 100644 --- a/org.argeo.slc.detached/pom.xml +++ b/org.argeo.slc.detached/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -9,34 +10,23 @@ org.argeo.slc.detached Argeo SLC Detached - jar + bundle maven-jar-plugin - - - src/main/resources/META-INF/MANIFEST.MF - - org.apache.felix maven-bundle-plugin - 1.4.3 - true - src/main/resources/META-INF - - ${pom.artifactId} - org.argeo.slc.detached.Activator - + org.argeo.slc.detached.* - + *, org.springframework.beans.factory;version="2.0", @@ -45,19 +35,9 @@ org.springframework.context;version="2.0", org.springframework.context.support;version="2.0", org.springframework.core.io;version="2.0" - - <_removeheaders>Bnd-LastModified + - - - bundle-manifest - process-classes - - manifest - - - org.apache.maven.plugins @@ -75,33 +55,42 @@ - org.apache.felix - org.osgi.core + org.eclipse.osgi + org.eclipse.osgi + 3.4.2.R34x_v20080826-1230 - org.springframework - spring-context + org.springframework.context - xerces - xercesImpl + org.apache.xerces + com.springsource.org.apache.xerces + - commons-io - commons-io + xml-apis + xml-apis + 1.3.04 + provided - junit - junit + org.apache.commons + + com.springsource.org.apache.commons.io + + + + org.junit + com.springsource.junit test - log4j - log4j + org.apache.log4j + com.springsource.org.apache.log4j \ No newline at end of file diff --git a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF index 907e8fe7b..bcc026dc1 100644 --- a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF @@ -1,42 +1,45 @@ Manifest-Version: 1.0 Export-Package: org.argeo.slc.detached.admin;uses:="org.apache.commons - .logging,org.osgi.framework,org.argeo.slc.detached";version="0.11.2.S - NAPSHOT",org.argeo.slc.detached.ui;uses:="org.argeo.slc.detached,org. - springframework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.sl - c.detached;uses:="org.apache.commons.logging,org.springframework.cont - ext.support,org.springframework.core.io,org.springframework.context,o - rg.springframework.beans.factory.xml,javax.xml.transform.dom,org.arge - o.slc.detached.drivers,org.w3c.dom,org.springframework.beans.factory. - support,org.argeo.slc.detached.admin,javax.xml.transform,javax.xml.tr - ansform.stream,org.osgi.framework,org.apache.commons.io,org.springfra - mework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.slc.detache - d.drivers;uses:="org.apache.commons.logging,org.apache.commons.io.fil - efilter,javax.xml.transform,javax.xml.transform.stream,org.apache.com - mons.io,org.argeo.slc.detached,org.springframework.beans.factory";ver - sion="0.11.2.SNAPSHOT" + .logging,org.osgi.framework,org.argeo.slc.detached",org.argeo.slc.det + ached.ui;uses:="org.argeo.slc.detached,org.springframework.beans.fact + ory",org.argeo.slc.detached;uses:="org.apache.commons.logging,org.spr + ingframework.context.support,org.springframework.core.io,org.springfr + amework.context,org.springframework.beans.factory.xml,javax.xml.trans + form.dom,org.argeo.slc.detached.drivers,org.w3c.dom,org.springframewo + rk.beans.factory.support,org.argeo.slc.detached.admin,javax.xml.trans + form,javax.xml.transform.stream,org.osgi.framework,org.apache.commons + .io,org.springframework.beans.factory",org.argeo.slc.detached.drivers + ;uses:="org.apache.commons.logging,org.apache.commons.io.filefilter,j + avax.xml.transform,javax.xml.transform.stream,org.apache.commons.io,o + rg.argeo.slc.detached,org.springframework.beans.factory" Built-By: mbaudier Tool: Bnd-0.0.255 Bundle-Name: Argeo SLC Detached -Created-By: 1.6.0 (Sun Microsystems Inc.) +Created-By: Apache Maven Bundle Plugin Bundle-Vendor: Argeo Build-Jdk: 1.6.0 Bundle-Version: 0.11.2.SNAPSHOT -Bundle-Activator: org.argeo.slc.detached.Activator Bundle-ManifestVersion: 2 +Bundle-Activator: org.argeo.slc.detached.Activator Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution Import-Package: javax.xml.transform,javax.xml.transform.dom,javax.xml. transform.stream,org.apache.commons.io;version="1.4",org.apache.commo - ns.io.filefilter;version="1.4",org.apache.commons.logging,org.argeo.s - lc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.admin;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.detached.drivers;version="0.11. - 2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNAPSHOT",org.o - sgi.framework,org.springframework.beans.factory;version="2.0",org.spr - ingframework.beans.factory.support;version="2.0",org.springframework. - beans.factory.xml;version="2.0",org.springframework.context;version=" - 2.0",org.springframework.context.support;version="2.0",org.springfram - ework.core.io;version="2.0",org.w3c.dom + ns.io.filefilter;version="1.4",org.apache.commons.logging;version="1. + 1",org.argeo.slc.detached,org.argeo.slc.detached.admin,org.argeo.slc. + detached.drivers,org.argeo.slc.detached.ui,org.osgi.framework;version + ="1.4",org.springframework.beans.factory;version="2.0",org.springfram + ework.beans.factory.support;version="2.0",org.springframework.beans.f + actory.xml;version="2.0",org.springframework.context;version="2.0",or + g.springframework.context.support;version="2.0",org.springframework.c + ore.io;version="2.0",org.w3c.dom Bundle-SymbolicName: org.argeo.slc.detached Bundle-DocURL: http://www.argeo.org +Include-Resource: org/argeo/slc/detached/spring.xml=src/main/resources + /org/argeo/slc/detached/spring.xml,org/argeo/slc/detached/slc-detache + d.xsd=src/main/resources/org/argeo/slc/detached/slc-detached.xsd,META + -INF/MANIFEST.MF=src/main/resources/META-INF/MANIFEST.MF,META-INF/spr + ing/slc-detached.xml=src/main/resources/META-INF/spring/slc-detached. + xml Originally-Created-By: Apache Maven Bundle Plugin diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml index 8824022fc..8e5497ed0 100644 --- a/org.argeo.slc.dist/pom.xml +++ b/org.argeo.slc.dist/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -30,20 +31,31 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + false + false + true + ${project.build.directory}/p2Repository/plugins + + + org.argeo.slc - argeo-slc-agent + org.argeo.slc.agent ${project.version} org.argeo.slc - argeo-slc-agent - ${project.version} + org.argeo.slc.agent + ${project.version} tar.gz base @@ -51,39 +63,28 @@ org.argeo.slc org.argeo.slc.detached.launcher - ${project.version} + ${project.version} tar.gz dist - - org.argeo.dep.jemmy - org.argeo.dep.jemmy.nb61 - - - - + + + \ No newline at end of file diff --git a/org.argeo.slc.dist/provision.sh b/org.argeo.slc.dist/provision.sh new file mode 100644 index 000000000..357fa92ab --- /dev/null +++ b/org.argeo.slc.dist/provision.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/mnt/wind/dev/tools-linux/eclipse-pde/eclipse -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator -source /home/mbaudier/dev/src/slc/org.argeo.slc.dist/target/p2Repository/ -metadataRepository file:/home/mbaudier/dev/src/slc/org.argeo.slc.dist/target/p2Repository/ -metadataRepositoryName "Ganymede Update Site" -artifactRepository file:/home/mbaudier/dev/src/slc/org.argeo.slc.dist/target/p2Repository/ -artifactRepositoryName "Ganymede Artifacts" -noDefaultIUs -vmargs -Xmx256m diff --git a/org.argeo.slc.example/pom.xml b/org.argeo.slc.example/pom.xml index 56c6d035e..75062f62b 100644 --- a/org.argeo.slc.example/pom.xml +++ b/org.argeo.slc.example/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -6,8 +7,8 @@ 0.11.2-SNAPSHOT ../org.argeo.slc - argeo-slc-example - Argeo SLC Example + org.argeo.slc.example + Argeo SLC Demo Example 1 jar An Example SLC application @@ -55,17 +56,31 @@ + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.example.* + + *,org.argeo.slc.core.test.spring,org.springframework.oxm.castor,org.argeo.slc.msg.test.tree,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.apache.tools.ant.types + org.argeo.slc.example.Activator + org.argeo.slc.core,org.argeo.slc.agent + + + org.argeo.slc - argeo-slc-core + org.argeo.slc.core ${project.version} org.argeo.slc - argeo-slc-agent + org.argeo.slc.agent ${project.version} diff --git a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java new file mode 100644 index 000000000..2eb5a87d9 --- /dev/null +++ b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/Activator.java @@ -0,0 +1,78 @@ +package org.argeo.slc.example; + +import java.net.URL; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.argeo.slc.cli.DefaultSlcRuntime; +import org.argeo.slc.detached.SpringStaticRefProvider; +import org.argeo.slc.detached.StaticRefProvider; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.io.UrlResource; + +public class Activator implements BundleActivator { + //private final static String BOOTSTRAP_LOG4J_CONFIG = "org/argeo/slc/example/log4j.properties"; + private static Log log = LogFactory.getLog(Activator.class); + + public void start(BundleContext context) throws Exception { + initLogging(null); + System.out.println("(stdout) Starting SLC Example bundle XXX..."); + log.info("Starting SLC Example bundle..."); + + + // Creates application context with this class class loader + ClassLoader classLoader = getClass().getClassLoader(); + Thread cur = Thread.currentThread(); + ClassLoader save = cur.getContextClassLoader(); + cur.setContextClassLoader(classLoader); + + try { + DefaultSlcRuntime runtime = new DefaultSlcRuntime(); + runtime + .executeScript( + null, + "/home/mbaudier/dev/src/slc/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml", + null, new Properties(), null, null); + + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("Could not initialize application context"); + } finally { + cur.setContextClassLoader(save); + } + + + } + + public void stop(BundleContext context) throws Exception { + System.out.println("(stdout) Stop SLC Example bundle..."); + } + + private static void initLogging(Properties userProperties) { + //System.setProperty("log4j.defaultInitOverride", "true"); + System.setProperty("log4j.rootLogger", "WARN, console"); + System.setProperty("log4j.logger.org.argeo", "INFO"); + System.setProperty("log4j.appender.console", "org.apache.log4j.ConsoleAppender"); + System.setProperty("log4j.appender.console.layout", "org.apache.log4j.PatternLayout"); + System.setProperty("log4j.appender.console.layout.ConversionPattern", "%-5p %d{ISO8601} %m - %c%n"); + +// // Add log4j user properties to System properties +// for (Object obj : userProperties.keySet()) { +// String key = obj.toString(); +// if (key.startsWith("log4j.")) { +// System.setProperty(key, userProperties.getProperty(key)); +// } +// } +// Log4jUtils.initLog4j(System.getProperty("log4j.configuration", +// "classpath:" + BOOTSTRAP_LOG4J_CONFIG)); + log = LogFactory.getLog(Activator.class); + + } + +} diff --git a/org.argeo.slc.example/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.example/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..2857f79e2 --- /dev/null +++ b/org.argeo.slc.example/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,36 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT", + org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org. + argeo.slc.example;uses:="org.apache.commons.logging,org.argeo.slc.cor + e.test,org.argeo.slc.core.structure,org.argeo.slc.example.appli,org.a + rgeo.slc.core.test.context,org.argeo.slc.core.build,org.argeo.slc.run + time,org.argeo.slc.cli,org.osgi.framework,org.argeo.slc.core.deploy,o + rg.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Demo Example 1 +Created-By: 1.6.0 (Sun Microsystems Inc.) +Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent +Bundle-Vendor: Argeo +Bundle-Version: 0.11.2.SNAPSHOT +Bundle-Activator: org.argeo.slc.example.Activator +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Description: An Example SLC application +Import-Package: org.apache.commons.logging;version="1.1",org.apache.to + ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org + .apache.tools.ant.types;version="1.7",org.argeo.slc.cli;version="0.11 + .2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.a + rgeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.str + ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPS + HOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.ar + geo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.exam + ple;version="0.11.2.SNAPSHOT",org.argeo.slc.example.appli;version="0. + 11.2.SNAPSHOT",org.argeo.slc.example.ws.client.spring;version="0.11.2 + .SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org. + argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.osgi.framework;versio + n="1.4",org.springframework.oxm.castor;version="1.5.5.A" +Bundle-SymbolicName: org.argeo.slc.example +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.hibernate/pom.xml b/org.argeo.slc.hibernate/pom.xml index e7dee9d20..fffe4ca7c 100644 --- a/org.argeo.slc.hibernate/pom.xml +++ b/org.argeo.slc.hibernate/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -6,12 +7,12 @@ 0.11.2-SNAPSHOT ../org.argeo.slc - argeo-slc-hibernate + 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 - + https://www.argeo.org/svn/slc/trunk/org.argeo.slc/argeo-slc-hibernate + @@ -27,41 +28,65 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.hibernate.* + + + + org.argeo.slc - argeo-slc-core + org.argeo.slc.core ${project.version} javax.transaction - jta + com.springsource.javax.transaction org.hibernate - hibernate + com.springsource.org.hibernate + + + net.sourceforge.ehcache + com.springsource.net.sf.ehcache + + + edu.emory.mathcs.backport + + com.springsource.edu.emory.mathcs.backport + - org.springframework - spring-orm + org.springframework.orm org.springframework - spring-jdbc + org.springframework.jdbc org.springframework - spring-context-support + org.springframework.context.support - hsqldb - hsqldb + org.hsqldb + com.springsource.org.hsqldb testing - \ No newline at end of file + diff --git a/org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..eab95e402 --- /dev/null +++ b/org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,54 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT + ",org.argeo.slc.hibernate.process;uses:="org.argeo.slc.core,org.sprin + gframework.orm.hibernate3.support,org.hibernate,org.argeo.slc.core.pr + ocess,org.argeo.slc.dao.process,org.springframework.orm.hibernate3";v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test.tree;uses:="org + .argeo.slc.core,org.springframework.orm.hibernate3.support,org.hibern + ate,org.argeo.slc.core.test.tree,org.argeo.slc.dao.test.tree,org.arge + o.slc.core.structure.tree,org.argeo.slc.core.test,org.springframework + .orm.hibernate3";version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.sp + ring;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.structure;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.unit;uses:="org.hiberna + te.cfg,org.argeo.slc.unit,org.dbunit.operation,org.springframework.co + re.io,org.springframework.context,org.dbunit.dataset,org.argeo.slc.co + re,javax.sql,org.argeo.slc.support.deploy.db,org.hibernate,org.hibern + ate.tool.hbm2ddl,org.dbunit.dataset.xml,org.dbunit.database,org.dbuni + t,org.apache.commons.io,org.springframework.orm.hibernate3";version=" + 0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test;uses:="org.argeo.slc.da + o.test,org.springframework.orm.hibernate3.support,org.argeo.slc.core. + test,org.springframework.orm.hibernate3";version="0.11.2.SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Hibernate +Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +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.sql,org.apache.commons.io;version="1.4",org.arge + o.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;versi + on="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11. + 2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.arg + eo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.pro + cess;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2 + .SNAPSHOT",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org. + argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT",org.argeo.slc.hib + ernate.process;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.spri + ng;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.structure;versio + n="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test;version="0.11.2.SNAP + SHOT",org.argeo.slc.hibernate.test.tree;version="0.11.2.SNAPSHOT",org + .argeo.slc.hibernate.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.sup + port.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version=" + 0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;version + ="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;versio + n="2.2",org.dbunit.operation;version="2.2",org.hibernate;version="3.2 + .6.ga",org.hibernate.cfg;version="3.2.6.ga",org.hibernate.tool.hbm2dd + l;version="3.2.6.ga",org.springframework.context;version="2.5.6.A",or + g.springframework.core.io;version="2.5.6.A",org.springframework.orm.h + ibernate3;version="2.5.6.A",org.springframework.orm.hibernate3.suppor + t;version="2.5.6.A" +Bundle-SymbolicName: org.argeo.slc.hibernate +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml index 66b098905..0f629a7fd 100644 --- a/org.argeo.slc.server/pom.xml +++ b/org.argeo.slc.server/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.slc @@ -6,7 +8,7 @@ 0.11.2-SNAPSHOT ../org.argeo.slc - argeo-slc-server + org.argeo.slc.server Argeo SLC Server SLC Server @@ -20,6 +22,21 @@ org.apache.maven.plugins maven-source-plugin + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.felix + maven-bundle-plugin + + + + org.argeo.slc.* + + + + org.mortbay.jetty maven-jetty-plugin @@ -37,7 +54,7 @@ org.argeo.slc - argeo-slc-core + org.argeo.slc.core ${project.version} @@ -48,7 +65,7 @@ org.argeo.slc - argeo-slc-hibernate + org.argeo.slc.hibernate ${project.version} @@ -60,40 +77,49 @@ javax.servlet - jstl + + com.springsource.javax.servlet.jsp.jstl + - taglibs - standard + org.apache.taglibs + + com.springsource.org.apache.taglibs.standard + - org.springframework.ws - spring-ws-core + javax.servlet + com.springsource.javax.servlet + provided - org.springframework - spring-webmvc + org.springframework.ws + org.springframework.ws org.springframework - spring-aop + org.springframework.web.servlet - javax.servlet - servlet-api - provided + org.springframework + org.springframework.aop org.aspectj - aspectjweaver + com.springsource.org.aspectj.weaver net.sourceforge.jexcelapi - jxl + com.springsource.jxl + + + com.lowagie.text + com.springsource.com.lowagie.text - com.lowagie - itext + javax.wsdl + com.springsource.javax.wsdl + - \ No newline at end of file + diff --git a/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..97181d685 --- /dev/null +++ b/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,80 @@ +Manifest-Version: 1.0 +Export-Package: org.argeo.slc.web.mvc;uses:="org.springframework.oxm,o + rg.apache.commons.logging,org.springframework.web.servlet.view,org.sp + ringframework.core.io,org.springframework.context,org.argeo.slc.core. + test.tree,javax.xml.parsers,javax.xml.transform.dom,org.w3c.dom,org.a + rgeo.slc.core,javax.xml.transform,org.springframework.web.servlet.vie + w.xslt,javax.xml.transform.stream,org.argeo.slc.core.process";version + ="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="org.springframewor + k.ws.server.endpoint,org.apache.commons.logging,org.argeo.slc.core,or + g.argeo.slc.core.process,org.argeo.slc.dao.process,org.argeo.slc.msg. + process";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;uses + :="org.springframework.web.servlet.mvc,org.apache.commons.logging,org + .argeo.slc.core,org.springframework.web.servlet,org.argeo.slc.core.pr + ocess,org.argeo.slc.dao.process,javax.servlet.http";version="0.11.2.S + NAPSHOT",org.argeo.slc.web.mvc.admin;uses:="org.springframework.web.s + ervlet.mvc,org.springframework.web.servlet,javax.servlet.http";versio + n="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;uses:="org.springframe + work.ws.server.endpoint,org.apache.commons.logging,org.argeo.slc.msg. + test.tree,org.argeo.slc.services.test,org.argeo.slc.core.test.tree,or + g.argeo.slc.dao.test.tree,org.argeo.slc.core.structure.tree,org.argeo + .slc.core.test";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.resul + t;uses:="org.springframework.web.servlet,com.lowagie.text.pdf,org.arg + eo.slc.services.test,org.argeo.slc.core.test.tree,com.lowagie.text,or + g.argeo.slc.dao.test.tree,org.argeo.slc.core.test,org.argeo.slc.core. + structure,jxl.write,org.springframework.web.servlet.mvc,org.argeo.slc + .dao.test,org.argeo.slc.core,org.springframework.web.servlet.handler, + org.springframework.web.servlet.view.document,org.argeo.slc.core.stru + cture.tree,javax.servlet.http";version="0.11.2.SNAPSHOT",org.argeo.sl + c.services.test.impl;uses:="org.argeo.slc.dao.test,org.apache.commons + .logging,org.argeo.slc.services.test,org.argeo.slc.core.test.tree,org + .argeo.slc.core.process,org.argeo.slc.dao.test.tree,org.argeo.slc.dao + .process,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo + .slc.services.test;uses:="org.argeo.slc.core.test";version="0.11.2.SN + APSHOT",org.argeo.slc.ws;uses:="org.apache.commons.logging,org.spring + framework.ws.soap,org.springframework.ws.soap.server.endpoint,org.spr + ingframework.ws.context,javax.xml.namespace";version="0.11.2.SNAPSHOT + ",org.argeo.slc.server.spring;version="0.11.2.SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: Argeo SLC Server +Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +Bundle-Version: 0.11.2.SNAPSHOT +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Description: SLC Server +Import-Package: com.lowagie.text;version="2.0",com.lowagie.text.pdf;ve + rsion="2.0",javax.servlet.http,javax.xml.namespace,javax.xml.parsers, + javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.strea + m,jxl.write;version="2.6",org.apache.commons.logging;version="1.1",or + g.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process + ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11 + .2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSH + OT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.c + ore.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ver + sion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSHO + T",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.sl + c.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2. + SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org.a + rgeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc.w + eb.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version= + "0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAPS + HOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.argeo + .slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version="0 + .11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT", + org.springframework.context;version="2.5.6.A",org.springframework.cor + e.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org. + springframework.web.servlet;version="2.5.6.A",org.springframework.web + .servlet.handler;version="2.5.6.A",org.springframework.web.servlet.mv + c;version="2.5.6.A",org.springframework.web.servlet.view;version="2.5 + .6.A",org.springframework.web.servlet.view.document;version="2.5.6.A" + ,org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spri + ngframework.ws.context;version="1.5.5.A",org.springframework.ws.serve + r.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1.5 + .5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A",o + rg.w3c.dom +Bundle-SymbolicName: org.argeo.slc.server +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) + diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml index 6611fd3c5..b12e8bf09 100644 --- a/org.argeo.slc.webapp/pom.xml +++ b/org.argeo.slc.webapp/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.slc @@ -67,14 +69,19 @@ org.argeo.slc - argeo-slc-server + org.argeo.slc.server ${project.version} org.argeo.slc - argeo-slc-agent + org.argeo.slc.agent ${project.version} test + + javax.activation + com.springsource.javax.activation + test + \ No newline at end of file diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 878140f42..9e831f351 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -1,526 +1,668 @@ - - 4.0.0 - org.argeo.slc - argeo-slc - pom - Argeo SLC - 0.11.2-SNAPSHOT - SLC Distribution - - http://www.argeo.org/projects/slc/${project.artfactId}/${project.version} - - - 2.5.5 - 1.5.4 - 2.0.9 - 1.7.1 - 6.1.11 - - - scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc - https://www.argeo.org/svn/slc/trunk/org.argeo.slc - - - Bugzilla - https://www.argeo.org/bugzilla/ - - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - Argeo - http://www.argeo.org - - - - mbaudier - Mathieu Baudier - mbaudier@argeo.org - Argeo - http://www.argeo.org - - architect - developer - - +1 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - package - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadoc - package - - jar - - - - - - org.mortbay.jetty - maven-jetty-plugin - ${version.jetty} - - org.argeo.slc.webapp - stopKey - 9091 - - - 9090 - 60000 - - - - - - hsqldb - hsqldb - 1.8.0.9 - - - org.mortbay.jetty - jetty-plus - ${version.jetty} - - - org.mortbay.jetty - jetty-naming - ${version.jetty} - - - log4j - log4j - 1.2.14 - jar - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - false - - - - src/assembly/with-dependencies.xml - - - - - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - cobertura-maven-plugin - - - - - - - javax.transaction - jta - 1.0.1 - + + 4.0.0 + org.argeo.slc + argeo-slc + pom + Argeo SLC + 0.11.2-SNAPSHOT + SLC Distribution + + http://www.argeo.org/projects/slc/${project.artfactId}/${project.version} + + + 2.5.6.A + 1.5.5.A + 2.0.9 + 1.7.1 + 6.1.11 + + + + scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc + + + https://www.argeo.org/svn/slc/trunk/org.argeo.slc + + + + Bugzilla + https://www.argeo.org/bugzilla/ + + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + Argeo + http://www.argeo.org + + + + mbaudier + Mathieu Baudier + mbaudier@argeo.org + Argeo + http://www.argeo.org + + architect + developer + + +1 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadoc + package + + jar + + + + + + org.mortbay.jetty + maven-jetty-plugin + ${version.jetty} + + org.argeo.slc.webapp + stopKey + 9091 + + + 9090 + 60000 + + + + + + org.hsqldb + + com.springsource.org.hsqldb + + 1.8.0.9 + + + org.mortbay.jetty + jetty-plus + ${version.jetty} + + + org.mortbay.jetty + jetty-naming + ${version.jetty} + + + log4j + log4j + 1.2.14 + jar + + + + + org.apache.felix + maven-bundle-plugin + 1.4.3 + true + + src/main/resources/META-INF + + + ${pom.artifactId} + + <_removeheaders>Bnd-LastModified + + + + + bundle-manifest + process-classes + + manifest + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + false + + + + src/assembly/with-dependencies.xml + + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.codehaus.mojo + cobertura-maven-plugin + + + + + + + + javax.transaction + + com.springsource.javax.transaction + + 1.1.0 + + + javax.xml.stream + + com.springsource.javax.xml.stream + + 1.0.1 + + + javax.xml.soap + com.springsource.javax.xml.soap + 1.3.0 + + + com.sun.xml + + com.springsource.com.sun.xml.messaging.saaj + + runtime + 1.3.0 + + + javax.activation + + com.springsource.javax.activation + + 1.1.1 + runtime + - - junit - junit - 3.8.2 - - - org.dbunit - dbunit - 2.2.3 - - - junit-addons - junit-addons - - - poi - poi - - - - - log4j - log4j - 1.2.15 - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - javax.mail - mail - - - javax.jms - jms - - - - - commons-logging - commons-logging - 1.1.1 - - - org.hibernate - hibernate - 3.2.6.ga - - - net.sf.ehcache - ehcache - 1.4.1 - + + + org.junit + com.springsource.junit + 3.8.2 + + + org.dbunit + com.springsource.org.dbunit + 2.2.0 + + - - org.springframework - spring-context - ${version.spring} - - - org.springframework - spring-context-support - ${version.spring} - - - org.springframework - spring-orm - ${version.spring} - - - org.springframework - spring-jdbc - ${version.spring} - - - org.springframework - spring-webmvc - ${version.spring} - - - org.springframework - spring-aop - ${version.spring} - + + org.apache.log4j + + com.springsource.org.apache.log4j + + 1.2.15 + + + org.apache.commons + + com.springsource.org.apache.commons.logging + + 1.1.1 + + + org.slf4j + com.springsource.slf4j.org.apache.commons.logging + 1.5.3 + + + + org.springframework + org.springframework.core + ${version.spring} + + + org.springframework + org.springframework.context + ${version.spring} + + + org.springframework + + org.springframework.context.support + + ${version.spring} + + + org.springframework + org.springframework.orm + ${version.spring} + + + org.springframework + org.springframework.jdbc + ${version.spring} + + + org.springframework + org.springframework.web.servlet + ${version.spring} + + + org.springframework + org.springframework.aop + ${version.spring} + - - org.springframework.ws - spring-ws-core - ${version.spring-ws} - - - org.springframework.ws - spring-oxm - ${version.spring-ws} - + + org.springframework.ws + org.springframework.ws + ${version.spring-ws} + + + org.springframework.ws + org.springframework.oxm + ${version.spring-ws} + - - - org.apache.ant - ant - ${version.ant} - - - org.apache.ant - ant-commons-logging - ${version.ant} - - - org.apache.ant - ant-commons-net - ${version.ant} - - - org.apache.ant - ant-apache-oro - ${version.ant} - - - org.apache.ant - ant-apache-bsf - ${version.ant} - - - - commons-net - commons-net - 1.4.1 - - - oro - oro - 2.0.8 - + + + org.apache.ant + + com.springsource.org.apache.tools.ant + + 1.7.0 + + + org.apache.ant + + ant + + ${version.ant} + + + org.apache.ant + ant-commons-logging + ${version.ant} + + + org.apache.ant + ant-commons-net + ${version.ant} + + + org.apache.ant + ant-apache-oro + ${version.ant} + + + org.apache.ant + ant-apache-bsf + ${version.ant} + + + + commons-net + commons-net + 1.4.1 + + + oro + oro + 2.0.8 + - - commons-io - commons-io - 1.4 - - - commons-cli - commons-cli - 1.1 - + + org.apache.commons + + com.springsource.org.apache.commons.io + + 1.4.0 + + + commons-cli + commons-cli + 1.1 + - - - hsqldb - hsqldb - 1.8.0.9 - + + + org.hsqldb + com.springsource.org.hsqldb + 1.8.0.9 + - - org.codehaus.castor - castor - 1.2 - - - xerces - xerces - - - - - xerces - xercesImpl - 2.8.1 - + + org.codehaus.castor + com.springsource.org.castor + 1.2.0 + + + + + org.apache.xerces + + com.springsource.org.apache.xerces + + 2.8.1 + + + org.apache.xmlcommons + com.springsource.org.apache.xmlcommons + + + + + org.apache.xalan + + com.springsource.org.apache.xalan + + 2.7.0 + - - xalan - xalan - 2.7.0 - + + + javax.servlet + + com.springsource.javax.servlet.jsp.jstl + + 1.1.2 + + + org.apache.taglibs + + com.springsource.org.apache.taglibs.standard + + 1.1.2 + + + javax.servlet + com.springsource.javax.servlet + 2.5.0 + - - javax.xml.soap - saaj-api - 1.3 - runtime - - - javax.activation - activation - - - - - javax.xml.stream - stax-api - 1.0 - - - com.sun.xml.messaging.saaj - saaj-impl - 1.3 - runtime - - - javax.activation - activation - 1.1 - runtime - + + org.aspectj + + com.springsource.org.aspectj.weaver + + 1.6.2.RELEASE + + + com.lowagie.text + + com.springsource.com.lowagie.text + + 2.0.8 + - - javax.servlet - jstl - 1.1.2 - - - taglibs - standard - 1.1.2 - - - javax.servlet - servlet-api - 2.5 - - - org.apache.maven - maven-core - ${version.maven} - - - org.apache.maven - maven-embedder - - 2.0.4 - - - org.apache.maven - maven-settings - ${version.maven} - + + + org.apache.maven + maven-core + ${version.maven} + + + org.apache.maven + maven-embedder + + 2.0.4 + + + org.apache.maven + maven-settings + ${version.maven} + - - org.aspectj - aspectjweaver - 1.6.0 - + + + org.apache.felix + org.apache.felix.main + 1.2.1 + + + org.apache.felix + + org.apache.felix.framework + + + + - - net.sourceforge.jexcelapi - jxl - 2.6.8 - - - com.lowagie - itext - 2.1.2 - + + org.apache.felix + org.osgi.core + 1.2.0 + provided + - - - org.apache.felix - org.apache.felix.main - 1.2.1 - - - org.apache.felix - - org.apache.felix.framework - - - - + + + org.argeo.dep.jemmy + org.argeo.dep.jemmy.nb61 + 0.2.2 + - - org.apache.felix - org.osgi.core - 1.2.0 - provided - - - - - org.argeo.dep.jemmy - org.argeo.dep.jemmy.nb61 - 0.2.2 - - - - - - - central - http://www.argeo.org/maven/proxy - - true - daily - warn - - - false - never - fail - - - - argeo - http://www.argeo.org/maven/argeo - - true - daily - fail - - - false - never - fail - - - - argeo-snapshots - http://www.argeo.org/maven/argeo-snapshots - - false - never - fail - - - true - always - fail - - - - - - false - argeo-restricted - Argeo FOSS Repository - file:///var/argeo/maven2/argeo - - - true - argeo-snapshots-restricted - Argeo FOSS Snapshots Repository - file:///var/argeo/maven2/argeo-snapshots - - - argeo-slc-site - SLC Site - - file:///var/argeo/projects/SLC/www/site/${project.version} - - - - \ No newline at end of file + + + javax.transaction + + com.springsource.javax.transaction + + 1.1.0 + + + org.hibernate + com.springsource.org.hibernate + 3.2.6.ga + + + net.sourceforge.jexcelapi + com.springsource.jxl + 2.6.6 + + + net.sourceforge.ehcache + com.springsource.net.sf.ehcache + 1.4.1 + + + edu.emory.mathcs.backport + + com.springsource.edu.emory.mathcs.backport + + 3.1.0 + + + javax.wsdl + com.springsource.javax.wsdl + 1.6.1 + + + + + + central + http://repo1.maven.org/maven2 + + true + daily + warn + + + false + never + fail + + + + com.springsource.repository.bundles.release + + SpringSource Enterprise Bundle Repository - SpringSource + Bundle Releases + + + http://repository.springsource.com/maven/bundles/release + + + true + daily + fail + + + false + never + fail + + + + com.springsource.repository.bundles.external + + SpringSource Enterprise Bundle Repository - External + Bundle Releases + + + http://repository.springsource.com/maven/bundles/external + + + true + daily + fail + + + false + never + fail + + + + argeo + http://www.argeo.org/maven/argeo + + true + daily + fail + + + false + never + fail + + + + argeo-snapshots + http://www.argeo.org/maven/argeo-snapshots + + false + never + fail + + + true + always + fail + + + + + + false + argeo-restricted + Argeo FOSS Repository + file:///var/argeo/maven2/argeo + + + true + argeo-snapshots-restricted + Argeo FOSS Snapshots Repository + file:///var/argeo/maven2/argeo-snapshots + + + argeo-slc-site + SLC Site + + file:///var/argeo/projects/SLC/www/site/${project.version} + + + + diff --git a/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs b/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs index ed92a2c8d..d234cfbb5 100644 --- a/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs +++ b/sandbox/argeo.slc.jemmytest/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -#Sun Oct 12 08:45:48 CEST 2008 +#Sat Oct 18 13:51:44 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml index 56d872678..5422ea9c9 100644 --- a/sandbox/argeo.slc.jemmytest/pom.xml +++ b/sandbox/argeo.slc.jemmytest/pom.xml @@ -83,7 +83,7 @@ org.argeo.slc - argeo-slc-agent + org.argeo.slc.agent ${project.version} test @@ -91,7 +91,7 @@ org.springframework - spring-context + org.springframework.context @@ -103,12 +103,5 @@ org.argeo.dep.jemmy org.argeo.dep.jemmy.nb61 - - - junit - junit - test - - \ No newline at end of file diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF index 59270fef7..dbdc9e237 100644 --- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF +++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Manifest-Version: 1.0 -Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="org.argeo.slc.d - etached.ui,javax.swing,org.netbeans.jemmy,org.netbeans.jemmy.operator - s,org.argeo.slc.detached",org.argeo.slc.jemmytest;uses:="org.argeo.sl - c.detached",org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmyt - est.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.detached" +Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="javax.swing.tex + t,org.argeo.slc.detached.ui,javax.swing,org.netbeans.jemmy,org.netbea + ns.jemmy.operators,org.argeo.slc.detached",org.argeo.slc.jemmytest;us + es:="org.argeo.slc.detached",org.argeo.slc.jemmytest.steps;uses:="org + .argeo.slc.jemmytest.uiparts,org.argeo.slc.detached.ui,org.argeo.slc. + detached" Built-By: mbaudier Tool: Bnd-0.0.255 Bundle-Name: SLC Sandbox JemmyTest @@ -11,19 +12,20 @@ Created-By: Apache Maven Bundle Plugin Require-Bundle: org.argeo.slc.detached Bundle-Vendor: Argeo Build-Jdk: 1.6.0 -Bundle-Version: 0.11.1.SNAPSHOT +Bundle-Version: 0.11.2.SNAPSHOT Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution -Import-Package: javax.swing,org.argeo.slc.detached,org.argeo.slc.detac - hed.ui,org.argeo.slc.jemmytest,org.argeo.slc.jemmytest.steps,org.arge - o.slc.jemmytest.uiparts,org.netbeans.jemmy,org.netbeans.jemmy.operato - rs,org.springframework.beans.factory.xml;version="2.0.8" +Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached,or + g.argeo.slc.detached.ui,org.argeo.slc.jemmytest,org.argeo.slc.jemmyte + st.steps,org.argeo.slc.jemmytest.uiparts,org.netbeans.jemmy,org.netbe + ans.jemmy.operators,org.springframework.beans.factory.xml;version="2. + 0.8" Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest Bundle-DocURL: http://www.argeo.org -Include-Resource: META-INF/spring/slc-detached.xml=src/main/resources/ - META-INF/spring/slc-detached.xml,META-INF/MANIFEST.MF=src/main/resour - ces/META-INF/MANIFEST.MF +Include-Resource: META-INF/MANIFEST.MF=src/main/resources/META-INF/MAN + IFEST.MF,META-INF/spring/slc-detached.xml=src/main/resources/META-INF + /spring/slc-detached.xml Originally-Created-By: Apache Maven Bundle Plugin diff --git a/sandbox/argeo.slc.springtest/.classpath b/sandbox/argeo.slc.springtest/.classpath index e2956667f..98ab4292b 100644 --- a/sandbox/argeo.slc.springtest/.classpath +++ b/sandbox/argeo.slc.springtest/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + -- 2.39.2