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/12 01:52:42 UTC
svn commit: r743582 - in /geronimo/server/trunk: plugins/activemq/pom.xml
plugins/monitoring/pom.xml plugins/pom.xml pom.xml
Author: djencks
Date: Thu Feb 12 00:52:42 2009
New Revision: 743582
URL: http://svn.apache.org/viewvc?rev=743582&view=rev
Log:
GERONIMO-4563 run integration tests in a profile rather than skipping them in a profile
Modified:
geronimo/server/trunk/plugins/activemq/pom.xml
geronimo/server/trunk/plugins/monitoring/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=743582&r1=743581&r2=743582&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Thu Feb 12 00:52:42 2009
@@ -19,19 +19,19 @@
<!-- $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.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>activemq</artifactId>
<name>Geronimo Plugins, ActiveMQ v5</name>
<packaging>pom</packaging>
-
+
<description>
ActiveMQ v5 plugin
</description>
@@ -45,8 +45,17 @@
<module>activemq-portlets</module>
<module>activemq-console-jetty</module>
<module>activemq-console-tomcat</module>
- <module>activemq-server</module>
- </modules>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>with-it</id>
+ <modules>
+ <module>activemq-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
<properties>
<activemqVersion>5.3-SNAPSHOT</activemqVersion>
</properties>
Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=743582&r1=743581&r2=743582&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Thu Feb 12 00:52:42 2009
@@ -31,6 +31,29 @@
<description> Geronimo Monitoring and Management </description>
+ <modules>
+ <module>agent</module>
+ <module>agent-ds</module>
+ <module>agent-jar</module>
+ <module>agent-ejb</module>
+ <module>agent-jmx</module>
+ <module>agent-car-jmx</module>
+ <module>agent-sql</module>
+ <module>mconsole-ds</module>
+ <module>mconsole-war</module>
+ <module>mconsole-jetty</module>
+ <module>mconsole-tomcat</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>with-it</id>
+ <modules>
+ <module>mconsole-jetty-server</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<resources>
<resource>
@@ -57,47 +80,4 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>agent</module>
- <module>agent-ds</module>
- <module>agent-jar</module>
- <module>agent-ejb</module>
- <module>agent-jmx</module>
- <module>agent-car-jmx</module>
- <module>agent-sql</module>
- <module>mconsole-ds</module>
- <module>mconsole-war</module>
- <module>mconsole-jetty</module>
- <module>mconsole-jetty-server</module>
- <module>mconsole-tomcat</module>
- </modules>
- </profile>
-
- <profile>
- <id>no-it</id>
-
- <modules>
- <module>agent</module>
- <module>agent-ds</module>
- <module>agent-jar</module>
- <module>agent-ejb</module>
- <module>agent-jmx</module>
- <module>agent-car-jmx</module>
- <module>agent-sql</module>
- <module>mconsole-ds</module>
- <module>mconsole-war</module>
- <module>mconsole-jetty</module>
- <module>mconsole-tomcat</module>
- </modules>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=743582&r1=743581&r2=743582&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Feb 12 00:52:42 2009
@@ -70,14 +70,12 @@
<module>jasper</module>
<module>javamail</module>
<module>jaxws</module>
- <module>jetty</module>
<module>myfaces</module>
<module>openejb</module>
<module>openjpa</module>
<module>plancreator</module>
<module>pluto</module>
<module>system-database</module>
- <module>tomcat</module>
<module>webservices</module>
<module>spring</module>
<module>ca-helper</module>
@@ -91,6 +89,24 @@
<module>classloaders</module>
<module>procrun</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>jetty</module>
+ <module>tomcat</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>ee6</id>
+ <!-- put jetty7 etc here -->
+ </profile>
+ </profiles>
<build>
<plugins>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=743582&r1=743581&r2=743582&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Feb 12 00:52:42 2009
@@ -3461,12 +3461,11 @@
<module>plugins</module>
<module>plugingroups</module>
<module>assemblies</module>
- <module>testsuite</module>
</modules>
</profile>
<profile>
- <id>no-it</id>
+ <id>with-it</id>
<modules>
<module>repository</module>
@@ -3476,6 +3475,7 @@
<module>plugins</module>
<module>plugingroups</module>
<module>assemblies</module>
+ <module>testsuite</module>
</modules>
</profile>
@@ -3658,6 +3658,15 @@
<!--<txmanagerVersion>2.1.1</txmanagerVersion>-->
<txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
</properties>
+ <modules>
+ <module>repository</module>
+ <module>buildsupport</module>
+ <module>testsupport</module>
+ <module>framework</module>
+ <module>plugins</module>
+ <module>plugingroups</module>
+ <module>assemblies</module>
+ </modules>
</profile>
</profiles>