modules/plugins/jboss-as-7/pom.xml
| 16 ++++++++++
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
| 1
2 files changed, 17 insertions(+)
New commits:
commit 8f9015478b2fe9855111d0d4f0dce1c2dbb62cd1
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu May 31 21:05:14 2012 -0400
add support for running AS7 itests against EAP 6.0 CR1
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 31a4c3b..e9f877a 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -319,6 +319,22 @@
</properties>
</profile>
+ <profile>
+ <id>eap600CR1.itest.setup</id>
+
+ <activation>
+ <property>
+ <name>as7.version</name>
+ <value>6.0.0.CR1</value>
+ </property>
+ </activation>
+
+ <properties>
+ <as7.url>Please set the as7.url system property to the location of the EAP
${as7.version} distribution zipfile.</as7.url>
+
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
+ </properties>
+ </profile>
+
<!-- Activate this profile to run the integration tests (these can take a while to
complete). -->
<!-- activate with -Das7.itest. See also
http://rhq-project.org/display/RHQ/Notes#Notes-IntegrationTests -->
<profile>
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
index 0ce32c7..a1e26e2 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java
@@ -67,6 +67,7 @@ public abstract class AbstractServerComponentTest extends
AbstractJBossAS7Plugin
EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER6",
"7.1.1.Final-redhat-1");
EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER7",
"7.1.1.Final-redhat-1");
EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.ER8",
"7.1.2.Final-redhat-1");
+ EAP6_VERSION_TO_AS7_VERSION_MAP.put("6.0.0.CR1",
"7.1.2.Final-redhat-1");
}
private static final String RELEASE_VERSION_TRAIT_NAME =
"_skm:release-version";