Author: richard.opalka(a)jboss.com Date: 2008-12-11 05:14:55 -0500 (Thu, 11 Dec 2008) New Revision: 8858 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: adding support for jboss51x - sync with QA branch Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:08:28 UTC (rev 8857) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 10:14:55 UTC (rev 8858) @@ -139,11 +139,26 @@ return JBossWSTestHelper.getServer(); } + public boolean isTargetJBoss5() + { + return isTargetJBoss51() || isTargetJBoss50(); + } + + public boolean isTargetJBoss51() + { + return delegate.isTargetJBoss51(); + } + public boolean isTargetJBoss50() { return delegate.isTargetJBoss50(); } + public boolean isTargetJBoss4() + { + return isTargetJBoss42() || isTargetJBoss40(); + } + public boolean isTargetJBoss42() { return delegate.isTargetJBoss42(); Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:08:28 UTC (rev 8857) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 10:14:55 UTC (rev 8858) @@ -82,6 +82,13 @@ return target.startsWith("jboss50"); } + /** True, if -Djbossws.integration.target=jboss51x */ + public boolean isTargetJBoss51() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss51"); + } + /** True, if -Djbossws.integration.target=jboss42x */ public boolean isTargetJBoss42() { @@ -200,7 +207,9 @@ if (jbossVersion == null) throw new IllegalStateException("Cannot obtain jboss version"); - if (jbossVersion.startsWith("5.0")) + if (jbossVersion.startsWith("5.1")) + jbossVersion = "jboss51"; + else if (jbossVersion.startsWith("5.0")) jbossVersion = "jboss50"; else if (jbossVersion.startsWith("4.2")) jbossVersion = "jboss42";