Author: dwoods
Date: Wed Feb 24 03:51:16 2010
New Revision: 915655
URL: http://svn.apache.org/viewvc?rev=915655&view=rev
Log:
move activemq modules to a new jms plugin group and update
persistence plugin to require framework for minimal servers
Added:
geronimo/server/trunk/plugingroups/jms/
geronimo/server/trunk/plugingroups/jms/pom.xml (with props)
geronimo/server/trunk/plugingroups/jms/src/
geronimo/server/trunk/plugingroups/jms/src/main/
geronimo/server/trunk/plugingroups/jms/src/main/history/
geronimo/server/trunk/plugingroups/jms/src/main/history/
dependencies.xml (with props)
Modified:
geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/
dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/
history/dependencies.xml
geronimo/server/trunk/plugingroups/persistence/pom.xml
geronimo/server/trunk/plugingroups/persistence/src/main/history/
dependencies.xml
geronimo/server/trunk/plugingroups/pom.xml
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
(original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml Wed Feb
24 03:51:16 2010
@@ -81,6 +81,13 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>jms</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-axis2</artifactId>
<version>${version}</version>
<type>car</type>
@@ -123,13 +130,6 @@
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugins.monitoring</
groupId>-->
<!--<artifactId>agent-car-ejb</artifactId>-->
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/
history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/
history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/
history/dependencies.xml Wed Feb 24 03:51:16 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-ra</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
<type>car</type>
</dependency>
@@ -43,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>jms</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-axis2</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
(original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml Wed
Feb 24 03:51:16 2010
@@ -81,6 +81,13 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>jms</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-axis2</artifactId>
<version>${version}</version>
<type>car</type>
@@ -122,13 +129,6 @@
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugins.monitoring</
groupId>-->
<!--<artifactId>agent-car-ejb</artifactId>-->
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/
history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/
history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/
history/dependencies.xml Wed Feb 24 03:51:16 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-ra</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
<type>car</type>
</dependency>
@@ -43,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>jms</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>webservices-axis2</artifactId>
<type>car</type>
</dependency>
Added: geronimo/server/trunk/plugingroups/jms/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/jms/pom.xml?rev=915655&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/jms/pom.xml (added)
+++ geronimo/server/trunk/plugingroups/jms/pom.xml Wed Feb 24
03:51:16 2010
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- @version $Rev: 822566 $ $Date: 2009-10-06 23:00:55 -0400 (Tue,
06 Oct 2009) $ -->
+
+<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.apache.geronimo.plugingroups</groupId>
+ <artifactId>plugingroups</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jms</artifactId>
+ <packaging>car</packaging>
+ <name>Geronimo Plugin Group :: JMS (ActiveMQ)</name>
+
+ <description>
+ This plugin group provides JMS functionality.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework.plugingroups</
groupId>
+ <artifactId>framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>activemq-broker-blueprint</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <category>Geronimo Plugin Group</category>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/plugingroups/jms/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/plugingroups/jms/src/main/history/
dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/jms/src/main/history/dependencies.xml?rev=915655&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/jms/src/main/history/
dependencies.xml (added)
+++ geronimo/server/trunk/plugingroups/jms/src/main/history/
dependencies.xml Wed Feb 24 03:51:16 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2
" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugingroups</groupId>
+ <artifactId>jms</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>activemq-broker-blueprint</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+ <artifactId>framework</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/server/trunk/plugingroups/jms/src/main/history/
dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Wed Feb
24 03:51:16 2010
@@ -39,12 +39,17 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.framework.plugingroups</
groupId>
+ <artifactId>framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>persistence-jpa20-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openjpa2</artifactId>
Modified: geronimo/server/trunk/plugingroups/persistence/src/main/
history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/src/main/history/dependencies.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/persistence/src/main/history/
dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/src/main/history/
dependencies.xml Wed Feb 24 03:51:16 2010
@@ -7,6 +7,11 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+ <artifactId>framework</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openjpa2</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=915655&r1=915654&r2=915655&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Wed Feb 24 03:51:16
2010
@@ -34,6 +34,7 @@
<!--<module>clustering-jetty</module>-->
<!--<module>clustering-tomcat</module>-->
<!--<module>ejb</module>-->
+ <module>jms</module>
<module>javaee6-jetty</module>
<module>javaee6-tomcat</module>
<module>persistence</module>