Use hk-metrics 0.3 and add a topic.

hawkular · Feb 10, 2015 · b4a9910 · jmazzitelli · Feb 10, 2015 · b4a9910
1 parent a742e0b
commit b4a9910
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/integration-distro-test/pom.xml b/integration-distro-test/pom.xml
@@ -38,7 +38,7 @@
     <version.org.hawkular.nest>1.0.0.Alpha1-SNAPSHOT</version.org.hawkular.nest>
     <version.org.hawkular.inventory>1.0-SNAPSHOT</version.org.hawkular.inventory>
     <version.org.hawkular.alerts>1.0.0.Alpha1-SNAPSHOT</version.org.hawkular.alerts>
-    <version.org.rhq.metrics>0.2.8-SNAPSHOT</version.org.rhq.metrics>
+    <version.org.rhq.metrics>0.3.0-SNAPSHOT</version.org.rhq.metrics>
   </properties>
 
   <dependencies>
@@ -74,25 +74,25 @@
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.rhq.metrics</groupId>
+      <groupId>org.hawkular.metrics</groupId>
       <artifactId>rest-servlet</artifactId>
       <version>${version.org.rhq.metrics}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.rhq.metrics</groupId>
+      <groupId>org.hawkular.metrics</groupId>
       <artifactId>metrics-console</artifactId>
       <version>${version.org.rhq.metrics}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.rhq.metrics</groupId>
+      <groupId>org.hawkular.metrics</groupId>
       <artifactId>explorer</artifactId>
       <version>${version.org.rhq.metrics}</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.rhq.metrics</groupId>
+      <groupId>org.hawkular.metrics</groupId>
       <artifactId>embedded-cassandra-ear</artifactId>
       <version>${version.org.rhq.metrics}</version>
       <type>ear</type>

diff --git a/integration-distro-test/src/main/distro-resources/standalone/configuration/standalone.xml b/integration-distro-test/src/main/distro-resources/standalone/configuration/standalone.xml
@@ -362,6 +362,16 @@
                             </xa-pool>
                         </connection-definition>
                     </connection-definitions>
+                    <admin-objects>
+                      <admin-object class-name="org.apache.activemq.command.ActiveMQTopic"
+                                    jndi-name="java:/topic/HKNotifications"
+                                    enabled="true" use-java-context="true"
+                                    pool-name="HKNotifications">
+                        <config-property name="PhysicalName">
+                          HKNotifications
+                        </config-property>
+                      </admin-object>
+                    </admin-objects>
                     <!--
                     <admin-objects>
                         <admin-object class-name="org.apache.activemq.command.ActiveMQQueue" jndi-name="java:/queue/QueueName" enabled="true"
@@ -475,7 +485,7 @@
         <interface name="unsecure">
             <!--
               ~  Used for IIOP sockets in the standard configuration.
-              ~                  To secure JacORB you need to setup SSL 
+              ~                  To secure JacORB you need to setup SSL
               -->
             <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
         </interface>

diff --git a/integration-distro-test/src/main/scripts/distro-assembly.xml b/integration-distro-test/src/main/scripts/distro-assembly.xml
@@ -67,10 +67,10 @@
         <include>org.hawkular.inventory:rest-api</include>
         <include>org.hawkular.alerts:hawkular-alerts-ear</include>
         <include>org.hawkular.alerts:hawkular-notifiers-email</include>
-        <include>org.rhq.metrics:rest-servlet</include>
-        <include>org.rhq.metrics:metrics-console</include>
-        <include>org.rhq.metrics:explorer</include>
-        <include>org.rhq.metrics:embedded-cassandra-ear</include>
+        <include>org.hawkular.metrics:rest-servlet</include>
+        <include>org.hawkular.metrics:metrics-console</include>
+        <include>org.hawkular.metrics:explorer</include>
+        <include>org.hawkular.metrics:embedded-cassandra-ear</include>
       </includes>
       <unpack>false</unpack>
       <fileMode>0644</fileMode>