Introduce P2 provisioning

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

diff --git a/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml
index c9f75145ebb46fae850dc811bb34fc4b079a5f34..478e6b8d7191e1af527e9094cd6d5eb255dc5073 100644 (file)
--- a/org.argeo.slc.agent/pom.xml
+++ b/org.argeo.slc.agent/pom.xml
@@ -110,37 +110,43 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.apache.ant</groupId>
-                       <artifactId>com.springsource.org.apache.tools.ant</artifactId>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.ant</artifactId>
                </dependency>
+
                <!--
                        <dependency> <groupId>org.apache.ant</groupId>
-                       <artifactId>ant</artifactId> </dependency>
-               -->
-               <dependency>
+                       <artifactId>com.springsource.org.apache.tools.ant</artifactId>
+                       </dependency> <dependency> <groupId>org.apache.ant</groupId>
+                       <artifactId>ant</artifactId> </dependency> <dependency>
                        <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-commons-logging</artifactId>
-               </dependency>
-               <dependency>
+                       <artifactId>ant-commons-logging</artifactId> </dependency>
+                       <dependency> <groupId>org.apache.ant</groupId>
+                       <artifactId>ant-commons-net</artifactId> </dependency> <dependency>
                        <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-commons-net</artifactId>
-               </dependency>
-               <dependency>
+                       <artifactId>ant-apache-oro</artifactId> </dependency> <dependency>
                        <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-apache-oro</artifactId>
+                       <artifactId>ant-apache-bsf</artifactId> </dependency>
+               -->
+
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.net</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.ant</groupId>
-                       <artifactId>ant-apache-bsf</artifactId>
+                       <groupId>org.apache.oro</groupId>
+                       <artifactId>com.springsource.org.apache.oro</artifactId>
                </dependency>
+
                <dependency>
-                       <groupId>commons-net</groupId>
-                       <artifactId>commons-net</artifactId>
+                       <groupId>org.apache.bsf</groupId>
+                       <artifactId>com.springsource.org.apache.bsf</artifactId>
                </dependency>
                <dependency>
-                       <groupId>oro</groupId>
-                       <artifactId>oro</artifactId>
+                       <groupId>org.beanshell</groupId>
+                       <artifactId>com.springsource.bsh</artifactId>
                </dependency>
+
                <!--
                        <dependency> <groupId>org.apache.maven</groupId>
                        <artifactId>maven-embedder</artifactId> </dependency> <dependency>
@@ -148,8 +154,8 @@
                        <artifactId>maven-settings</artifactId> </dependency>
                -->
                <dependency>
-                       <groupId>commons-cli</groupId>
-                       <artifactId>commons-cli</artifactId>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                </dependency>
 
        </dependencies>

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
index 9201ca28b70dc57b136145036b429369775181c6..4bc6b27e117fe59b0fd63399b783fcfe5945e531 100644 (file)
--- a/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.agent/src/main/resources/META-INF/MANIFEST.MF
@@ -21,12 +21,12 @@ Export-Package: org.argeo.slc.ws.client;uses:="org.springframework.ws.
  .ant.spring,org.argeo.slc.core,org.springframework.context,org.apache\r
  .tools.ant,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHO\r
  T",org.argeo.slc.ant.unit;uses:="org.argeo.slc.ant,junit.framework,or\r
- g.argeo.slc.unit,org.argeo.slc.cli,org.argeo.slc.runtime,org.springfr\r
+ g.argeo.slc.unit,org.argeo.slc.runtime,org.argeo.slc.cli,org.springfr\r
  amework.core.io,org.springframework.context,org.argeo.slc.core.proces\r
  s";version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy;uses:="org.arge\r
  o.slc.ant.spring,org.apache.commons.logging,org.argeo.slc.core,org.ar\r
- geo.slc.core.build,org.springframework.context,org.argeo.slc.ant.stru\r
- cture,org.argeo.slc.core.deploy,org.apache.tools.ant";version="0.11.2\r
+ geo.slc.core.build,org.springframework.context,org.argeo.slc.core.dep\r
+ loy,org.argeo.slc.ant.structure,org.apache.tools.ant";version="0.11.2\r
  .SNAPSHOT",org.argeo.slc.ant.spring;uses:="org.apache.commons.logging\r
  ,org.argeo.slc.core,org.springframework.beans,org.apache.tools.ant.ty\r
  pes,org.springframework.context,org.argeo.slc.core.process,org.apache\r
@@ -38,12 +38,12 @@ Export-Package: org.argeo.slc.ws.client;uses:="org.springframework.ws.
  .ant.util,org.apache.commons.io,org.argeo.slc.core.process,org.argeo.\r
  slc.core.structure.tree,org.springframework.beans.factory,org.apache.\r
  tools.ant.helper,org.springframework.util,org.springframework.core.io\r
- ,org.springframework.context,org.springframework.beans.factory.xml,or\r
- g.argeo.slc.logging,org.apache.tools.ant,org.argeo.slc.runtime";versi\r
+ ,org.springframework.context,org.argeo.slc.logging,org.springframewor\r
+ k.beans.factory.xml,org.apache.tools.ant,org.argeo.slc.runtime";versi\r
  on="0.11.2.SNAPSHOT",org.argeo.slc.lib.detached;uses:="org.springfram\r
  ework.oxm,org.apache.commons.logging,org.argeo.slc.detached.ui,org.sp\r
- ringframework.beans,org.springframework.beans.factory.config,org.arge\r
- o.slc.detached,org.argeo.slc.core.test,org.springframework.beans.fact\r
+ ringframework.beans,org.argeo.slc.detached,org.springframework.beans.\r
+ factory.config,org.argeo.slc.core.test,org.springframework.beans.fact\r
  ory.support,org.argeo.slc.core,org.argeo.slc.core.test.context,javax.\r
  xml.transform,org.argeo.slc.core.structure.tree,org.springframework.b\r
  eans.factory";version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses\r
@@ -73,49 +73,49 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: SLC Distribution\r
 Import-Package: javax.xml.namespace,javax.xml.transform,javax.xml.tran\r
  sform.dom,junit.framework;version="3.8",org.apache.commons.cli;resolu\r
- tion:=optional,org.apache.commons.io;version="1.4",org.apache.commons\r
- .logging;version="1.1",org.apache.log4j;version="1.2",org.apache.log4\r
- j.spi;version="1.2",org.apache.tools.ant;version="1.7",org.apache.too\r
- ls.ant.helper;version="1.7",org.apache.tools.ant.types;version="1.7",\r
- org.apache.tools.ant.util;version="1.7",org.argeo.slc.ant;version="0.\r
- 11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2.SNAPSHOT",org\r
- .argeo.slc.ant.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.s\r
- pring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.structure;version="\r
- 0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.11.2.SNAPSHOT",org\r
- .argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;versi\r
- on="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",org\r
- .argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.de\r
- ploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;version="0.\r
- 11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT"\r
- ,org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.con\r
- text;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version\r
- ="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPS\r
- HOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,org.argeo.slc.l\r
- ib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="\r
- 0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SNAPSHOT",org.ar\r
- geo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.\r
- tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;version="0.11.2.\r
- SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT",org.argeo.sl\r
- c.support.deploy.ant;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ver\r
- sion="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version="0.11.2.SNAPSH\r
- OT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAPSHOT",org.arge\r
- o.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree\r
- ;version="0.11.2.SNAPSHOT",org.springframework.beans;version="2.5",or\r
- g.springframework.beans.factory;version="2.5",org.springframework.bea\r
- ns.factory.config;version="2.5",org.springframework.beans.factory.sup\r
- port;version="2.5",org.springframework.beans.factory.xml;version="2.5\r
- ",org.springframework.context;version="2.5.6.A",org.springframework.c\r
- ontext.support;version="2.5.6.A",org.springframework.core.io;version=\r
- "2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframewo\r
- rk.util;version="2.5.6.A",org.springframework.ws;version="1.5.5.A",or\r
- g.springframework.ws.client;version="1.5.5.A",org.springframework.ws.\r
- client.core;version="1.5.5.A",org.springframework.ws.client.support.i\r
- nterceptor;version="1.5.5.A",org.springframework.ws.context;version="\r
- 1.5.5.A",org.springframework.ws.soap;version="1.5.5.A",org.springfram\r
- ework.ws.soap.client;version="1.5.5.A",org.springframework.xml.transf\r
- orm;version="1.5.5.A",org.springframework.xml.validation;version="1.5\r
- .5.A",org.w3c.dom,org.xml.sax\r
+ tion:=optional;version="1.1",org.apache.commons.io;version="1.4",org.\r
+ apache.commons.logging;version="1.1",org.apache.log4j;version="1.2",o\r
+ rg.apache.log4j.spi;version="1.2",org.apache.tools.ant;version="1.7",\r
+ org.apache.tools.ant.helper;version="1.7",org.apache.tools.ant.types;\r
+ version="1.7",org.apache.tools.ant.util;version="1.7",org.argeo.slc.a\r
+ nt;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.ant.detached;version="0.11.2.SNAPSHOT",org.a\r
+ rgeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.struc\r
+ ture;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.argeo\r
+ .slc.cli;version="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2\r
+ .SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arg\r
+ eo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proce\r
+ ss;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.\r
+ 11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAP\r
+ SHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc\r
+ .core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.\r
+ spring;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;version\r
+ ="0.11.2.SNAPSHOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,o\r
+ rg.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.log\r
+ ging;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SN\r
+ APSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo\r
+ .slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;ve\r
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT\r
+ ",org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPSHOT",org.arge\r
+ o.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version=\r
+ "0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAP\r
+ SHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.sl\r
+ c.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.beans;ve\r
+ rsion="2.5.6.A",org.springframework.beans.factory;version="2.5.6.A",o\r
+ rg.springframework.beans.factory.config;version="2.5.6.A",org.springf\r
+ ramework.beans.factory.support;version="2.5.6.A",org.springframework.\r
+ beans.factory.xml;version="2.5.6.A",org.springframework.context;versi\r
+ on="2.5.6.A",org.springframework.context.support;version="2.5.6.A",or\r
+ g.springframework.core.io;version="2.5.6.A",org.springframework.oxm;v\r
+ ersion="1.5.5.A",org.springframework.util;version="2.5.6.A",org.sprin\r
+ gframework.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.s\r
+ pringframework.ws.client.support.interceptor;version="1.5.5.A",org.sp\r
+ ringframework.ws.context;version="1.5.5.A",org.springframework.ws.soa\r
+ p;version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5\r
+ .A",org.springframework.xml.transform;version="1.5.5.A",org.springfra\r
+ mework.xml.validation;version="1.5.5.A",org.w3c.dom,org.xml.sax\r
 Bundle-SymbolicName: org.argeo.slc.agent\r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r

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
index c433cbc5e51d29cc2dc7d57e6161835f2a5a6fb4..fe1d575dad3ba114ba39b6b5be19fec3cb30bc67 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Export-Package: org.argeo.slc.castor.process;version="0.11.2.SNAPSHOT"
  PSHOT",org.argeo.slc.castor.test.tree;uses:="org.exolab.castor.mappin\r
  g,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo.slc.co\r
  re.test.context;uses:="org.argeo.slc.core.structure,org.apache.common\r
- s.logging,org.argeo.slc.core,org.argeo.slc.core.test,org.argeo.slc.co\r
- re.structure.tree,org.springframework.beans.factory";version="0.11.2.\r
+ s.logging,org.argeo.slc.core,org.argeo.slc.core.structure.tree,org.ar\r
+ geo.slc.core.test,org.springframework.beans.factory";version="0.11.2.\r
  SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arge\r
  o.slc.core.process;uses:="org.springframework.oxm,org.argeo.slc.core,\r
  javax.xml.transform,javax.xml.transform.stream,org.apache.commons.io"\r

diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml
index 8e5497ed0f7500547d1ceddf57095a3945872d0d..8f0d2e93801093dfb76f6aae6a2637affd745a0e 100644 (file)
--- a/org.argeo.slc.dist/pom.xml
+++ b/org.argeo.slc.dist/pom.xml
@@ -50,6 +50,11 @@
                        <artifactId>org.argeo.slc.agent</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.server</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
 
                <!--  Additional SLC dependencies -->
                <dependency>
@@ -73,6 +78,36 @@
                        <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
                </dependency>
 
+               <!--
+                       Artifacts below are required for consistency of the P2 repository
+               -->
+
+               <!-- Required by SOAP and Web Services -->
+               <dependency>
+                       <groupId>javax.activation</groupId>
+                       <artifactId>com.springsource.javax.activation</artifactId>
+               </dependency>
+               <!-- Required by Xerces -->
+               <dependency>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+               </dependency>
+               <!-- Required by DB unit -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.collections</artifactId>
+               </dependency>
+               <!-- Required by JSP -->
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.el</groupId>
+                       <artifactId>com.springsource.javax.el</artifactId>
+               </dependency>
+
+
                <!--
                        Additional Third Parties <dependency>
                        <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId>

diff --git a/org.argeo.slc.dist/provision.sh b/org.argeo.slc.dist/provision.sh
index 357fa92abf93cb8c342c712838be46b29c206012..46066e8f8765297ada7d93af2b10635a4d0bfc28 100644 (file)
--- a/org.argeo.slc.dist/provision.sh
+++ b/org.argeo.slc.dist/provision.sh
@@ -1,3 +1,18 @@
 #!/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
+ECLIPSE_BASE=/home/mbaudier/lib64/eclipse-3.4
+$ECLIPSE_BASE/eclipse \
+       -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+       -source ./target/p2Repository/  \
+       -metadataRepository file:/home/mbaudier/dev/work/p2Tests/repository  \
+       -metadataRepositoryName "Argeo SLC Update Site"  \
+       -artifactRepository file:/home/mbaudier/dev/work/p2Tests/repository \
+       -artifactRepositoryName "Argeo SLC Artifacts" \
+       -publishArtifacts \
+       -publishArtifactRepository \
+       -root org.argeo.slc.runtime \
+       -rootVersion 0.11.2.SNAPSHOT \
+       -noDefaultIUs  \
+       -noSplash \
+       -vmargs \
+       -Xmx256m

diff --git a/org.argeo.slc.dist/src/assembly/dist.xml b/org.argeo.slc.dist/src/assembly/dist.xml
index 42d32c727f98138f1944a941e4d20fc784acdc48..5c214f858ffa690d622156d355fcddaae4607ebd 100644 (file)
--- a/org.argeo.slc.dist/src/assembly/dist.xml
+++ b/org.argeo.slc.dist/src/assembly/dist.xml
@@ -19,7 +19,7 @@
             <outputFileNameMapping></outputFileNameMapping>\r
             <includes>\r
                 <include>\r
-                    org.argeo.slc:argeo-slc-agent:tar.gz:base\r
+                    org.argeo.slc:org.argeo.slc.agent:tar.gz:base\r
                 </include>\r
             </includes>\r
             <fileMode>0755</fileMode>\r

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
index eab95e40245b071b008e4d853cf4fdf2eb59db03..15101937a8af0ec42ca5acc1bc2cac5acf787daa 100644 (file)
--- a/org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.hibernate/src/main/resources/META-INF/MANIFEST.MF
@@ -16,8 +16,8 @@ Export-Package: org.argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT
  ate.tool.hbm2ddl,org.dbunit.dataset.xml,org.dbunit.database,org.dbuni\r
  t,org.apache.commons.io,org.springframework.orm.hibernate3";version="\r
  0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test;uses:="org.argeo.slc.da\r
- o.test,org.springframework.orm.hibernate3.support,org.argeo.slc.core.\r
- test,org.springframework.orm.hibernate3";version="0.11.2.SNAPSHOT"\r
+ o.test,org.springframework.orm.hibernate3.support,org.springframework\r
+ .orm.hibernate3,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT"\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: Argeo SLC Hibernate\r
 Created-By: 1.6.0 (Sun Microsystems Inc.)\r

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
index 97181d6853d8682c4fecaf070fab58b0b1a55834..cea55c92a8c4779df28292b1cb4bb295edece5f0 100644 (file)
--- a/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.argeo.slc.web.mvc;uses:="org.springframework.oxm,o
  w.xslt,javax.xml.transform.stream,org.argeo.slc.core.process";version\r
  ="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="org.springframewor\r
  k.ws.server.endpoint,org.apache.commons.logging,org.argeo.slc.core,or\r
- g.argeo.slc.core.process,org.argeo.slc.dao.process,org.argeo.slc.msg.\r
+ g.argeo.slc.core.process,org.argeo.slc.msg.process,org.argeo.slc.dao.\r
  process";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;uses\r
  :="org.springframework.web.servlet.mvc,org.apache.commons.logging,org\r
  .argeo.slc.core,org.springframework.web.servlet,org.argeo.slc.core.pr\r
@@ -16,7 +16,7 @@ Export-Package: org.argeo.slc.web.mvc;uses:="org.springframework.oxm,o
  ervlet.mvc,org.springframework.web.servlet,javax.servlet.http";versio\r
  n="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;uses:="org.springframe\r
  work.ws.server.endpoint,org.apache.commons.logging,org.argeo.slc.msg.\r
- test.tree,org.argeo.slc.services.test,org.argeo.slc.core.test.tree,or\r
+ test.tree,org.argeo.slc.core.test.tree,org.argeo.slc.services.test,or\r
  g.argeo.slc.dao.test.tree,org.argeo.slc.core.structure.tree,org.argeo\r
  .slc.core.test";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.resul\r
  t;uses:="org.springframework.web.servlet,com.lowagie.text.pdf,org.arg\r
@@ -28,8 +28,8 @@ Export-Package: org.argeo.slc.web.mvc;uses:="org.springframework.oxm,o
  cture.tree,javax.servlet.http";version="0.11.2.SNAPSHOT",org.argeo.sl\r
  c.services.test.impl;uses:="org.argeo.slc.dao.test,org.apache.commons\r
  .logging,org.argeo.slc.services.test,org.argeo.slc.core.test.tree,org\r
- .argeo.slc.core.process,org.argeo.slc.dao.test.tree,org.argeo.slc.dao\r
- .process,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo\r
+ .argeo.slc.core.process,org.argeo.slc.dao.process,org.argeo.slc.dao.t\r
+ est.tree,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo\r
  .slc.services.test;uses:="org.argeo.slc.core.test";version="0.11.2.SN\r
  APSHOT",org.argeo.slc.ws;uses:="org.apache.commons.logging,org.spring\r
  framework.ws.soap,org.springframework.ws.soap.server.endpoint,org.spr\r

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 9e831f351561140763a1387bc6e43649c4124b97..e93c0b54c70c1de90554dcc15091be492583a588 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -14,7 +14,7 @@
                <version.spring>2.5.6.A</version.spring>
                <version.spring-ws>1.5.5.A</version.spring-ws>
                <version.maven>2.0.9</version.maven>
-               <version.ant>1.7.1</version.ant>
+               <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.11</version.jetty>
        </properties>
        <scm>
@@ -248,23 +248,8 @@
                                <artifactId>com.springsource.org.dbunit</artifactId>
                                <version>2.2.0</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.dbunit</groupId>
-                               <artifactId>dbunit</artifactId> <version>2.2.3</version>
-                               <exclusions> <exclusion> <groupId>junit-addons</groupId>
-                               <artifactId>junit-addons</artifactId> </exclusion> <exclusion>
-                               <groupId>poi</groupId> <artifactId>poi</artifactId> </exclusion>
-                               </exclusions> </dependency> <dependency> <groupId>log4j</groupId>
-                               <artifactId>log4j</artifactId> <version>1.2.15</version>
-                               <exclusions> <exclusion> <groupId>com.sun.jmx</groupId>
-                               <artifactId>jmxri</artifactId> </exclusion> <exclusion>
-                               <groupId>com.sun.jdmk</groupId> <artifactId>jmxtools</artifactId>
-                               </exclusion> <exclusion> <groupId>javax.mail</groupId>
-                               <artifactId>mail</artifactId> </exclusion> <exclusion>
-                               <groupId>javax.jms</groupId> <artifactId>jms</artifactId>
-                               </exclusion> </exclusions> </dependency>
-                       -->
 
+                       <!-- Logging -->
                        <dependency>
                                <groupId>org.apache.log4j</groupId>
                                <artifactId>
@@ -284,12 +269,18 @@
                                <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
                                <version>1.5.3</version>
                        </dependency>
+
                        <!-- Spring -->
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.core</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>org.springframework.beans</artifactId>
+                               <version>${version.spring}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.context</artifactId>
@@ -312,6 +303,11 @@
                                <artifactId>org.springframework.jdbc</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework</groupId>
+                               <artifactId>org.springframework.web</artifactId>
+                               <version>${version.spring}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.springframework</groupId>
                                <artifactId>org.springframework.web.servlet</artifactId>
@@ -336,51 +332,67 @@
 
                        <!-- Ant -->
                        <dependency>
-                               <groupId>org.apache.ant</groupId>
-                               <artifactId>
-                                       com.springsource.org.apache.tools.ant
-                               </artifactId>
-                               <version>1.7.0</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.ant</groupId>
-                               <artifactId>
-                                       ant
-                               </artifactId>
-                               <version>${version.ant}</version>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.ant</artifactId>
+                               <version>1.7.1</version>
                        </dependency>
-                       <dependency>
+                       <!--
+                               <dependency> <groupId>org.apache.ant</groupId> <artifactId>
+                               com.springsource.org.apache.tools.ant </artifactId>
+                               <version>1.7.0</version> </dependency> <dependency>
                                <groupId>org.apache.ant</groupId>
                                <artifactId>ant-commons-logging</artifactId>
-                               <version>${version.ant}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.ant</groupId>
+                               <version>${version.ant}</version> <exclusions> <exclusion>
+                               <groupId>commons-logging</groupId>
+                               <artifactId>commons-logging</artifactId> </exclusion> <exclusion>
+                               <groupId>commons-logging</groupId>
+                               <artifactId>commons-logging-api</artifactId> </exclusion>
+                               <exclusion> <groupId>org.apache.ant</groupId>
+                               <artifactId>ant</artifactId> </exclusion> </exclusions>
+                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
                                <artifactId>ant-commons-net</artifactId>
-                               <version>${version.ant}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.ant</groupId>
+                               <version>${version.ant}</version> <exclusions> <exclusion>
+                               <groupId>commons-net</groupId> <artifactId>commons-net</artifactId>
+                               </exclusion> <exclusion> <groupId>org.apache.ant</groupId>
+                               <artifactId>ant</artifactId> </exclusion> </exclusions>
+                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
                                <artifactId>ant-apache-oro</artifactId>
-                               <version>${version.ant}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.ant</groupId>
+                               <version>${version.ant}</version> <exclusions> <exclusion>
+                               <groupId>oro</groupId> <artifactId>oro</artifactId> </exclusion>
+                               <exclusion> <groupId>org.apache.ant</groupId>
+                               <artifactId>ant</artifactId> </exclusion> </exclusions>
+                               </dependency> <dependency> <groupId>org.apache.ant</groupId>
                                <artifactId>ant-apache-bsf</artifactId>
-                               <version>${version.ant}</version>
-                       </dependency>
-                       <!-- Required by FTP Ant task -->
+                               <version>${version.ant}</version> <exclusions> <exclusion>
+                               <groupId>bsf</groupId> <artifactId>bsf</artifactId> </exclusion>
+                               <exclusion> <groupId>org.apache.ant</groupId>
+                               <artifactId>ant</artifactId> </exclusion> </exclusions>
+                               </dependency>
+                       -->
+
+                       <!-- Required by specific Ant tasks -->
                        <dependency>
-                               <groupId>commons-net</groupId>
-                               <artifactId>commons-net</artifactId>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.net</artifactId>
                                <version>1.4.1</version>
                        </dependency>
                        <dependency>
-                               <groupId>oro</groupId>
-                               <artifactId>oro</artifactId>
+                               <groupId>org.apache.oro</groupId>
+                               <artifactId>com.springsource.org.apache.oro</artifactId>
                                <version>2.0.8</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.apache.bsf</groupId>
+                               <artifactId>com.springsource.org.apache.bsf</artifactId>
+                               <version>2.4.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.beanshell</groupId>
+                               <artifactId>com.springsource.bsh</artifactId>
+                               <version>2.0.0.b4</version>
+                       </dependency>
 
+                       <!-- Apache Commons -->
                        <dependency>
                                <groupId>org.apache.commons</groupId>
                                <artifactId>
@@ -389,8 +401,13 @@
                                <version>1.4.0</version>
                        </dependency>
                        <dependency>
-                               <groupId>commons-cli</groupId>
-                               <artifactId>commons-cli</artifactId>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.collections</artifactId>
+                               <version>3.2.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                                <version>1.1</version>
                        </dependency>
 
@@ -406,18 +423,6 @@
                                <artifactId>com.springsource.org.castor</artifactId>
                                <version>1.2.0</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.argeo.dep.osgi</groupId>
-                               <artifactId>org.argeo.dep.osgi.castor</artifactId>
-                               <version>1.2</version> </dependency>
-                       -->
-                       <!--
-                               <dependency> <groupId>org.codehaus.castor</groupId>
-                               <artifactId>castor</artifactId> <version>1.2</version> <exclusions>
-                               <exclusion> <groupId>xerces</groupId>
-                               <artifactId>xerces</artifactId> </exclusion> </exclusions>
-                               </dependency>
-                       -->
                        <dependency>
                                <groupId>org.apache.xerces</groupId>
                                <artifactId>
@@ -438,8 +443,28 @@
                                </artifactId>
                                <version>2.7.0</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.apache.xmlcommons</groupId>
+                               <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                               <version>1.3.3</version>
+                       </dependency>
 
                        <!-- Web -->
+                       <dependency>
+                               <groupId>javax.servlet</groupId>
+                               <artifactId>com.springsource.javax.servlet</artifactId>
+                               <version>2.5.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.servlet</groupId>
+                               <artifactId>com.springsource.javax.servlet.jsp</artifactId>
+                               <version>2.1.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.el</groupId>
+                               <artifactId>com.springsource.javax.el</artifactId>
+                               <version>1.0.0</version> 
+                       </dependency>
                        <dependency>
                                <groupId>javax.servlet</groupId>
                                <artifactId>
@@ -455,9 +480,9 @@
                                <version>1.1.2</version>
                        </dependency>
                        <dependency>
-                               <groupId>javax.servlet</groupId>
-                               <artifactId>com.springsource.javax.servlet</artifactId>
-                               <version>2.5.0</version>
+                               <groupId>javax.activation</groupId>
+                               <artifactId>com.springsource.javax.activation</artifactId>
+                               <version>1.1.1</version>
                        </dependency>
 
                        <dependency>