Work around package splitting issue by combining infinispan modules

jbossas · Nov 23, 2011 · 8165c96 · 8165c96
1 parent 109365e
commit 8165c96
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 192 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -427,27 +427,12 @@
             <maven-resource group="org.hornetq" artifact="hornetq-ra"/>
         </module-def>
 
-        <module-def name="org.infinispan.api">
+        <module-def name="org.infinispan">
             <maven-resource group="org.infinispan" artifact="infinispan-api"/>
-        </module-def>
-
-        <module-def name="org.infinispan.commons">
             <maven-resource group="org.infinispan" artifact="infinispan-commons"/>
-        </module-def>
-
-        <module-def name="org.infinispan">
             <maven-resource group="org.infinispan" artifact="infinispan-core"/>
-        </module-def>
-
-        <module-def name="org.infinispan.cachestore.jdbc">
             <maven-resource group="org.infinispan" artifact="infinispan-cachestore-jdbc"/>
-        </module-def>
-
-        <module-def name="org.infinispan.cachestore.remote">
             <maven-resource group="org.infinispan" artifact="infinispan-cachestore-remote"/>
-        </module-def>
-
-        <module-def name="org.infinispan.client.hotrod">
             <maven-resource group="org.infinispan" artifact="infinispan-client-hotrod"/>
         </module-def>
 

diff --git a/build/src/main/resources/modules/org/infinispan/api/main/module.xml b/build/src/main/resources/modules/org/infinispan/api/main/module.xml
diff --git a/build/src/main/resources/modules/org/infinispan/cachestore/jdbc/main/module.xml b/build/src/main/resources/modules/org/infinispan/cachestore/jdbc/main/module.xml
diff --git a/build/src/main/resources/modules/org/infinispan/cachestore/remote/main/module.xml b/build/src/main/resources/modules/org/infinispan/cachestore/remote/main/module.xml
diff --git a/build/src/main/resources/modules/org/infinispan/client/hotrod/main/module.xml b/build/src/main/resources/modules/org/infinispan/client/hotrod/main/module.xml
diff --git a/build/src/main/resources/modules/org/infinispan/commons/main/module.xml b/build/src/main/resources/modules/org/infinispan/commons/main/module.xml
diff --git a/build/src/main/resources/modules/org/infinispan/main/module.xml b/build/src/main/resources/modules/org/infinispan/main/module.xml
@@ -29,8 +29,8 @@
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
         <module name="javax.xml.bind.api"/>
+        <module name="org.apache.commons.pool"/>
         <module name="org.apache.xerces" services="import"/>
-        <module name="org.infinispan.commons" export="true" />
         <module name="org.jboss.jandex"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.marshalling"/>

diff --git a/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml b/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
@@ -32,8 +32,6 @@
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
         <module name="org.infinispan"/>
-        <module name="org.infinispan.cachestore.jdbc"/>
-        <module name="org.infinispan.cachestore.remote" />
         <module name="org.jboss.as.clustering.common"/>
         <module name="org.jboss.as.clustering.jgroups" optional="true"/>
         <module name="org.jboss.as.controller"/>