Author: richard.opalka(a)jboss.com Date: 2009-04-20 02:25:40 -0400 (Mon, 20 Apr 2009) New Revision: 9835 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-2612] removing AS 4x support Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-04-15 09:48:25 UTC (rev 9834) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-04-20 06:25:40 UTC (rev 9835) @@ -53,7 +53,7 @@ * Base class for JBossWS test cases * * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 + * @author ropalka(a)redhat.com */ public abstract class JBossWSTest extends TestCase { @@ -202,11 +202,6 @@ return delegate.isTargetJBoss5(); } - public boolean isTargetJBoss5OrGreater() - { - return delegate.isTargetJBoss5OrGreater(); - } - public boolean isTargetJBoss51() { return delegate.isTargetJBoss51(); @@ -217,19 +212,19 @@ return delegate.isTargetJBoss50(); } - public boolean isTargetJBoss4() + public boolean isTargetJBoss6() { - return delegate.isTargetJBoss4(); + return delegate.isTargetJBoss6(); } - - public boolean isTargetJBoss42() + + public boolean isTargetJBoss61() { - return delegate.isTargetJBoss42(); + return delegate.isTargetJBoss61(); } - public boolean isTargetJBoss40() + public boolean isTargetJBoss60() { - return delegate.isTargetJBoss40(); + return delegate.isTargetJBoss60(); } public boolean isIntegrationNative() Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-04-15 09:48:25 UTC (rev 9834) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-04-20 06:25:40 UTC (rev 9835) @@ -42,7 +42,7 @@ * A JBossWS test helper that deals with test deployment/undeployment, etc. * * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 + * @author ropalka(a)redhat.com */ public class JBossWSTestHelper { @@ -95,38 +95,25 @@ return target.startsWith("jboss51"); } - /** True, if -Djbossws.integration.target=jboss4x */ - public boolean isTargetJBoss4() + /** True, if -Djbossws.integration.target=jboss6x */ + public boolean isTargetJBoss6() { - return isTargetJBoss42() || isTargetJBoss40(); + return isTargetJBoss61() || isTargetJBoss60(); } - - /** True, if -Djbossws.integration.target=jboss42x */ - public boolean isTargetJBoss42() + + /** True, if -Djbossws.integration.target=jboss60x */ + public boolean isTargetJBoss60() { String target = getIntegrationTarget(); - return target.startsWith("jboss42"); + return target.startsWith("jboss60"); } - /** True, if -Djbossws.integration.target=jboss40x */ - public boolean isTargetJBoss40() + /** True, if -Djbossws.integration.target=jboss61x */ + public boolean isTargetJBoss61() { String target = getIntegrationTarget(); - return target.startsWith("jboss40"); + return target.startsWith("jboss61"); } - - /** True, if -Djbossws.integration.target=jboss6x */ - public boolean isTargetJBoss6() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss6"); - } - - /** True, if -Djbossws.integration.target=jboss5x */ - public boolean isTargetJBoss5OrGreater() - { - return isTargetJBoss5() || isTargetJBoss6(); - } public boolean isIntegrationNative() { @@ -236,12 +223,10 @@ jbossVersion = "jboss51"; else if (jbossVersion.startsWith("5.0")) jbossVersion = "jboss50"; + else if (jbossVersion.startsWith("6.1")) + jbossVersion = "jboss61"; else if (jbossVersion.startsWith("6.0")) jbossVersion = "jboss60"; - else if (jbossVersion.startsWith("4.2")) - jbossVersion = "jboss42"; - else if (jbossVersion.startsWith("4.0")) - jbossVersion = "jboss40"; else throw new IllegalStateException("Unsupported jboss version: " + jbossVersion); } catch (Exception ex) @@ -252,6 +237,7 @@ if (integrationTarget.startsWith(jbossVersion) == false) throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")"); } + return integrationTarget; }