Skip to content

Commit

Permalink
Issues with bus connections: no class, classcast, connection, transpo…
Browse files Browse the repository at this point in the history
…rt, etc...

- Have Bus Broker avoid all overlap with jars offered by activemq rar
- Have Bus Broker depend on activemq rar and export it
- Have Nest export broker
- Have nest export JMS
  • Loading branch information
jshaughn committed Jun 22, 2015
1 parent 87d0f2c commit dbd562c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,22 @@
-->

<module xmlns="urn:jboss:module:1.0" name="${moduleName}">
<module xmlns="urn:jboss:module:1.0" name="org.hawkular.bus.broker">

<resources>
<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" />
<!-- Resources not replicated in the activemg rar, which is declared and exported below -->
<resource-root path="hawkular-bus-broker-wf-extension-0.1.1-SNAPSHOT.jar" />
<resource-root path="activemq-jaas-5.10.0.jar" />
<resource-root path="activemq-web-5.10.0.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="hawkular-bus-broker-0.1.1-SNAPSHOT.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" />
Expand All @@ -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" />
Expand Down Expand Up @@ -86,4 +73,4 @@
<module name="org.jdom" />
<module name="org.slf4j" />
</dependencies>
</module>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down

0 comments on commit dbd562c

Please sign in to comment.