From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 19 Mar 2010 15:52:16 +0000 (+0000)
Subject: Add activeMQ broker
X-Git-Tag: argeo-commons-2.1.30~1637
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=ae5d3bfff1c2b7abd8c1a16a0435aa07a55acd08;p=lgpl%2Fargeo-commons.git

Add activeMQ broker
Convert basic to PDE

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

diff --git a/basic/runtime/pom.xml b/basic/runtime/pom.xml
index 964853e5f..24e8f2df3 100644
--- a/basic/runtime/pom.xml
+++ b/basic/runtime/pom.xml
@@ -15,4 +15,73 @@
 		<module>org.argeo.basic.nodeps</module>
 		<module>org.argeo.support.junit</module>
 	</modules>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<manifestLocation>META-INF</manifestLocation>
+					<instructions>
+						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+						<_removeheaders>Bnd-LastModified</_removeheaders>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index aa809c39e..a51cf4322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@ limitations under the License.
 		<module>osgi</module>
 		<module>server</module>
 		<module>security</module>
+		<module>sandbox</module>
 	</modules>
 	<build>
 		<pluginManagement>
diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
index cad12b869..0d374e966 100644
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
@@ -8,6 +8,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.sandbox.jackrabbit</artifactId>
+	<name>Sandbox Jackrabbit</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -19,6 +20,7 @@
 					<bundlesPomArtifactId>org.argeo.server.demo</bundlesPomArtifactId>
 					<execDir>target/exec</execDir>
 					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
+					<failOnUnresolved>false</failOnUnresolved>
 					<argsToAppend>
 						<arg>-clean</arg>
 					</argsToAppend>
@@ -82,8 +84,15 @@
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.tomcat</artifactId>
 			<version>${project.version}</version>
+			<scope>test</scope>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
new file mode 100644
index 000000000..35d655579
--- /dev/null
+++ b/server/dep/org.argeo.server.dep.activemq/pom.xml
@@ -0,0 +1,51 @@
+<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.commons.server</groupId>
+		<version>0.1.3-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.server.dep.activemq</artifactId>
+	<packaging>pom</packaging>
+	<name>Dep Apache Active MQ</name>
+	<dependencies>
+		<!--  Commons Dep -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.dep.log4j</artifactId>
+			<version>0.1.3-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+
+		<!-- JMS / ActiveMQ -->
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>com.springsource.javax.jms</artifactId>
+		</dependency>
+		<dependency>
+			<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.activemq</groupId>
+			<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.pool</artifactId>
+		</dependency>
+
+		<!-- Required by ActiveMQ bundles -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.net</artifactId>
+		</dependency>
+
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index 22a1797f9..fd2ccb81d 100644
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -16,5 +16,6 @@
 		<module>org.argeo.server.dep.ads</module>
 		<module>org.argeo.server.dep.hibernate</module>
 		<module>org.argeo.server.dep.jackrabbit.server</module>
+		<module>org.argeo.server.dep.activemq</module>
 	</modules>
 </project>
\ No newline at end of file