Skip to content

Commit

Permalink
Merge pull request #681 from hawkular/fix_ptrans
Browse files Browse the repository at this point in the history
Migrate ptrans ITest to run against standalone ear as opposed
  • Loading branch information
jsanda committed Nov 3, 2016
2 parents b091b59 + 9c6898b commit 2869756
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
32 changes: 26 additions & 6 deletions clients/ptranslator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hawkular-metrics-api-jaxrs</artifactId>
<artifactId>hawkular-metrics-standalone-dist</artifactId>
<version>${project.version}</version>
<type>war</type>
<type>ear</type>
<scope>test</scope>
</dependency>
<!-- JBoss Logging Annotations Processor -->
Expand Down Expand Up @@ -275,7 +275,7 @@
</configuration>
</execution>
<execution>
<id>configure-loggers</id>
<id>configure-loggers-and-caches</id>
<phase>pre-integration-test</phase>
<goals>
<goal>execute-commands</goal>
Expand All @@ -284,6 +284,7 @@
<jbossHome>${project.build.directory}/wildfly-run/wildfly-${version.org.wildfly}</jbossHome>
<executeCommands>
<commands>
<!-- loggers -->
<command>
/subsystem=logging/logger=org.hawkular:add(level="TRACE")
</command>
Expand All @@ -296,20 +297,39 @@
<commmand>
/subsystem=logging/periodic-rotating-file-handler=FILE:write-attribute(name="file",value={path="${project.build.directory}/wildfly-test.log"})
</commmand>
<!-- caches -->
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/:add(module=org.jboss.as.clustering.infinispan,start=LAZY)
</commmand>
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/local-cache=partition/:add(indexing=NONE,start=LAZY)
</commmand>
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/local-cache=triggers/:add(indexing=NONE,start=LAZY)
</commmand>
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/local-cache=data/:add(indexing=NONE,start=LAZY)
</commmand>
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/local-cache=publish/:add(indexing=NONE,start=LAZY)
</commmand>
<commmand>
/subsystem=infinispan/cache-container=hawkular-alerts/local-cache=schema/:add(indexing=NONE,start=LAZY)
</commmand>
</commands>
</executeCommands>
</configuration>
</execution>
<execution>
<id>deploy-webapp</id>
<id>deploy-dist</id>
<phase>pre-integration-test</phase>
<goals>
<goal>deploy-artifact</goal>
</goals>
<configuration>
<groupId>${project.groupId}</groupId>
<artifactId>hawkular-metrics-api-jaxrs</artifactId>
<name>hawkular-metric-rest.war</name>
<artifactId>hawkular-metrics-standalone-dist</artifactId>
<name>hawkular-metrics.ear</name>
</configuration>
</execution>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@
<module>api/metrics-api-util</module>
<module>api/metrics-api-jaxrs</module>
<module>alerting</module>
<module>clients</module>
<module>containers</module>
<module>bus</module>
<module>dist</module>
<module>clients</module>
<module>integration-tests</module>
</modules>
</profile>
Expand Down

0 comments on commit 2869756

Please sign in to comment.