From 127354f1d94512417642a0a67f7dddf5e7cadc53 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Mon, 20 Feb 2012 17:59:18 +0100
Subject: [PATCH 18/43] Enable part of org.jboss.as.clustering module
 (infinispan, common, jgroups)

---
 build/build.xml    |   24 ++++++++++++------------
 build/pom.xml      |   30 +++++++++++++++---------------
 clustering/pom.xml |    8 ++++----
 pom.xml            |    2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 9263fb2..7a4a531 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -153,6 +153,18 @@
             <maven-resource group="org.hibernate" artifact="hibernate-validator"/>
         </module-def>
 
+        <module-def name="org.jboss.as.clustering.common">
+            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-common"/>
+        </module-def>
+
+        <module-def name="org.jboss.as.clustering.infinispan">
+            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-infinispan"/>
+        </module-def>
+
+        <module-def name="org.jboss.as.clustering.jgroups">
+            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
+        </module-def>
+
         <module-def name="org.jboss.as.controller">
             <maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
         </module-def>
@@ -758,10 +770,6 @@
             <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-api"/>
         </module-def>
 
-        <module-def name="org.jboss.as.clustering.common">
-            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-common"/>
-        </module-def>
-
         <module-def name="org.jboss.as.clustering.ejb3.infinispan">
             <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-ejb3-infinispan"/>
         </module-def>
@@ -770,14 +778,6 @@
             <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-impl"/>
         </module-def>
 
-        <module-def name="org.jboss.as.clustering.infinispan">
-            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-infinispan"/>
-        </module-def>
-
-        <module-def name="org.jboss.as.clustering.jgroups">
-            <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
-        </module-def>
-
         <module-def name="org.jboss.as.clustering.registry">
             <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-registry"/>
         </module-def>
diff --git a/build/pom.xml b/build/pom.xml
index 02ac14c..69db7ae 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -135,6 +135,21 @@
 
         <dependency>
             <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-clustering-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-clustering-infinispan</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-clustering-jgroups</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.as</groupId>
             <artifactId>jboss-as-domain-http-error-context</artifactId>
         </dependency>
 
@@ -817,11 +832,6 @@
 
                 <dependency>
                     <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-clustering-common</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-clustering-ejb3-infinispan</artifactId>
                 </dependency>
 
@@ -832,16 +842,6 @@
 
                 <dependency>
                     <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-clustering-infinispan</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-clustering-jgroups</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-clustering-registry</artifactId>
                 </dependency>
 
diff --git a/clustering/pom.xml b/clustering/pom.xml
index 71efd3b..6dc97af 100644
--- a/clustering/pom.xml
+++ b/clustering/pom.xml
@@ -38,17 +38,17 @@
     <name>JBoss Application Server: Clustering Subsystem</name>
     
     <modules>
-        <module>api</module>
+        <!-- <module>api</module> -->
         <module>common</module>
-        <module>impl</module>
+        <!-- <module>impl</module> -->
         <module>jgroups</module>
         <module>infinispan</module>
-        <module>registry</module>
+        <!-- <module>registry</module>
         <module>service</module>
         <module>singleton</module>
         <module>web-spi</module>
         <module>web-infinispan</module>
-        <module>ejb3-infinispan</module>
+        <module>ejb3-infinispan</module>-->
     </modules>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index bc3fe79..25c18fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,6 +272,7 @@
     <modules>
         <module>build</module>
         <module>build-config</module>
+        <module>clustering</module>
         <module>controller</module>
         <module>controller-client</module>
         <module>deployment-repository</module>
@@ -5966,7 +5967,6 @@
                 <module>client/ejb</module>
                 <module>client/jms</module>
                 <module>client/shade</module>
-                <module>clustering</module>
                 <module>cmp</module>
                 <module>configadmin</module>
                 <module>config-assembly</module>
-- 
1.7.10