Author: richard.opalka(a)jboss.com Date: 2008-12-11 07:26:08 -0500 (Thu, 11 Dec 2008) New Revision: 8863 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 JBossAS 510 - 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 12:25:10 UTC (rev 8862) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-12-11 12:26:08 UTC (rev 8863) @@ -141,7 +141,7 @@ public boolean isTargetJBoss5() { - return isTargetJBoss51() || isTargetJBoss50(); + return delegate.isTargetJBoss5(); } public boolean isTargetJBoss51() @@ -156,7 +156,7 @@ public boolean isTargetJBoss4() { - return isTargetJBoss42() || isTargetJBoss40(); + return delegate.isTargetJBoss4(); } public boolean 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 12:25:10 UTC (rev 8862) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-12-11 12:26:08 UTC (rev 8863) @@ -75,6 +75,12 @@ getDeployer().undeploy(url); } + /** True, if -Djbossws.integration.target=jboss5x */ + public boolean isTargetJBoss5() + { + return isTargetJBoss51() || isTargetJBoss50(); + } + /** True, if -Djbossws.integration.target=jboss50x */ public boolean isTargetJBoss50() { @@ -89,6 +95,12 @@ return target.startsWith("jboss51"); } + /** True, if -Djbossws.integration.target=jboss4x */ + public boolean isTargetJBoss4() + { + return isTargetJBoss42() || isTargetJBoss40(); + } + /** True, if -Djbossws.integration.target=jboss42x */ public boolean isTargetJBoss42() {