HAWKULAR-245 - more WF9 work

Merge branch 'mazz/wf9' Conflicts: hawkular-bus-broker-wf-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java hawkular-bus-broker-wf-extension/src/main/resources/module/main/config/default-broker.xml
hawkular · Jun 19, 2015 · 6808b28 · 6808b28
2 parents da4acd2 + ccf0d17
commit 6808b28
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/hawkular-bus-broker-wf-extension/src/main/resources/module/main/config/default-broker.xml b/hawkular-bus-broker-wf-extension/src/main/resources/module/main/config/default-broker.xml
@@ -25,13 +25,13 @@
   <broker xmlns="http://activemq.apache.org/schema/core"
           brokerName="${org-hawkular-bus-broker-name}"
           persistent="${org-hawkular-bus-broker-persistent}"
-          useJmx="${org-hawkular-bus-broker.use-jmx}"
+          useJmx="${org-hawkular-bus-broker-use-jmx}"
           dataDirectory="${jboss.server.data.dir}/broker"
           useShutdownHook="false">
 
     <transportConnectors>
-      <transportConnector name="${org-hawkular-bus-broker.connector.name}"
-                          uri="${org-hawkular-bus-broker.connector.protocol}://${org-hawkular-bus-broker.connector.address}:${org-hawkular-bus-broker.connector.port}"
+      <transportConnector name="${org-hawkular-bus-broker-connector-name}"
+                          uri="${org-hawkular-bus-broker-connector-protocol}://${org-hawkular-bus-broker-connector-address}:${org-hawkular-bus-broker-connector-port}"
                           updateClusterClients="true"
                           updateClusterClientsOnRemove="true"
                           rebalanceClusterClients="true"
@@ -45,7 +45,7 @@
              multicast://hostname:port
     -->
     <networkConnectors>
-      <networkConnector uri="multicast://${org-hawkular-bus-broker.discovery.address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
+      <networkConnector uri="multicast://${org-hawkular-bus-broker-discovery-address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
     </networkConnectors>
 
     <persistenceAdapter>

diff --git a/...awkular-nest-distro/src/main/distro-resources/standalone/configuration/default-broker.xml b/...awkular-nest-distro/src/main/distro-resources/standalone/configuration/default-broker.xml
@@ -23,19 +23,19 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.apache.org/schema/core"
-          brokerName="${org.hawkular.bus.broker.name}"
-          persistent="${org.hawkular.bus.broker.persistent}"
-          useJmx="${org.hawkular.bus.broker.use-jmx}"
+          brokerName="${org-hawkular-bus-broker-name}"
+          persistent="${org-hawkular-bus-broker-persistent}"
+          useJmx="${org-hawkular-bus-broker-use-jmx}"
           dataDirectory="${jboss.server.data.dir}/broker"
           useShutdownHook="false">
 
     <transportConnectors>
-      <transportConnector name="${org.hawkular.bus.broker.connector.name}"
-                          uri="${org.hawkular.bus.broker.connector.protocol}://${org.hawkular.bus.broker.connector.address}:${org.hawkular.bus.broker.connector.port}"
+      <transportConnector name="${org-hawkular-bus-broker-connector-name}"
+                          uri="${org-hawkular-bus-broker-connector-protocol}://${org-hawkular-bus-broker-connector-address}:${org-hawkular-bus-broker-connector-port}"
                           updateClusterClients="true"
                           updateClusterClientsOnRemove="true"
                           rebalanceClusterClients="true"
-                          discoveryUri="multicast://${org.hawkular.bus.broker.discovery.address}:${org.hawkular.bus.broker.discovery.port}?group=hawkular" />
+                          discoveryUri="multicast://${org-hawkular-bus-broker-discovery-address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
     </transportConnectors>
 
     <!-- Define the Network of Brokers (aka clustering).
@@ -46,7 +46,7 @@
     -->
     <networkConnectors>
       <networkConnector
-        uri="multicast://${org.hawkular.bus.broker.discovery.address}:${org.hawkular.bus.broker.discovery.port}?group=hawkular" />
+        uri="multicast://${org-hawkular-bus-broker-discovery-address}:${org-hawkular-bus-broker-discovery-port}?group=hawkular" />
     </networkConnectors>
 
     <persistenceAdapter>

diff --git a/.../hawkular-nest-distro/src/main/scripts/socketbinding-hawkular-bus-broker-wf-extension.xml b/.../hawkular-nest-distro/src/main/scripts/socketbinding-hawkular-bus-broker-wf-extension.xml
@@ -2,6 +2,6 @@
 <!--
      WE NEED THIS TOO, BUT THE PLUGIN NEEDS VALID XML TO WORK.
      WE WILL INJECT THIS VIA PLUGIN <edit> FEATURE
-<socket-binding name="org.hawkular.bus.broker.discovery" port="0"
+<socket-binding name="org-hawkular-bus-broker-discovery" port="0"
                 mulicast-address="224.0.0.4" multicast-port="63636" />
 -->
diff --git a/...nest/hawkular-nest-distro/src/main/scripts/subsystem-hawkular-bus-broker-wf-extension.xml b/...nest/hawkular-nest-distro/src/main/scripts/subsystem-hawkular-bus-broker-wf-extension.xml
@@ -2,13 +2,13 @@
            enabled="true"
            configuration-file="default-broker.xml">
 
-  <org.hawkular.bus.broker.name>org.hawkular.bus.broker.${jboss.node.name}</org.hawkular.bus.broker.name>
-  <org.hawkular.bus.broker.persistent>false</org.hawkular.bus.broker.persistent>
-  <org.hawkular.bus.broker.use-jmx>false</org.hawkular.bus.broker.use-jmx>
+  <org-hawkular-bus-broker-name>org.hawkular.bus.broker.${jboss.node.name}</org-hawkular-bus-broker-name>
+  <org-hawkular-bus-broker-persistent>false</org-hawkular-bus-broker-persistent>
+  <org-hawkular-bus-broker-use-jmx>false</org-hawkular-bus-broker-use-jmx>
 
   <connector socket-binding="org.hawkular.bus.broker"
-             org.hawkular.bus.broker.connector.name="openwire"
-             org.hawkular.bus.broker.connector.protocol="tcp" />
+             org-hawkular-bus-broker-connector-name="openwire"
+             org-hawkular-bus-broker-connector-protocol="tcp" />
 
   <discovery-socket-binding>org.hawkular.bus.broker.discovery</discovery-socket-binding>