geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1309635 - in /geronimo/server/branches/3.0-beta/plugins: clustering/pom.xml pom.xml
Date Thu, 05 Apr 2012 01:16:51 GMT
Author: xiaming
Date: Thu Apr  5 01:16:50 2012
New Revision: 1309635

URL: http://svn.apache.org/viewvc?rev=1309635&view=rev
Log:
GERONIMO-6317 fix build error caused by comment on clustering modules

Modified:
    geronimo/server/branches/3.0-beta/plugins/clustering/pom.xml
    geronimo/server/branches/3.0-beta/plugins/pom.xml

Modified: geronimo/server/branches/3.0-beta/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/clustering/pom.xml?rev=1309635&r1=1309634&r2=1309635&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/clustering/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/clustering/pom.xml Thu Apr  5 01:16:50 2012
@@ -33,20 +33,7 @@
         clustering plugin
     </description>
 
-    <modules>
-        <module>geronimo-clustering</module>
-        <module>geronimo-clustering-wadi</module>
-        <module>geronimo-farm</module>
-        <module>geronimo-deploy-farm</module>
-        <module>geronimo-plugin-farm</module>
-        <module>clustering</module>
-        <module>wadi-clustering</module>
-        <module>farming</module>
-        <module>plugin-farm</module>
-        <module>plugin-farm-member</module>
-        <module>geronimo-plugin-farm-node</module>
-        <module>plugin-farm-datasource</module>
-    </modules>
+    
 
     <profiles>
         <profile>
@@ -61,6 +48,38 @@
                <!-- <module>clustering-it</module> -->
             </modules>
         </profile>
+        <profile>
+            <id>all</id>
+
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <modules>
+                <module>geronimo-clustering</module>
+                <module>geronimo-clustering-wadi</module>
+                <module>geronimo-farm</module>
+                <module>geronimo-deploy-farm</module>
+                <module>geronimo-plugin-farm</module>
+                <module>clustering</module>
+                <module>wadi-clustering</module>
+                <module>farming</module>
+                <module>plugin-farm</module>
+                <module>plugin-farm-member</module>
+                <module>geronimo-plugin-farm-node</module>
+                <module>plugin-farm-datasource</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>noclustering</id>
+
+            <activation>
+                <property>
+                    <name>buildclustering</name>
+                    <value>false</value>
+                </property>
+            </activation>            
+        </profile>
     </profiles>
 
     <properties>

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=1309635&r1=1309634&r2=1309635&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/pom.xml Thu Apr  5 01:16:50 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>



Mime
View raw message