use new inventory artifact name. use common DS name

hawkular · Feb 11, 2015 · 6f0a887 · 6f0a887
1 parent 892991d
commit 6f0a887
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/integration-distro-test/pom.xml b/integration-distro-test/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>org.hawkular.inventory</groupId>
-      <artifactId>rest-api</artifactId>
+      <artifactId>inventory-rest-api</artifactId>
       <version>${version.org.hawkular.inventory}</version>
       <type>war</type>
     </dependency>

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
@@ -159,7 +159,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
-                <datasource jta="true" jndi-name="java:/jdbc/HawkularDS" pool-name="HawkularDS" enabled="true" use-ccm="true">
+                <datasource jta="true" jndi-name="java:jboss/datasources/HawkularDS" pool-name="HawkularDS" enabled="true" use-ccm="true">
                     <connection-url>jdbc:h2:standalone/data/hawkular_db</connection-url>
                     <driver-class>org.h2.Driver</driver-class>
                     <driver>h2</driver>
@@ -210,7 +210,7 @@
                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
                 </managed-thread-factories>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:/jdbc/HawkularDS" jms-connection-factory="java:/HawkularBusConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/HawkularDS" jms-connection-factory="java:/HawkularBusConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
             <session-bean>

diff --git a/integration-distro-test/src/main/scripts/distro-assembly.xml b/integration-distro-test/src/main/scripts/distro-assembly.xml
@@ -64,7 +64,7 @@
       </outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>org.hawkular.inventory:rest-api</include>
+        <include>org.hawkular.inventory:inventory-rest-api</include>
         <include>org.hawkular:hawkular-pinger</include>
         <include>org.hawkular.alerts:hawkular-alerts-ear</include>
         <include>org.hawkular.alerts:hawkular-notifiers-email</include>