Merge pull request #345 from hawkular/HWKMETRICS-216

HWKMETRICS-216

integration-tests/pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
+    and other contributors as indicated by the @author tags.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>hawkular-metrics-parent</artifactId>
+    <groupId>org.hawkular.metrics</groupId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>hawkular-metrics-integration-tests</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Hawkular Metrics Integration Tests</name>
+  <description>Integration Tests for Hawkular Metrics</description>
+
+  <profiles>
+    <profile>
+      <id>test</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>rest-tests-jaxrs</module>
+        <module>rest-tests-jaxrs-1.1</module>
+        <module>load-tests</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>

tests/rest-integration-tests-jaxrs-1.1/pom.xml → integration-tests/rest-tests-jaxrs-1.1/pom.xml

@@ -28,9 +28,9 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>hawkular-metrics-rest-integration-tests-jax-rs-1.1</artifactId>
+  <artifactId>hawkular-metrics-rest-tests-jaxrs-1.1</artifactId>
 
-  <name>Hawkular Metrics - Rest Integration Tests for JAX-RS 1.1</name>
+  <name>Hawkular Metrics Rest Tests for JAX-RS 1.1</name>
 
   <properties>
     <jboss-as-maven-plugin.skip>true</jboss-as-maven-plugin.skip>
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>hawkular-metrics-rest-tests</artifactId>
+      <artifactId>hawkular-metrics-rest-tests-jaxrs</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

rest-tests/pom.xml → integration-tests/rest-tests-jaxrs/pom.xml

@@ -27,9 +27,9 @@
     <version>0.7.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-metrics-rest-tests</artifactId>
+  <artifactId>hawkular-metrics-rest-tests-jaxrs</artifactId>
 
-  <name>Hawkular Metrics Rest Tests</name>
+  <name>Hawkular Metrics Rest Tests for JAX-RS 2.0</name>
 
   <properties>
     <wildfly-maven-plugin.skip>true</wildfly-maven-plugin.skip>

pom.xml

@@ -84,12 +84,10 @@
     <module>core/metrics-core-impl</module>
     <module>api/metrics-api-common</module>
     <module>api/metrics-api-jaxrs</module>
-    <module>rest-tests</module>
     <module>api/metrics-api-jaxrs-1.1</module>
-    <module>tests/rest-integration-tests-jaxrs-1.1</module>
+    <module>integration-tests</module>
     <module>clients</module>
     <module>containers</module>
-    <module>load-tests</module>
   </modules>
 
   <scm>