Rename as-support module back to wildfly.

Changing the name from wildfly to as-support needlessly breaks existing releases of lein-immutant and fntest.
projectodd · Jul 30, 2015 · 419d339 · 419d339
1 parent b2a1ee1
commit 419d339
Show file tree

Hide file tree

Showing 29 changed files with 18 additions and 93 deletions.
diff --git a/modules/as-support/pom.xml b/modules/as-support/pom.xml
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -24,7 +24,7 @@
     <module>web</module>
     <module>web-undertow</module>
     <module>transactions</module>
-    <module>as-support</module>
+    <module>wildfly</module>
 
     <module>ruby</module>
     <module>clojure</module>

diff --git a/modules/wildfly/pom.xml b/modules/wildfly/pom.xml
@@ -11,12 +11,15 @@
 
   <groupId>org.projectodd.wunderboss</groupId>
   <artifactId>wunderboss-wildfly</artifactId>
-  <name>WunderBoss WildFly Module</name>
+  <name>WunderBoss WildFly/EAP Module</name>
 
   <packaging>jar</packaging>
 
   <properties>
+    <version.jboss.modules>1.3.6.Final</version.jboss.modules>
     <version.wildfly>8.2.0.Final</version.wildfly>
+    <version.jgroups>3.2.13.Final</version.jgroups>    <!-- the version used by EAP 6.4 -->
+    <version.jboss-msc>1.1.5.Final</version.jboss-msc> <!-- the version used by EAP 6.4 -->
   </properties>
 
   <dependencies>
@@ -27,11 +30,18 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.projectodd.wunderboss</groupId>
-      <artifactId>wunderboss-as-support</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.jgroups</groupId>
+      <artifactId>jgroups</artifactId>
+      <version>${version.jgroups}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.msc</groupId>
+      <artifactId>jboss-msc</artifactId>
+      <version>${version.jboss-msc}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.projectodd.wunderboss</groupId>
       <artifactId>wunderboss-messaging-hornetq</artifactId>
@@ -58,9 +68,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.wildfly</groupId>
-      <artifactId>wildfly-undertow</artifactId>
-      <version>${version.wildfly}</version>
+      <groupId>org.jboss.modules</groupId>
+      <artifactId>jboss-modules</artifactId>
+      <version>${version.jboss.modules}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/...d/wunderboss/as/ASDestinationManager.java → ...d/wunderboss/as/ASDestinationManager.java b/...d/wunderboss/as/ASDestinationManager.java → ...d/wunderboss/as/ASDestinationManager.java
diff --git a/...projectodd/wunderboss/as/ASMessaging.java → ...projectodd/wunderboss/as/ASMessaging.java b/...projectodd/wunderboss/as/ASMessaging.java → ...projectodd/wunderboss/as/ASMessaging.java
diff --git a/...dd/wunderboss/as/ASMessagingProvider.java → ...dd/wunderboss/as/ASMessagingProvider.java b/...dd/wunderboss/as/ASMessagingProvider.java → ...dd/wunderboss/as/ASMessagingProvider.java
diff --git a/...org/projectodd/wunderboss/as/ASUtils.java → ...org/projectodd/wunderboss/as/ASUtils.java b/...org/projectodd/wunderboss/as/ASUtils.java → ...org/projectodd/wunderboss/as/ASUtils.java
diff --git a/...ojectodd/wunderboss/as/ActionConduit.java → ...ojectodd/wunderboss/as/ActionConduit.java b/...ojectodd/wunderboss/as/ActionConduit.java → ...ojectodd/wunderboss/as/ActionConduit.java
diff --git a/...ectodd/wunderboss/as/ChannelProvider.java → ...ectodd/wunderboss/as/ChannelProvider.java b/...ectodd/wunderboss/as/ChannelProvider.java → ...ectodd/wunderboss/as/ChannelProvider.java
diff --git a/...jectodd/wunderboss/as/ChannelWrapper.java → ...jectodd/wunderboss/as/ChannelWrapper.java b/...jectodd/wunderboss/as/ChannelWrapper.java → ...jectodd/wunderboss/as/ChannelWrapper.java
diff --git a/...rojectodd/wunderboss/as/ClusterUtils.java → ...rojectodd/wunderboss/as/ClusterUtils.java b/...rojectodd/wunderboss/as/ClusterUtils.java → ...rojectodd/wunderboss/as/ClusterUtils.java
diff --git a/.../projectodd/wunderboss/as/MSCService.java → .../projectodd/wunderboss/as/MSCService.java b/.../projectodd/wunderboss/as/MSCService.java → .../projectodd/wunderboss/as/MSCService.java
diff --git a/...projectodd/wunderboss/as/ModuleUtils.java → ...projectodd/wunderboss/as/ModuleUtils.java b/...projectodd/wunderboss/as/ModuleUtils.java → ...projectodd/wunderboss/as/ModuleUtils.java
diff --git a/...ectodd/wunderboss/as/ServletListener.java → ...ectodd/wunderboss/as/ServletListener.java b/...ectodd/wunderboss/as/ServletListener.java → ...ectodd/wunderboss/as/ServletListener.java
diff --git a/.../projectodd/wunderboss/as/ServletWeb.java → .../projectodd/wunderboss/as/ServletWeb.java b/.../projectodd/wunderboss/as/ServletWeb.java → .../projectodd/wunderboss/as/ServletWeb.java
diff --git a/...odd/wunderboss/as/ServletWebProvider.java → ...odd/wunderboss/as/ServletWebProvider.java b/...odd/wunderboss/as/ServletWebProvider.java → ...odd/wunderboss/as/ServletWebProvider.java
diff --git a/...rboss/as/SingletonClusterParticipant.java → ...rboss/as/SingletonClusterParticipant.java b/...rboss/as/SingletonClusterParticipant.java → ...rboss/as/SingletonClusterParticipant.java
diff --git a/...nderboss/as/SingletonContextProvider.java → ...nderboss/as/SingletonContextProvider.java b/...nderboss/as/SingletonContextProvider.java → ...nderboss/as/SingletonContextProvider.java
diff --git a/...nderboss/as/WunderBossPowersActivate.java → ...nderboss/as/WunderBossPowersActivate.java b/...nderboss/as/WunderBossPowersActivate.java → ...nderboss/as/WunderBossPowersActivate.java
diff --git a/...derboss/as/eap/EAPDestinationManager.java → ...derboss/as/eap/EAPDestinationManager.java b/...derboss/as/eap/EAPDestinationManager.java → ...derboss/as/eap/EAPDestinationManager.java
diff --git a/...wunderboss/as/wildfly/WildFlyCaching.java → ...wunderboss/as/wildfly/WildFlyCaching.java b/...wunderboss/as/wildfly/WildFlyCaching.java → ...wunderboss/as/wildfly/WildFlyCaching.java
diff --git a/...ss/as/wildfly/WildFlyCachingProvider.java → ...ss/as/wildfly/WildFlyCachingProvider.java b/...ss/as/wildfly/WildFlyCachingProvider.java → ...ss/as/wildfly/WildFlyCachingProvider.java
diff --git a/...as/wildfly/WildFlyDestinationManager.java → ...as/wildfly/WildFlyDestinationManager.java b/...as/wildfly/WildFlyDestinationManager.java → ...as/wildfly/WildFlyDestinationManager.java
diff --git a/...erboss/as/wildfly/WildFlyTransaction.java → ...erboss/as/wildfly/WildFlyTransaction.java b/...erboss/as/wildfly/WildFlyTransaction.java → ...erboss/as/wildfly/WildFlyTransaction.java
diff --git a/...s/wildfly/WildFlyTransactionProvider.java → ...s/wildfly/WildFlyTransactionProvider.java b/...s/wildfly/WildFlyTransactionProvider.java → ...s/wildfly/WildFlyTransactionProvider.java
diff --git a/...es/org.jboss.msc.service.ServiceActivator → ...es/org.jboss.msc.service.ServiceActivator b/...es/org.jboss.msc.service.ServiceActivator → ...es/org.jboss.msc.service.ServiceActivator
diff --git a/...s/base-xml/jboss-deployment-structure.xml → ...s/base-xml/jboss-deployment-structure.xml b/...s/base-xml/jboss-deployment-structure.xml → ...s/base-xml/jboss-deployment-structure.xml
diff --git a/...pport/src/main/resources/base-xml/web.xml → ...ldfly/src/main/resources/base-xml/web.xml b/...pport/src/main/resources/base-xml/web.xml → ...ldfly/src/main/resources/base-xml/web.xml
diff --git a/...wunderboss/as/wildfly/ServletWebTest.java → ...wunderboss/as/wildfly/ServletWebTest.java b/...wunderboss/as/wildfly/ServletWebTest.java → ...wunderboss/as/wildfly/ServletWebTest.java