You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/04/02 16:04:53 UTC
svn commit: r1308356 - in /geronimo/server/branches/3.0-beta/plugins:
jetty8/pom.xml openejb/pom.xml pom.xml tomcat/pom.xml
Author: xiaming
Date: Mon Apr 2 14:04:53 2012
New Revision: 1308356
URL: http://svn.apache.org/viewvc?rev=1308356&view=rev
Log:
GERONIMO-6317 Add some profiles to not build clustering modules
Modified:
geronimo/server/branches/3.0-beta/plugins/jetty8/pom.xml
geronimo/server/branches/3.0-beta/plugins/openejb/pom.xml
geronimo/server/branches/3.0-beta/plugins/pom.xml
geronimo/server/branches/3.0-beta/plugins/tomcat/pom.xml
Modified: geronimo/server/branches/3.0-beta/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/jetty8/pom.xml?rev=1308356&r1=1308355&r2=1308356&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/jetty8/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/jetty8/pom.xml Mon Apr 2 14:04:53 2012
@@ -108,16 +108,7 @@
</dependencyManagement>
- <modules>
- <module>geronimo-jetty8</module>
- <module>geronimo-jetty8-builder</module>
- <module>jetty8</module>
- <module>jetty8-deployer</module>
- <module>geronimo-jetty8-clustering-builder-wadi</module>
- <module>geronimo-jetty8-clustering-wadi</module>
- <module>jetty8-clustering-builder-wadi</module>
- <module>jetty8-clustering-wadi</module>
- </modules>
+
<profiles>
<profile>
@@ -134,6 +125,41 @@
-->
</modules>
</profile>
+ <profile>
+ <id>all</id>
+
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <modules>
+ <module>geronimo-jetty8</module>
+ <module>geronimo-jetty8-builder</module>
+ <module>jetty8</module>
+ <module>jetty8-deployer</module>
+ <module>geronimo-jetty8-clustering-builder-wadi</module>
+ <module>geronimo-jetty8-clustering-wadi</module>
+ <module>jetty8-clustering-builder-wadi</module>
+ <module>jetty8-clustering-wadi</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>noclustering</id>
+
+ <activation>
+ <property>
+ <name>buildclustering</name>
+ <value>false</value>
+ </property>
+ </activation>
+
+ <modules>
+ <module>geronimo-jetty8</module>
+ <module>geronimo-jetty8-builder</module>
+ <module>jetty8</module>
+ <module>jetty8-deployer</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/server/branches/3.0-beta/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/openejb/pom.xml?rev=1308356&r1=1308355&r2=1308356&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/openejb/pom.xml Mon Apr 2 14:04:53 2012
@@ -32,20 +32,7 @@
OpenEJB plugin
</description>
- <modules>
- <module>geronimo-openejb</module>
- <module>geronimo-openejb-builder</module>
- <module>geronimo-openejb-clustering-wadi</module>
- <module>geronimo-openejb-clustering-builder-wadi</module>
- <module>openejb</module>
- <module>openejb-client</module>
- <module>openejb-deployer</module>
- <module>openejb-portlets</module>
- <module>openejb-console-jetty</module>
- <module>openejb-console-tomcat</module>
- <module>openejb-clustering-wadi</module>
- <module>openejb-clustering-builder-wadi</module>
- </modules>
+
<profiles>
<profile>
@@ -62,6 +49,49 @@
-->
</modules>
</profile>
+ <profile>
+ <id>all</id>
+
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <modules>
+ <module>geronimo-openejb</module>
+ <module>geronimo-openejb-builder</module>
+ <module>geronimo-openejb-clustering-wadi</module>
+ <module>geronimo-openejb-clustering-builder-wadi</module>
+ <module>openejb</module>
+ <module>openejb-client</module>
+ <module>openejb-deployer</module>
+ <module>openejb-portlets</module>
+ <module>openejb-console-jetty</module>
+ <module>openejb-console-tomcat</module>
+ <module>openejb-clustering-wadi</module>
+ <module>openejb-clustering-builder-wadi</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>noclustering</id>
+
+ <activation>
+ <property>
+ <name>buildclustering</name>
+ <value>false</value>
+ </property>
+ </activation>
+
+ <modules>
+ <module>geronimo-openejb</module>
+ <module>geronimo-openejb-builder</module>
+ <module>openejb</module>
+ <module>openejb-client</module>
+ <module>openejb-deployer</module>
+ <module>openejb-portlets</module>
+ <module>openejb-console-jetty</module>
+ <module>openejb-console-tomcat</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Modified: geronimo/server/branches/3.0-beta/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/pom.xml?rev=1308356&r1=1308355&r2=1308356&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/pom.xml Mon Apr 2 14:04:53 2012
@@ -158,7 +158,7 @@
<module>axis</module>
<module>axis2</module>
<module>client</module>
- <module>clustering</module>
+ <!--<module>clustering</module>-->
<module>connector-1_6</module>
<module>console</module>
<module>corba</module>
Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/pom.xml?rev=1308356&r1=1308355&r2=1308356&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/pom.xml Mon Apr 2 14:04:53 2012
@@ -35,18 +35,47 @@
<description>
Tomcat plugin
</description>
+ <profiles>
+ <profile>
+ <id>all</id>
+
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <modules>
+ <module>geronimo-tomcat7</module>
+ <module>geronimo-tomcat7-builder</module>
+ <module>tomcat7</module>
+ <module>tomcat7-no-ha</module>
+ <module>tomcat7-deployer</module>
+ <module>geronimo-tomcat7-clustering-wadi</module>
+ <module>geronimo-tomcat7-clustering-builder-wadi</module>
+ <module>tomcat7-clustering-wadi</module>
+ <module>tomcat7-clustering-builder-wadi</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>noclustering</id>
+
+ <activation>
+ <property>
+ <name>buildclustering</name>
+ <value>false</value>
+ </property>
+ </activation>
+
+ <modules>
+ <module>geronimo-tomcat7</module>
+ <module>geronimo-tomcat7-builder</module>
+ <module>tomcat7</module>
+ <module>tomcat7-no-ha</module>
+ <module>tomcat7-deployer</module>
+ </modules>
+ </profile>
+ </profiles>
- <modules>
- <module>geronimo-tomcat7</module>
- <module>geronimo-tomcat7-builder</module>
- <module>tomcat7</module>
- <module>tomcat7-no-ha</module>
- <module>tomcat7-deployer</module>
- <module>geronimo-tomcat7-clustering-wadi</module>
- <module>geronimo-tomcat7-clustering-builder-wadi</module>
- <module>tomcat7-clustering-wadi</module>
- <module>tomcat7-clustering-builder-wadi</module>
- </modules>
+
<dependencyManagement>
<dependencies>