From 1d53ae914bd86da8ba63fd8518ea61dd5214b02b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 14 Mar 2009 11:44:40 +0000
Subject: [PATCH] Simplify setup

git-svn-id: https://svn.argeo.org/slc/trunk@2265 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      |  4 -
 .../META-INF/slc/dep/manager.maven            | 57 -------------
 .../META-INF/spring/manager.xml               | 25 ------
 demo/site/org.argeo.slc.demo.deploy/pom.xml   | 23 ++++--
 org.argeo.slc/pom.xml                         | 74 +++++++++--------
 runtime/org.argeo.slc.server/pom.xml          | 20 +++--
 .../org.argeo.slc.support.activemq/pom.xml    | 81 +++----------------
 .../META-INF/MANIFEST.MF                      |  2 +-
 server/org.argeo.slc.siteserver/pom.xml       | 62 +++++---------
 9 files changed, 103 insertions(+), 245 deletions(-)
 delete mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
 delete mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
 delete mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml

diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
deleted file mode 100644
index f41bdfba5..000000000
--- a/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-SymbolicName: org.argeo.slc.demo.deploy
-Bundle-Version: 1.0.0
-Require-Bundle: org.springframework.beans;bundle-version="2.5.6"
-Bundle-ManifestVersion: 2
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
deleted file mode 100644
index 8315df7f5..000000000
--- a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
+++ /dev/null
@@ -1,57 +0,0 @@
-
-The following files have been resolved:
-   com.thoughtworks.xstream:com.springsource.com.thoughtworks.xstream:jar:1.2.2:compile
-   javax.activation:com.springsource.javax.activation:jar:1.1.1:compile
-   javax.ejb:com.springsource.javax.ejb:jar:3.0.0:compile
-   javax.jms:com.springsource.javax.jms:jar:1.1.0:compile
-   javax.servlet:com.springsource.javax.servlet:jar:2.5.0:compile
-   javax.xml.rpc:com.springsource.javax.xml.rpc:jar:1.1.0:compile
-   javax.xml.soap:com.springsource.javax.xml.soap:jar:1.3.0:compile
-   javax.xml.stream:com.springsource.javax.xml.stream:jar:1.0.1:compile
-   net.sourceforge.cglib:com.springsource.net.sf.cglib:jar:2.1.3:compile
-   org.aopalliance:com.springsource.org.aopalliance:jar:1.0.0:compile
-   org.apache.bcel:com.springsource.org.apache.bcel:jar:5.1.0:compile
-   org.apache.camel:com.springsource.org.apache.camel:jar:1.3.0:compile
-   org.apache.commons:com.springsource.org.apache.commons.collections:jar:3.2.0:compile
-   org.apache.commons:com.springsource.org.apache.commons.io:jar:1.4.0:compile
-   org.apache.commons:com.springsource.org.apache.commons.lang:jar:2.1.0:compile
-   org.apache.commons:com.springsource.org.apache.commons.logging:jar:1.1.1:compile
-   org.apache.geronimo.specs:com.springsource.javax.management.j2ee:jar:1.0.1:compile
-   org.apache.log4j:com.springsource.org.apache.log4j:jar:1.2.15:compile
-   org.apache.regexp:com.springsource.org.apache.regexp:jar:1.5.0:compile
-   org.apache.ws:com.springsource.org.apache.ws.commons.schema:jar:1.3.2:compile
-   org.apache.xalan:com.springsource.org.apache.xalan:jar:2.7.0:compile
-   org.apache.xerces:com.springsource.org.apache.xerces:jar:2.8.1:compile
-   org.apache.xml:com.springsource.org.apache.xml.resolver:jar:1.2.0:compile
-   org.apache.xmlcommons:com.springsource.org.apache.xmlcommons:jar:1.3.3:compile
-   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.3:compile
-   org.argeo.slc:org.argeo.slc.detached.launcher:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.demo:org.argeo.slc.demo.basic:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.demo:org.argeo.slc.demo.log4j:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.specs:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.support.activemq:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.support.castor:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.support.equinox:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.support.maven:jar:0.11.3-SNAPSHOT:compile
-   org.argeo.slc.runtime:org.argeo.slc.support.simple:jar:0.11.3-SNAPSHOT:compile
-   org.aspectj:com.springsource.org.aspectj.runtime:jar:1.6.2.RELEASE:compile
-   org.aspectj:com.springsource.org.aspectj.weaver:jar:1.6.2.RELEASE:compile
-   org.codehaus.castor:com.springsource.org.castor:jar:1.2.0:compile
-   org.dbunit:com.springsource.org.dbunit:jar:2.2.0:compile
-   org.eclipse.osgi:org.eclipse.osgi:jar:3.4.2.R34x_v20080826-1230:compile
-   org.junit:com.springsource.junit:jar:3.8.2:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:1.5.3:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:1.5.3:compile
-   org.springframework:org.springframework.aop:jar:2.5.6.A:compile
-   org.springframework:org.springframework.beans:jar:2.5.6.A:compile
-   org.springframework:org.springframework.context:jar:2.5.6.A:compile
-   org.springframework:org.springframework.core:jar:2.5.6.A:compile
-   org.springframework:org.springframework.jms:jar:2.5.6.A:compile
-   org.springframework:org.springframework.transaction:jar:2.5.6.A:compile
-   org.springframework.osgi:org.springframework.osgi.core:jar:1.1.3.RELEASE:compile
-   org.springframework.osgi:org.springframework.osgi.extender:jar:1.1.3.RELEASE:compile
-   org.springframework.osgi:org.springframework.osgi.io:jar:1.1.3.RELEASE:compile
-   org.springframework.ws:org.springframework.oxm:jar:1.5.5.A:compile
-   org.springframework.ws:org.springframework.xml:jar:1.5.5.A:compile
-   org.xmlpull:com.springsource.org.xmlpull:jar:1.1.3.4-O:compile
-
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml b/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml
deleted file mode 100644
index 5a3b94a67..000000000
--- a/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">
-		<property name="urlsToInstall">
-			<bean class="org.argeo.slc.maven.MavenToUrl">
-				<property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />
-				<property name="mavenFiles">
-					<bean class="org.argeo.slc.maven.DependencyFileLoader">
-						<property name="dependenciesResource"
-							value="classpath:/META-INF/slc/dep/manager.maven" />
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/pom.xml b/demo/site/org.argeo.slc.demo.deploy/pom.xml
index 72284c240..e6a30ccf0 100644
--- a/demo/site/org.argeo.slc.demo.deploy/pom.xml
+++ b/demo/site/org.argeo.slc.demo.deploy/pom.xml
@@ -11,7 +11,12 @@
 	<artifactId>org.argeo.slc.demo.deploy</artifactId>
 	<name>Argeo SLC Demo Deploy</name>
 	<packaging>pom</packaging>
-	<properties></properties>
+	<properties>
+		<bundlesToStart>
+			org.springframework.osgi.extender,
+			org.argeo.slc.demo.basic
+		</bundlesToStart>
+	</properties>
 	<build>
 		<defaultGoal>antrun:run</defaultGoal>
 		<plugins>
@@ -54,8 +59,7 @@
 						<pathconvert dirsep="/" property="slc.osgi.locations"
 							refid="slc.osgi.locations.raw" />
 
-						<property name="slc.osgi.start"
-							value="org.springframework.osgi.extender,org.argeo.slc.demo.basic" />
+						<property name="slc.osgi.start" value="${bundlesToStart}" />
 						<ant antfile="target/equinox/osgiboot.xml" />
 
 					</tasks>
@@ -67,17 +71,20 @@
 	<profiles>
 		<profile>
 			<id>agent</id>
+			<properties>
+				<bundlesToStart>
+					org.springframework.osgi.extender,
+					org.argeo.slc.demo.basic,
+					org.argeo.slc.demo.manager,
+					org.argeo.slc.demo.agent
+				</bundlesToStart>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.demo</groupId>
 					<artifactId>org.argeo.slc.demo.agent</artifactId>
 					<version>${project.version}</version>
 				</dependency>
-				<dependency>
-					<groupId>com.thoughtworks.xstream</groupId>
-					<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-					<version>1.2.2</version>
-				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 7b1198156..eebf65153 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -16,9 +16,10 @@
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.14</version.jetty>
+		<version.tomcat>6.0.18</version.tomcat>
 		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
-		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-		<!-- <version.activemq>5.2.0</version.activemq> -->
+		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+		<version.activemq>5.2.0.0005</version.activemq>
 	</properties>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -171,7 +172,6 @@ limitations under the License.
 							<artifactId>com.springsource.javax.mail</artifactId>
 							<version>1.4.1</version>
 						</dependency>
-
 						<!--
 							Required by ActiveMQ admin <dependency>
 							<groupId>org.springframework</groupId>
@@ -539,6 +539,11 @@ limitations under the License.
 				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 				<version>1.6.2.RELEASE</version>
 			</dependency>
+			<dependency>
+				<groupId>org.aopalliance</groupId>
+				<artifactId>com.springsource.org.aopalliance</artifactId>
+				<version>1.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.cglib</groupId>
 				<artifactId>com.springsource.net.sf.cglib</artifactId>
@@ -683,7 +688,17 @@ limitations under the License.
 			<dependency>
 				<groupId>org.apache.catalina</groupId>
 				<artifactId>com.springsource.org.apache.catalina</artifactId>
-				<version>6.0.18</version>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.jasper</groupId>
+				<artifactId>com.springsource.org.apache.jasper</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.el</groupId>
+				<artifactId>com.springsource.org.apache.el</artifactId>
+				<version>${version.tomcat}</version>
 			</dependency>
 
 			<!-- Maven -->
@@ -712,16 +727,6 @@ limitations under the License.
 			</dependency>
 
 			<!-- OSGi -->
-			<!--
-				<dependency> <groupId>org.apache.felix</groupId>
-				<artifactId>org.apache.felix.main</artifactId>
-				<version>1.2.1</version> <exclusions> <exclusion>
-				<groupId>org.apache.felix</groupId> <artifactId>
-				org.apache.felix.framework </artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.felix</groupId>
-				<artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
-				<scope>provided</scope> </dependency>
-			-->
 			<dependency>
 				<groupId>org.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
@@ -785,28 +790,31 @@ limitations under the License.
 			</dependency>
 
 			<!-- ActiveMQ -->
-			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq</artifactId>
-				<version>${version.activemq}</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-				<version>${version.activemq}</version> </dependency> <dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
-				<version>${version.activemq}</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.apache.xbean</groupId>
-				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-				<version>3.3.0</version> </dependency>
-			-->
 			<dependency>
 				<groupId>org.argeo.dep.osgi</groupId>
 				<artifactId>org.argeo.dep.osgi.activemq</artifactId>
-				<version>5.2.0.argeo.3</version>
+				<version>${version.activemq}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+				<version>${version.activemq}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.xml.soap</groupId>
+				<artifactId>com.springsource.javax.xml.soap</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.rpc</groupId>
+				<artifactId>com.springsource.javax.xml.rpc</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>com.springsource.javax.ejb</artifactId>
+				<version>3.0.0</version>
 			</dependency>
 
 			<dependency>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 4e2fcf708..f69f8bd35 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -105,18 +105,28 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.wsdl</groupId>
 			<artifactId>com.springsource.javax.wsdl</artifactId>
 		</dependency>
 
-		<!-- ActiveMQ
 		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-		</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>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
+		</dependency>
 
 		<!-- Various -->
 		<dependency>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 870829059..5260893db 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -37,41 +37,9 @@
 						<Export-Package>
 							org.argeo.slc.jms.*,org.argeo.slc.activemq
 						</Export-Package>
-						<!-- 
-						<Import-Package>*,
-							org.springframework.beans.factory.xml,
-							org.apache.xbean.spring.context.v2,
-							com.thoughtworks.qdox;resolution:=optional,
-							com.thoughtworks.qdox.model;resolution:=optional,
-							org.apache.tools.ant;resolution:=optional,
-							org.apache.tools.ant.taskdefs;resolution:=optional,
-							org.apache.tools.ant.types;resolution:=optional
-						</Import-Package>
-						<Fragment-Host>com.springsource.org.apache.activemq</Fragment-Host>
-						<Embed-Dependency>com.springsource.org.apache.xbean.spring</Embed-Dependency>
-						 -->
 					</instructions>
 				</configuration>
 			</plugin>
-			<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeArtifactIds>com.springsource.org.apache.xbean.spring</includeArtifactIds>
-							<outputDirectory>${project.build.directory}/classes</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
- -->
 		</plugins>
 	</build>
 	<dependencies>
@@ -100,64 +68,35 @@
 			<groupId>javax.jms</groupId>
 			<artifactId>com.springsource.javax.jms</artifactId>
 		</dependency>
+
+		<!-- ActiveMQ -->
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>com.springsource.javax.management.j2ee</artifactId>
 		</dependency>
-
-		<!-- ActiveMQ
 		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>com.springsource.org.apache.activemq</artifactId>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-			
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
-		 -->
-		 
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
-		</dependency>
-		<!--
-			<dependency> <groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-pool</artifactId> </dependency> <dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-optional</artifactId> </dependency>
-		-->
-		
-				<dependency>
 			<groupId>javax.ejb</groupId>
 			<artifactId>com.springsource.javax.ejb</artifactId>
-			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.rpc</groupId>
 			<artifactId>com.springsource.javax.xml.rpc</artifactId>
-			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
 			<artifactId>com.springsource.javax.xml.soap</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>com.springsource.org.apache.camel</artifactId>
-		</dependency>
-
-		
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index 005eb6793..93999bc5c 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -42,6 +42,6 @@ Require-Bundle: org.argeo.slc.server,
  com.springsource.org.hsqldb,
  com.springsource.org.hibernate,
  org.argeo.dep.osgi.activemq,
- com.springsource.org.apache.camel,
+ org.argeo.dep.osgi.activemq.web,
  com.springsource.org.mortbay.util
  
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index be172aaa2..5d859019e 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -125,9 +125,24 @@
 		<dependency>
 			<groupId>org.aopalliance</groupId>
 			<artifactId>com.springsource.org.aopalliance</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
+		</dependency>
 		<!--
 			Using springsource repo -->
 		<dependency>
@@ -148,37 +163,17 @@
 			<groupId>org.apache.catalina</groupId>
 			<artifactId>com.springsource.org.apache.catalina</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.jasper</groupId>
 			<artifactId>com.springsource.org.apache.jasper</artifactId>
-			<version>6.0.18</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.el</groupId>
 			<artifactId>com.springsource.org.apache.el</artifactId>
-			<version>6.0.18</version>
-		</dependency>
-
-		<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>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.taglibs</groupId>
-			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
+			<groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 
 
@@ -193,25 +188,10 @@
 				</artifactId>
 		</dependency>
 
-		<!-- Required in JDK 1.5 -->
-		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>
-				com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
-		</dependency>
-
-		<!-- For ActiveMQ Ajax -->
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>com.springsource.org.mortbay.util</artifactId>
-			<version>6.1.9</version>
-		</dependency>
-
+		<!-- For ActiveMQ Web -->
 		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-			<version>1.2.2</version>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
 		</dependency>
 
 		<!-- For demo -->
-- 
2.39.2