From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 16 Nov 2008 17:00:21 +0000 (+0000)
Subject: Introduce P2 provisioning
X-Git-Tag: argeo-slc-2.1.7~2425
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=71e99443c33cd109d5dfa4c17acbb84ee73c2908;p=gpl%2Fargeo-slc.git

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 c9f75145e..478e6b8d7 100644
--- 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 9201ca28b..4bc6b27e1 100644
--- 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
  .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
+ g.argeo.slc.unit,org.argeo.slc.runtime,org.argeo.slc.cli,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
+ geo.slc.core.build,org.springframework.context,org.argeo.slc.core.dep
+ loy,org.argeo.slc.ant.structure,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
@@ -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.
  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
+ ,org.springframework.context,org.argeo.slc.logging,org.springframewor
+ k.beans.factory.xml,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
+ ringframework.beans,org.argeo.slc.detached,org.springframework.beans.
+ factory.config,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
@@ -73,49 +73,49 @@ 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
+ tion:=optional;version="1.1",org.apache.commons.io;version="1.4",org.
+ apache.commons.logging;version="1.1",org.apache.log4j;version="1.2",o
+ rg.apache.log4j.spi;version="1.2",org.apache.tools.ant;version="1.7",
+ org.apache.tools.ant.helper;version="1.7",org.apache.tools.ant.types;
+ version="1.7",org.apache.tools.ant.util;version="1.7",org.argeo.slc.a
+ nt;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.a
+ rgeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.struc
+ ture;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;version="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2
+ .SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.arg
+ eo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proce
+ ss;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.SNAP
+ SHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc
+ .core.test.context;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.SNAPSHOT",org.argeo.slc.detached,org.argeo.slc.detached.ui,o
+ rg.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.log
+ ging;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SN
+ APSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.argeo
+ .slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;ve
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSHOT
+ ",org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPSHOT",org.arge
+ o.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.client;version=
+ "0.11.2.SNAPSHOT",org.argeo.slc.ws.client.spring;version="0.11.2.SNAP
+ SHOT",org.argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.sl
+ c.ws.test.tree;version="0.11.2.SNAPSHOT",org.springframework.beans;ve
+ rsion="2.5.6.A",org.springframework.beans.factory;version="2.5.6.A",o
+ rg.springframework.beans.factory.config;version="2.5.6.A",org.springf
+ ramework.beans.factory.support;version="2.5.6.A",org.springframework.
+ beans.factory.xml;version="2.5.6.A",org.springframework.context;versi
+ on="2.5.6.A",org.springframework.context.support;version="2.5.6.A",or
+ g.springframework.core.io;version="2.5.6.A",org.springframework.oxm;v
+ ersion="1.5.5.A",org.springframework.util;version="2.5.6.A",org.sprin
+ gframework.ws;version="1.5.5.A",org.springframework.ws.client;version
+ ="1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.s
+ pringframework.ws.client.support.interceptor;version="1.5.5.A",org.sp
+ ringframework.ws.context;version="1.5.5.A",org.springframework.ws.soa
+ p;version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5
+ .A",org.springframework.xml.transform;version="1.5.5.A",org.springfra
+ mework.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/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.core/src/main/resources/META-INF/MANIFEST.MF
index c433cbc5e..fe1d575da 100644
--- 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
  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.
+ s.logging,org.argeo.slc.core,org.argeo.slc.core.structure.tree,org.ar
+ geo.slc.core.test,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"
diff --git a/org.argeo.slc.dist/pom.xml b/org.argeo.slc.dist/pom.xml
index 8e5497ed0..8f0d2e938 100644
--- 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 357fa92ab..46066e8f8 100644
--- 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 42d32c727..5c214f858 100644
--- a/org.argeo.slc.dist/src/assembly/dist.xml
+++ b/org.argeo.slc.dist/src/assembly/dist.xml
@@ -19,7 +19,7 @@
             <outputFileNameMapping></outputFileNameMapping>
             <includes>
                 <include>
-                    org.argeo.slc:argeo-slc-agent:tar.gz:base
+                    org.argeo.slc:org.argeo.slc.agent:tar.gz:base
                 </include>
             </includes>
             <fileMode>0755</fileMode>
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 eab95e402..15101937a 100644
--- 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
  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"
+ o.test,org.springframework.orm.hibernate3.support,org.springframework
+ .orm.hibernate3,org.argeo.slc.core.test";version="0.11.2.SNAPSHOT"
 Tool: Bnd-0.0.255
 Bundle-Name: Argeo SLC Hibernate
 Created-By: 1.6.0 (Sun Microsystems Inc.)
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 97181d685..cea55c92a 100644
--- 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
  ="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.
+ g.argeo.slc.core.process,org.argeo.slc.msg.process,org.argeo.slc.dao.
  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
@@ -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
  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
+ test.tree,org.argeo.slc.core.test.tree,org.argeo.slc.services.test,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
@@ -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
  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
+ .argeo.slc.core.process,org.argeo.slc.dao.process,org.argeo.slc.dao.t
+ est.tree,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
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 9e831f351..e93c0b54c 100644
--- 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>