You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/02/20 03:11:03 UTC
svn commit: r746112 - in /geronimo/server/trunk: ./ assemblies/
assemblies/geronimo-boilerplate/ assemblies/geronimo-framework/
buildsupport/ framework/ framework/assemblies/
framework/assemblies/geronimo-boilerplate/
framework/assemblies/geronimo-boil...
Author: djencks
Date: Fri Feb 20 02:11:01 2009
New Revision: 746112
URL: http://svn.apache.org/viewvc?rev=746112&view=rev
Log:
GERONIMO-4538 Move stuff around so framework is self contained and builds the framework server. No groupId changes in this revision in case people dont like this change
Added:
geronimo/server/trunk/framework/assemblies/
geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/
- copied from r745309, geronimo/server/trunk/assemblies/geronimo-boilerplate/
geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/pom.xml
- copied, changed from r746084, geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/src/
- copied from r746084, geronimo/server/trunk/assemblies/geronimo-boilerplate/src/
geronimo/server/trunk/framework/assemblies/geronimo-framework/
- copied from r745309, geronimo/server/trunk/assemblies/geronimo-framework/
geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml
- copied, changed from r746084, geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/framework/assemblies/pom.xml
- copied, changed from r745309, geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/framework/buildsupport/
- copied from r745309, geronimo/server/trunk/buildsupport/
geronimo/server/trunk/framework/buildsupport/buildsupport-maven-plugin/
- copied from r746084, geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/
- copied from r746084, geronimo/server/trunk/buildsupport/car-maven-plugin/
geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/
- copied from r746084, geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/
geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/
- copied from r746084, geronimo/server/trunk/buildsupport/geronimo-maven-plugin/
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/
- copied from r746084, geronimo/server/trunk/buildsupport/geronimo-plugin-archetype/
geronimo/server/trunk/framework/buildsupport/pom.xml
- copied, changed from r746084, geronimo/server/trunk/buildsupport/pom.xml
geronimo/server/trunk/framework/buildsupport/src/
- copied from r746084, geronimo/server/trunk/buildsupport/src/
geronimo/server/trunk/framework/buildsupport/testsuite-maven-plugin/
- copied from r746084, geronimo/server/trunk/buildsupport/testsuite-maven-plugin/
geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/
- copied from r745309, geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/
geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
- copied unchanged from r746084, geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/src/
- copied from r746084, geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/src/
geronimo/server/trunk/framework/modules/testsupport-common/
- copied from r746056, geronimo/server/trunk/testsupport/testsupport-common/
geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
- copied, changed from r746084, geronimo/server/trunk/testsupport/testsupport-common/pom.xml
geronimo/server/trunk/framework/modules/testsupport-common/src/
- copied from r746084, geronimo/server/trunk/testsupport/testsupport-common/src/
geronimo/server/trunk/framework/plugingroups/
geronimo/server/trunk/framework/plugingroups/framework/
geronimo/server/trunk/framework/plugingroups/framework/pom.xml (with props)
geronimo/server/trunk/framework/plugingroups/framework/src/
geronimo/server/trunk/framework/plugingroups/framework/src/main/
geronimo/server/trunk/framework/plugingroups/framework/src/main/history/
geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml (with props)
geronimo/server/trunk/framework/plugingroups/framework/src/main/resources/
geronimo/server/trunk/framework/plugingroups/pom.xml (with props)
Removed:
geronimo/server/trunk/assemblies/geronimo-boilerplate/
geronimo/server/trunk/assemblies/geronimo-framework/
geronimo/server/trunk/buildsupport/
geronimo/server/trunk/plugingroups/framework/
geronimo/server/trunk/plugins/classloaders/geronimo-javaee-deployment_1.1MR3_spec/
geronimo/server/trunk/testsupport/testsupport-common/
Modified:
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/framework/configs/pom.xml
geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml
geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/framework/modules/pom.xml
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/plugingroups/pom.xml
geronimo/server/trunk/plugins/classloaders/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsupport/pom.xml
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Fri Feb 20 02:11:01 2009
@@ -39,8 +39,6 @@
</properties>
<modules>
- <module>geronimo-boilerplate</module>
- <module>geronimo-framework</module>
<module>geronimo-jetty6-minimal</module>
<module>geronimo-jetty6-javaee5</module>
<module>geronimo-tomcat6-minimal</module>
Copied: geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/pom.xml (from r746084, geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/pom.xml?p2=geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/pom.xml&p1=geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml&r1=746084&r2=746112&rev=746112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-boilerplate/pom.xml Fri Feb 20 02:11:01 2009
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.assemblies</groupId>
+ <groupId>org.apache.geronimo.framework.assemblies</groupId>
<artifactId>assemblies</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
Copied: geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml (from r746084, geronimo/server/trunk/assemblies/geronimo-framework/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml?p2=geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml&p1=geronimo/server/trunk/assemblies/geronimo-framework/pom.xml&r1=746084&r2=746112&rev=746112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/geronimo-framework/pom.xml Fri Feb 20 02:11:01 2009
@@ -23,11 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.assemblies</groupId>
+ <groupId>org.apache.geronimo.framework.assemblies</groupId>
<artifactId>assemblies</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-framework</artifactId>
<name>Geronimo Assemblies :: Framework</name>
<packaging>server-assembly</packaging>
Copied: geronimo/server/trunk/framework/assemblies/pom.xml (from r745309, geronimo/server/trunk/assemblies/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/pom.xml?p2=geronimo/server/trunk/framework/assemblies/pom.xml&p1=geronimo/server/trunk/assemblies/pom.xml&r1=745309&r2=746112&rev=746112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/pom.xml Fri Feb 20 02:11:01 2009
@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.assemblies</groupId>
+ <groupId>org.apache.geronimo.framework.assemblies</groupId>
<artifactId>assemblies</artifactId>
<name>Geronimo Assemblies</name>
<packaging>pom</packaging>
@@ -41,10 +41,6 @@
<modules>
<module>geronimo-boilerplate</module>
<module>geronimo-framework</module>
- <module>geronimo-jetty6-minimal</module>
- <module>geronimo-jetty6-javaee5</module>
- <module>geronimo-tomcat6-minimal</module>
- <module>geronimo-tomcat6-javaee5</module>
</modules>
<build>
Copied: geronimo/server/trunk/framework/buildsupport/pom.xml (from r746084, geronimo/server/trunk/buildsupport/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/pom.xml?p2=geronimo/server/trunk/framework/buildsupport/pom.xml&p1=geronimo/server/trunk/buildsupport/pom.xml&r1=746084&r2=746112&rev=746112&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/pom.xml Fri Feb 20 02:11:01 2009
@@ -23,8 +23,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>framework</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Fri Feb 20 02:11:01 2009
@@ -55,6 +55,7 @@
<module>gshell-remote</module>
<module>gshell-geronimo</module>
<module>jmx-security</module>
+ <module>geronimo-javaee-deployment_1.1MR3_spec</module>
</modules>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Fri Feb 20 02:11:01 2009
@@ -42,6 +42,12 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-config-groovy-transformer/pom.xml Fri Feb 20 02:11:01 2009
@@ -42,6 +42,12 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all-minimal</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml Fri Feb 20 02:11:01 2009
@@ -31,5 +31,13 @@
<artifactId>geronimo-crypto</artifactId>
<name>Geronimo Framework, Modules :: Crypto</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Fri Feb 20 02:11:01 2009
@@ -61,6 +61,12 @@
<!--<groupId>xpp3</groupId>-->
<!--<artifactId>xpp3_min</artifactId>-->
<!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Fri Feb 20 02:11:01 2009
@@ -69,6 +69,12 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Fri Feb 20 02:11:01 2009
@@ -107,6 +107,12 @@
<version>1.0-SNAPSHOT</version>
</dependency>
-->
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Fri Feb 20 02:11:01 2009
@@ -61,6 +61,12 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Feb 20 02:11:01 2009
@@ -116,6 +116,12 @@
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Feb 20 02:11:01 2009
@@ -46,31 +46,78 @@
</dependencies>
<modules>
- <module>geronimo-logging</module>
- <module>geronimo-cli</module>
- <module>geronimo-commands</module>
+ <module>testsupport-common</module>
<module>geronimo-common</module>
- <module>geronimo-core</module>
- <module>geronimo-deploy-config</module>
- <module>geronimo-deploy-jsr88</module>
- <module>geronimo-deploy-jsr88-bootstrapper</module>
- <module>geronimo-deploy-tool</module>
- <module>geronimo-deployment</module>
- <module>geronimo-interceptor</module>
- <!--<module>geronimo-j2ee</module>-->
- <module>geronimo-jdbc</module>
- <module>geronimo-jmx-remoting</module>
- <module>geronimo-kernel</module>
- <module>geronimo-config-groovy-transformer</module>
- <module>geronimo-management</module>
- <module>geronimo-naming</module>
- <module>geronimo-security</module>
- <module>geronimo-service-builder</module>
<module>geronimo-system</module>
- <module>geronimo-transformer</module>
- <module>geronimo-upgrade</module>
- <module>geronimo-crypto</module>
+ <module>geronimo-logging</module>
+ <module>geronimo-kernel</module>
<module>geronimo-plugin</module>
+ <module>geronimo-deploy-tool</module>
</modules>
-
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <!-- needed for car-maven-plugin -->
+ <module>testsupport-common</module>
+ <module>geronimo-common</module>
+ <module>geronimo-system</module>
+ <module>geronimo-logging</module>
+ <module>geronimo-kernel</module>
+ <module>geronimo-plugin</module>
+ <module>geronimo-deploy-tool</module>
+ <module>geronimo-cli</module>
+ <module>geronimo-crypto</module>
+ <module>geronimo-service-builder</module>
+ <module>geronimo-deploy-jsr88</module>
+ <module>geronimo-deployment</module>
+ <module>geronimo-deploy-config</module>
+
+ <!-- not needed for car-maven-plugin -->
+ <module>geronimo-commands</module>
+ <module>geronimo-core</module>
+ <module>geronimo-deploy-jsr88-bootstrapper</module>
+ <module>geronimo-interceptor</module>
+ <!--<module>geronimo-j2ee</module>-->
+ <module>geronimo-jdbc</module>
+ <module>geronimo-jmx-remoting</module>
+ <module>geronimo-config-groovy-transformer</module>
+ <module>geronimo-management</module>
+ <module>geronimo-naming</module>
+ <module>geronimo-security</module>
+ <module>geronimo-transformer</module>
+ <module>geronimo-upgrade</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>stage-bootstrap</id>
+
+ <activation>
+ <property>
+ <name>stage</name>
+ <value>bootstrap</value>
+ </property>
+ </activation>
+
+ <modules>
+ <module>testsupport-common</module>
+ <module>geronimo-common</module>
+ <module>geronimo-system</module>
+ <module>geronimo-logging</module>
+ <module>geronimo-kernel</module>
+ <module>geronimo-plugin</module>
+ <module>geronimo-deploy-tool</module>
+ <module>geronimo-cli</module>
+ <module>geronimo-crypto</module>
+ <module>geronimo-service-builder</module>
+ <module>geronimo-deploy-jsr88</module>
+ <module>geronimo-deployment</module>
+ <module>geronimo-deploy-config</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
Copied: geronimo/server/trunk/framework/modules/testsupport-common/pom.xml (from r746084, geronimo/server/trunk/testsupport/testsupport-common/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/pom.xml?p2=geronimo/server/trunk/framework/modules/testsupport-common/pom.xml&p1=geronimo/server/trunk/testsupport/testsupport-common/pom.xml&r1=746084&r2=746112&rev=746112&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/pom.xml Fri Feb 20 02:11:01 2009
@@ -24,11 +24,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport</artifactId>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>modules</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.geronimo.testsupport</groupId>
<artifactId>testsupport-common</artifactId>
<name>Geronimo Test Support :: Common</name>
Added: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/pom.xml?rev=746112&view=auto
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/pom.xml (added)
+++ geronimo/server/trunk/framework/plugingroups/framework/pom.xml Fri Feb 20 02:11:01 2009
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<!--
+ 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$ $Date$ -->
+<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">
+
+ <parent>
+ <artifactId>plugingroups</artifactId>
+ <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>framework</artifactId>
+ <packaging>car</packaging>
+ <name>Geronimo Plugin Group :: Framework</name>
+
+ <description>
+ This plugin group provides the framework functionality. It is required to build a working server.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-framework</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-geronimo</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--
+ HACK: This should really only be included in the full assemblies, but due
+ to the limited fashion which GShell currently sets up its classloaders
+ (via hard-coded classworlds entries pointing at repository locations)
+ it will add significant complication to the assembly builds to allow
+ the entires to be different for assembly types.
+ -->
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-remote</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>client-system</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>rmi-naming</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>shutdown</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jsr88-cli</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/framework/plugingroups/framework/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/plugingroups/framework/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml?rev=746112&view=auto
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml Fri Feb 20 02:11:01 2009
@@ -0,0 +1,69 @@
+<?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>framework</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>shutdown</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-remote</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-boilerplate</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>client-system</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>rmi-naming</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-framework</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>jsr88-cli</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>gshell-geronimo</artifactId>
+ <type>car</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/plugingroups/framework/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/pom.xml?rev=746112&view=auto
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/pom.xml (added)
+++ geronimo/server/trunk/framework/plugingroups/pom.xml Fri Feb 20 02:11:01 2009
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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$ $Date$ --><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.framework</groupId>
+ <artifactId>framework</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+ <artifactId>plugingroups</artifactId>
+ <name>Geronimo Plugin Groups</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>framework</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <!-- Install as extention to allow 'car' packaging to be used. -->
+ <extensions>true</extensions>
+ <configuration>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </useMavenDependencies>
+ <osiApproved>true</osiApproved>
+ <category>Geronimo Plugin Group</category>
+ <pluginGroup>true</pluginGroup>
+ <commonInstance>
+ <plugin-artifact>
+ <geronimo-version>${geronimoVersion}</geronimo-version>
+ <jvm-version>1.5</jvm-version>
+ <jvm-version>1.6</jvm-version>
+ <source-repository>~/.m2/repository/</source-repository>
+ <source-repository>http://repo1.maven.org/maven2/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+ <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+ </plugin-artifact>
+ </commonInstance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/framework/plugingroups/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/plugingroups/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/plugingroups/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Feb 20 02:11:01 2009
@@ -33,18 +33,47 @@
<name>Geronimo Framework</name>
<packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>modules</module>
- <module>configs</module>
- </modules>
+ <!--<dependencies>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.testsupport</groupId>-->
+ <!--<artifactId>testsupport-common</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--</dependencies>-->
+ <profiles>
+ <profile>
+ <id>default</id>
+
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <modules>
+ <module>modules</module>
+ <module>buildsupport</module>
+ <module>configs</module>
+ <module>plugingroups</module>
+ <module>assemblies</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>stage-bootstrap</id>
+
+ <activation>
+ <property>
+ <name>stage</name>
+ <value>bootstrap</value>
+ </property>
+ </activation>
+
+ <modules>
+ <module>buildsupport</module>
+ <module>modules</module>
+ </modules>
+ </profile>
+
+ </profiles>
</project>
Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Fri Feb 20 02:11:01 2009
@@ -34,7 +34,6 @@
<module>clustering-jetty</module>
<module>clustering-tomcat</module>
<module>ejb</module>
- <module>framework</module>
<module>javaee5-jetty</module>
<module>javaee5-tomcat</module>
<module>persistence</module>
Modified: geronimo/server/trunk/plugins/classloaders/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/pom.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/pom.xml Fri Feb 20 02:11:01 2009
@@ -30,7 +30,6 @@
</description>
<modules>
<module>xbean-finder</module>
- <module>geronimo-javaee-deployment_1.1MR3_spec</module>
<module>geronimo-schema-jee_5</module>
</modules>
</project>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Feb 20 02:11:01 2009
@@ -3455,7 +3455,6 @@
<modules>
<module>repository</module>
- <module>buildsupport</module>
<module>testsupport</module>
<module>framework</module>
<module>plugins</module>
@@ -3469,7 +3468,6 @@
<modules>
<module>repository</module>
- <module>buildsupport</module>
<module>testsupport</module>
<module>framework</module>
<module>plugins</module>
@@ -3520,9 +3518,9 @@
<modules>
<module>repository</module>
- <module>buildsupport</module>
- <module>testsupport</module>
- <module>framework/modules</module>
+ <!--<module>buildsupport</module>-->
+ <!--<module>testsupport</module>-->
+ <module>framework</module>
</modules>
</profile>
@@ -3556,7 +3554,7 @@
<modules>
<module>repository</module>
- <module>buildsupport</module>
+ <!--<module>buildsupport</module>-->
<module>testsupport</module>
<module>framework</module>
<module>plugins</module>
@@ -3574,7 +3572,7 @@
</activation>
<modules>
- <module>buildsupport</module>
+ <!--<module>buildsupport</module>-->
<module>testsupport</module>
<module>framework/modules</module>
</modules>
@@ -3660,7 +3658,6 @@
</properties>
<modules>
<module>repository</module>
- <module>buildsupport</module>
<module>testsupport</module>
<module>framework</module>
<module>plugins</module>
Modified: geronimo/server/trunk/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/pom.xml?rev=746112&r1=746111&r2=746112&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/pom.xml (original)
+++ geronimo/server/trunk/testsupport/pom.xml Fri Feb 20 02:11:01 2009
@@ -40,7 +40,7 @@
</description>
<modules>
- <module>testsupport-common</module>
+ <!--<module>testsupport-common</module>-->
<module>testsupport-selenium</module>
<module>testsupport-commands</module>
<module>testsupport-packaging</module>