X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fpom.xml;h=bf3abe580d6026384b059c6277aa7ce1ed7afb17;hb=0757e6ae5c3ae9cec09dc2d04242dc9af3dee189;hp=97da097ad6c2ca014f786304a50b4fed51402095;hpb=1b19cac6a92c31d9119fc2986e7aaf3df98b2393;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 97da097ad..bf3abe580 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -1,15 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<artifactId>runtime</artifactId>
+		<version>0.12.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
 	<artifactId>org.argeo.slc.support.activemq</artifactId>
-	<name>Argeo SLC Support ActiveMQ</name>
+	<name>SLC Support ActiveMQ</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -37,48 +36,16 @@
 						<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>
 		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<artifactId>org.argeo.slc.core</artifactId>
 		</dependency>
 
 		<!-- Spring -->
@@ -100,52 +67,59 @@
 			<groupId>javax.jms</groupId>
 			<artifactId>com.springsource.javax.jms</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>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.apache.xbean</groupId>
-			<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
 		</dependency>
-		<!--
-			<dependency> <groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-pool</artifactId> </dependency> <dependency>
+		 -->
+		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-optional</artifactId> </dependency>
-		-->
-		
-				<dependency>
+			<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.pool</artifactId>
+		</dependency>
+
+		<!-- JEE required by ActiveMQ Core-->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>com.springsource.javax.management.j2ee</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>
+			<groupId>javax.transaction</groupId>
+			<artifactId>com.springsource.javax.transaction</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
-
-		
 	</dependencies>
 </project>
\ No newline at end of file