From 7a047ccee1387ff0c6fdd05948e152bdf7babdf9 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Jun 2011 18:54:01 +0000
Subject: [PATCH 1/1] SLC RAP working with UI admin

git-svn-id: https://svn.argeo.org/slc/trunk@4607 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.agent/pom.xml           |  8 +--
 dep/org.argeo.slc.dep.backend/pom.xml         | 71 +++++++++----------
 dep/org.argeo.slc.dep.sdk.rap/pom.xml         | 25 ++++++-
 dep/org.argeo.slc.dep.sdk.rcp/pom.xml         | 19 -----
 dep/org.argeo.slc.dep.server/pom.xml          | 24 +++++++
 .../plugins/org.argeo.slc.client.rap/pom.xml  | 14 ++++
 .../plugins/org.argeo.slc.client.rcp/pom.xml  | 70 +++++++++---------
 .../META-INF/MANIFEST.MF                      |  1 -
 .../plugins/org.argeo.slc.client.ui/pom.xml   | 20 +++---
 .../client/ui/views/ExecutionModulesView.java | 17 +++--
 .../client/ui/views/ProcessBuilderView.java   | 11 ++-
 runtime/org.argeo.slc.launcher/pom.xml        |  1 +
 runtime/org.argeo.slc.server/pom.xml          |  5 ++
 .../org.argeo.slc.support.activemq/pom.xml    |  8 +--
 runtime/org.argeo.slc.support.maven/pom.xml   |  5 ++
 15 files changed, 172 insertions(+), 127 deletions(-)

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 60efad658..1fc280639 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -140,10 +140,10 @@
 			<artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
 		</dependency>
 		<!-- Required by the Oracle JDBC driver -->
-		<dependency>
-			<groupId>javax.resource</groupId>
-			<artifactId>com.springsource.javax.resource</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>javax.resource</groupId> -->
+<!-- 			<artifactId>com.springsource.javax.resource</artifactId> -->
+<!-- 		</dependency> -->
 
 		<!-- Jacob (will be removed soon) -->
 		<dependency>
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 4608ce19c..565848515 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -22,42 +22,53 @@
 	<dependencies>
 		<!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
 			by Spring-LDAP while Apache Directory takes 2.1.0 -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.apache.commons</groupId> -->
+<!-- 			<artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
+<!-- 			<version>2.4.0</version> -->
+<!-- 		</dependency> -->
+
+		<!-- SLC Agent -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
-			<version>2.4.0</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.core</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.agent</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.ant</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.detached</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.jcr</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+
+		<!-- SLC Agent Modules -->
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
-		<!-- Provided -->
 		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.agent.jcr</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
+
+		<!-- SLC Server -->
 		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc.dep</groupId> -->
-		<!-- <artifactId>org.argeo.slc.dep.gis</artifactId> -->
-		<!-- <version>${version.slc}</version> -->
-		<!-- </dependency> -->
 
 		<!-- SLC -->
 		<dependency>
@@ -65,11 +76,6 @@
 			<artifactId>org.argeo.slc.server</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.hibernate</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
@@ -86,13 +92,6 @@
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- SLC non deps -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-
 		<!-- Modules (see profiles below) -->
 
 		<!-- Launcher -->
diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
index 080d58b24..8e51ca443 100644
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -36,10 +36,29 @@
 			<artifactId>org.argeo.security.dep.node.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<exclusions>
+<!-- 				<exclusion> -->
+<!-- 					<groupId>org.argeo.commons.security</groupId> -->
+<!-- 					<artifactId>org.argeo.security.ui.admin</artifactId> -->
+<!-- 				</exclusion> -->
+
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>org.mortbay.jetty.server</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>org.mortbay.jetty.server.util</artifactId>
+				</exclusion>
 				<exclusion>
-					<groupId>org.argeo.commons.security</groupId>
-					<artifactId>org.argeo.security.ui.admin</artifactId>
+					<groupId>org.eclipse.equinox</groupId>
+					<artifactId>org.eclipse.equinox.http.jetty</artifactId>
 				</exclusion>
+
+				<exclusion>
+					<groupId>org.argeo.slc.runtime</groupId>
+					<artifactId>org.argeo.slc.support.castor</artifactId>
+				</exclusion>
+
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -50,7 +69,7 @@
 		<!-- Back-end Dependencies -->
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<artifactId>org.argeo.slc.dep.backend</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
 
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
index bf9604f73..536eb6f25 100644
--- a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
@@ -54,23 +54,4 @@
 			<version>${version.slc}</version>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>sdkWithModules</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.slc.eclipse</groupId>
-					<artifactId>org.argeo.slc.eclipse.modules.bundles</artifactId>
-					<version>${version.slc}</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>sdkWithoutModules</id>
-		</profile>
-	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 7f55f58e2..c59c89cc8 100644
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -19,6 +19,30 @@
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.hibernate</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- SLC non deps -->
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+
+
+		<!-- Provided -->
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.stream</groupId>
+			<artifactId>com.springsource.javax.xml.stream</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.argeo.slc.server</groupId>
 			<artifactId>org.argeo.slc.ria</artifactId>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
index a2b40fc93..de9dfecb7 100644
--- a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
@@ -24,6 +24,20 @@
 			<groupId>org.argeo.commons.eclipse</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 			<version>${version.argeo-commons}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>org.mortbay.jetty.server</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>org.mortbay.jetty.server.util</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.eclipse.equinox</groupId>
+					<artifactId>org.eclipse.equinox.http.jetty</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Argeo common distribution for Secured UI -->
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
index bd8d7ee20..f025ba72d 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -36,21 +36,21 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.agent</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.hibernate</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.oxm</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.eclipse</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.agent</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.eclipse</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.hibernate</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.eclipse</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.oxm</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.argeo.slc.modules</groupId>
@@ -62,26 +62,26 @@
 			<artifactId>org.argeo.slc.agent</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.castor</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.h2</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.hibernate</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.services</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.modules</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.server.castor</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.modules</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.server.h2</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.modules</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.server.hibernate</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.modules</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.server.services</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
 
 		<!-- Security UI -->
 		<dependency>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
index 9fe6f8f6e..4c36c0118 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -27,7 +27,6 @@ Import-Package: javax.jcr;version="2.0.0",
  org.argeo.jcr.spring,
  org.argeo.slc,
  org.argeo.slc.build,
- org.argeo.slc.client.oxm,
  org.argeo.slc.client.ui,
  org.argeo.slc.core.attachment,
  org.argeo.slc.core.execution,
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
index 1003ec754..b98038455 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
@@ -14,16 +14,16 @@
 
 	<dependencies>
 		<!-- SLC Client UI -->
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.oxm</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.eclipse</groupId>
-			<artifactId>org.argeo.slc.client.core</artifactId>
-			<version>${version.slc}</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.eclipse</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.oxm</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.slc.eclipse</groupId> -->
+<!-- 			<artifactId>org.argeo.slc.client.core</artifactId> -->
+<!-- 			<version>${version.slc}</version> -->
+<!-- 		</dependency> -->
 
 		<!-- SLC -->
 		<dependency>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
index ae28c63f2..008b65545 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
@@ -11,7 +11,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.oxm.OxmInterface;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider;
@@ -48,7 +47,7 @@ public class ExecutionModulesView extends ViewPart {
 
 	// Ioc
 	private IContentProvider contentProvider;
-	private OxmInterface oxmBean;
+	//private OxmInterface oxmBean;
 	private ProcessController processController;
 
 	public void createPartControl(Composite parent) {
@@ -196,10 +195,10 @@ public class ExecutionModulesView extends ViewPart {
 			realizedFlow.setExecutionSpec(fn.getExecutionFlowDescriptor()
 					.getExecutionSpec());
 
-			props.setProperty("RealizedFlowAsXml",
-					oxmBean.marshal(realizedFlow));
-			System.out
-					.println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
+//			props.setProperty("RealizedFlowAsXml",
+//					oxmBean.marshal(realizedFlow));
+//			System.out
+//					.println(oxmBean.marshal(fn.getExecutionFlowDescriptor()));
 
 		}
 
@@ -214,8 +213,8 @@ public class ExecutionModulesView extends ViewPart {
 		this.processController = processController;
 	}
 
-	public void setOxmBean(OxmInterface oxmBean) {
-		this.oxmBean = oxmBean;
-	}
+//	public void setOxmBean(OxmInterface oxmBean) {
+//		this.oxmBean = oxmBean;
+//	}
 
 }
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
index e8f6a66bf..c293cb38b 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
@@ -9,7 +9,6 @@ import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.oxm.OxmInterface;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.process.RealizedFlow;
@@ -61,7 +60,7 @@ public class ProcessBuilderView extends ViewPart {
 	private int curSelectedRow = -1;
 
 	// IoC
-	private OxmInterface oxmBean;
+	//private OxmInterface oxmBean;
 	private ProcessController processController;
 	private List<SlcAgent> slcAgents;
 
@@ -271,7 +270,7 @@ public class ProcessBuilderView extends ViewPart {
 			String fdXml = props.getProperty("RealizedFlowAsXml");
 			if (fdXml == null)
 				return false;
-			RealizedFlow rf = (RealizedFlow) oxmBean.unmarshal(fdXml);
+			RealizedFlow rf = null;//(RealizedFlow) oxmBean.unmarshal(fdXml);
 			realizedFlows.add(rf);
 			curSelectedRow = realizedFlows.indexOf(rf);
 			refreshParameterview();
@@ -291,9 +290,9 @@ public class ProcessBuilderView extends ViewPart {
 		this.slcAgents = slcAgents;
 	}
 
-	public void setOxmBean(OxmInterface oxmBean) {
-		this.oxmBean = oxmBean;
-	}
+//	public void setOxmBean(OxmInterface oxmBean) {
+//		this.oxmBean = oxmBean;
+//	}
 
 	public void setProcessController(ProcessController processController) {
 		this.processController = processController;
diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 2e989c2b2..d2d8cadc6 100644
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -96,6 +96,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>org.springframework.oxm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 	</dependencies>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 6b21b89c5..d83de4513 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -29,6 +29,8 @@
 							org.springframework.context.support,
 							org.tmatesoft.svn.*;resolution:=optional,
 							com.lowagie.*;resolution:=optional,
+							com.springsource.json.*;resolution:=optional,
+							org.springframework.oxm.*;resolution:=optional,
 							*
 						</Import-Package>
 					</instructions>
@@ -63,6 +65,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>org.springframework.oxm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Web -->
@@ -99,10 +102,12 @@
 			<groupId>com.springsource.json</groupId>
 			<artifactId>com.springsource.json</artifactId>
 			<version>1.0.1.RELEASE</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>com.springsource.org.antlr</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- SVN -->
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 395238490..61575c335 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -65,10 +65,10 @@
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.dep.osgi</groupId> -->
+<!-- 			<artifactId>org.argeo.dep.osgi.activemq.optional</artifactId> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 3d3dab348..011481a05 100644
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -223,5 +223,10 @@
 			<artifactId>org.argeo.dep.osgi.aether</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.junit</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
-- 
2.39.2