Merge pull request #23 from hawkular/mazz/wf9

more fixes for WildFly 9
hawkular · Jun 22, 2015 · 3701ac4 · 3701ac4
2 parents 87d0f2c + 1303104
commit 3701ac4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/hawkular-bus-broker-wf-extension/src/main/resources/module/main/module.xml b/hawkular-bus-broker-wf-extension/src/main/resources/module/main/module.xml
@@ -21,35 +21,19 @@
 <module xmlns="urn:jboss:module:1.0" name="${moduleName}">
 
   <resources>
+    <!--  Resources not replicated in the activemg rar, which is declared and exported below -->
     <resource-root path="${project.build.finalName}.jar" />
-    <resource-root path="activemq-broker-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-client-${version.org.apache.activemq}.jar" />
     <resource-root path="activemq-jaas-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-jms-pool-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-kahadb-store-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-openwire-legacy-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-pool-${version.org.apache.activemq}.jar" />
-    <resource-root path="activemq-protobuf-1.1.jar" />
-    <resource-root path="activemq-spring-${version.org.apache.activemq}.jar" />
     <resource-root path="activemq-web-${version.org.apache.activemq}.jar" />
-    <resource-root path="aopalliance-1.0.jar" />
-    <resource-root path="commons-net-3.3.jar" />
-    <resource-root path="hawtbuf-1.10.jar" />
     <resource-root path="jetty-continuation-7.6.9.v20130131.jar" />
     <resource-root path="jetty-http-7.6.9.v20130131.jar" />
     <resource-root path="jetty-io-7.6.9.v20130131.jar" />
     <resource-root path="jetty-util-7.6.9.v20130131.jar" />
     <resource-root path="jetty-websocket-7.6.9.v20130131.jar" />
     <resource-root path="hawkular-bus-broker-${project.version}.jar" />
     <resource-root path="rome-1.0.jar" />
-    <resource-root path="spring-aop-3.2.8.RELEASE.jar" />
-    <resource-root path="spring-beans-3.2.8.RELEASE.jar" />
-    <resource-root path="spring-context-3.2.8.RELEASE.jar" />
-    <resource-root path="spring-core-3.2.8.RELEASE.jar" />
-    <resource-root path="spring-expression-3.2.8.RELEASE.jar" />
     <resource-root path="spring-web-3.2.8.RELEASE.jar" />
     <resource-root path="spring-webmvc-3.2.8.RELEASE.jar" />
-    <resource-root path="xbean-spring-3.16.jar" />
     <resource-root path="xmlpull-1.1.3.1.jar" />
     <resource-root path="xpp3-1.1.4c.jar" />
     <resource-root path="xpp3_min-1.1.4c.jar" />
@@ -59,6 +43,9 @@
   </resources>
 
   <dependencies>
+    <!-- we require the rar deps for activemq -->
+    <module name="org.apache.activemq.ra" export="true" />
+
     <!-- modules required by any subsystem -->
     <module name="javax.api" />
     <module name="org.jboss.as.controller" />

diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/resources/module/main/module.xml b/hawkular-nest/hawkular-nest-wf-extension/src/main/resources/module/main/module.xml
@@ -29,7 +29,7 @@
   </resources>
 
   <dependencies>
-    <module name="org.hawkular.bus.broker" />
+    <module name="org.hawkular.bus.broker" export="true" />
 
     <!-- modules required by any subsystem -->
     <module name="javax.api" />
@@ -44,7 +44,7 @@
     <!-- other dependencies we need -->
     <module name="com.google.guava" export="true" />
     <module name="gnu.getopt" />
-    <module name="javax.jms.api" />
+    <module name="javax.jms.api"  export="true" />
     <module name="javax.management.j2ee.api" />
     <module name="javax.transaction.api" />
     <module name="org.apache.commons.logging" />