HAWKULAR-232 WF9 no longer allows "." in attribute names. we used the…

…m since they mimic'd replacement sysprops for broker config file. this commit changes "." to "-"
hawkular · Jun 17, 2015 · ccf0d17 · ccf0d17
1 parent f63ff54
commit ccf0d17
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/...f-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java b/...f-extension/src/main/java/org/hawkular/bus/broker/extension/BrokerSubsystemExtension.java
@@ -66,15 +66,15 @@ public class BrokerSubsystemExtension implements Extension {
     // will be set as system properties whose values will be the values that are given to the extension.
     // If a user wants to use their own broker XML file, then they can re-use these ${x} variables in that configuration
     // file to maintain configurability via the extension rather than hardcoding them into the xml file itself.
-    protected static final String BROKER_NAME_SYSPROP = "org.hawkular.bus.broker.name";
-    protected static final String BROKER_PERSISTENT_SYSPROP = "org.hawkular.bus.broker.persistent";
-    protected static final String BROKER_USE_JMX_SYSPROP = "org.hawkular.bus.broker.use-jmx";
-    protected static final String BROKER_CONNECTOR_NAME_SYSPROP = "org.hawkular.bus.broker.connector.name";
-    protected static final String BROKER_CONNECTOR_PROTOCOL_SYSPROP = "org.hawkular.bus.broker.connector.protocol";
-    protected static final String BROKER_CONNECTOR_ADDRESS_SYSPROP = "org.hawkular.bus.broker.connector.address";
-    protected static final String BROKER_CONNECTOR_PORT_SYSPROP = "org.hawkular.bus.broker.connector.port";
-    protected static final String BROKER_DISCOVERY_ADDRESS_SYSPROP = "org.hawkular.bus.broker.discovery.address";
-    protected static final String BROKER_DISCOVERY_PORT_SYSPROP = "org.hawkular.bus.broker.discovery.port";
+    protected static final String BROKER_NAME_SYSPROP = "org-hawkular-bus-broker-name";
+    protected static final String BROKER_PERSISTENT_SYSPROP = "org-hawkular-bus-broker-persistent";
+    protected static final String BROKER_USE_JMX_SYSPROP = "org-hawkular-bus-broker-use-jmx";
+    protected static final String BROKER_CONNECTOR_NAME_SYSPROP = "org-hawkular-bus-broker-connector-name";
+    protected static final String BROKER_CONNECTOR_PROTOCOL_SYSPROP = "org-hawkular-bus-broker-connector-protocol";
+    protected static final String BROKER_CONNECTOR_ADDRESS_SYSPROP = "org-hawkular-bus-broker-connector-address";
+    protected static final String BROKER_CONNECTOR_PORT_SYSPROP = "org-hawkular-bus-broker-connector-port";
+    protected static final String BROKER_DISCOVERY_ADDRESS_SYSPROP = "org-hawkular-bus-broker-discovery-address";
+    protected static final String BROKER_DISCOVERY_PORT_SYSPROP = "org-hawkular-bus-broker-discovery-port";
 
     // The following define the XML elements and attributes of the extension itself (these appear in WildFly's
     // standalone.xml for this extension).

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
@@ -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).
@@ -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/...tension/src/main/resources/org/hawkular/bus/broker/extension/LocalDescriptions.properties b/...tension/src/main/resources/org/hawkular/bus/broker/extension/LocalDescriptions.properties
@@ -27,8 +27,8 @@ hawkular-bus-broker.configuration-file=The configuration file that further defin
 hawkular-bus-broker.custom-configuration=Additional configuration values used to configure the broker. The broker will set these as system properties.
 hawkular-bus-broker.socket-binding=Determines the binding address and port the broker listens to for incoming messages.
 hawkular-bus-broker.discovery-socket-binding=Determines the multicast address and port the broker uses to discover other brokers.
-hawkular-bus-broker.org.hawkular.bus.broker.name=The name of the Hawkular Broker.
-hawkular-bus-broker.org.hawkular.bus.broker.persistent=Determines if the Hawkular Broker will persist its messages for fault tolerance.
-hawkular-bus-broker.org.hawkular.bus.broker.use-jmx=Determines if the Hawkular Broker will enable its JMX MBeans.
-hawkular-bus-broker.org.hawkular.bus.broker.connector.name=The name of the Hawkular Broker connector that processed incoming messages.
-hawkular-bus-broker.org.hawkular.bus.broker.connector.protocol=The protocol used to receive incoming messages over the Hawkular Broker connector.
+hawkular-bus-broker.org-hawkular-bus-broker-name=The name of the Hawkular Broker.
+hawkular-bus-broker.org-hawkular-bus-broker-persistent=Determines if the Hawkular Broker will persist its messages for fault tolerance.
+hawkular-bus-broker.org-hawkular-bus-broker-use-jmx=Determines if the Hawkular Broker will enable its JMX MBeans.
+hawkular-bus-broker.org-hawkular-bus-broker-connector-name=The name of the Hawkular Broker connector that processed incoming messages.
+hawkular-bus-broker.org-hawkular-bus-broker-connector-protocol=The protocol used to receive incoming messages over the Hawkular Broker connector.
diff --git a/hawkular-bus-broker-wf-extension/src/main/scripts/standalone-subsystem.xml b/hawkular-bus-broker-wf-extension/src/main/scripts/standalone-subsystem.xml
@@ -21,13 +21,13 @@
            enabled="true"
            configuration-file="default-broker.xml">
 
-  <org.hawkular.bus.broker.name>org.hawkular.bus.broker</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</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" />
 
   <custom-configuration>
     <property name="custom-prop" value="custom-prop-val"/>

diff --git a/...us-broker-wf-extension/src/test/resources/org/hawkular/bus/broker/extension/subsystem.xml b/...us-broker-wf-extension/src/test/resources/org/hawkular/bus/broker/extension/subsystem.xml
@@ -18,13 +18,13 @@
 -->
 <subsystem xmlns="urn:org.hawkular.bus:broker:1.0" enabled="true" configuration-file="foo/bar.xml">
 
-  <org.hawkular.bus.broker.name>test-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>test-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="test-socket-binding"
-             org.hawkular.bus.broker.connector.name="test-connector-name"
-             org.hawkular.bus.broker.connector.protocol="test-connector-protocol" />
+             org-hawkular-bus-broker-connector-name="test-connector-name"
+             org-hawkular-bus-broker-connector-protocol="test-connector-protocol" />
 
   <discovery-socket-binding>test-discovery-socket-binding</discovery-socket-binding>
 

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>