7:45 a.m.
Author: ropalka
Date: 2012-02-17 08:45:53 -0500 (Fri, 17 Feb 2012)
New Revision: 15683
Removed:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
Log:
remove AS6 support
Deleted: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2012-02-17
13:45:17 UTC (rev 15682)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2012-02-17
13:45:53 UTC (rev 15683)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
- * as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.wsf.test;
-
-import java.net.URL;
-import java.util.Map;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.jboss.wsf.spi.deployer.Deployer;
-
-/**
- * A JBossWS test helper that deals with test deployment/undeployment, etc.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class DeployerJBoss6 implements Deployer
-{
-
- private static final String MAIN_DEPLOYER =
"jboss.system:service=MainDeployer";
-
- private MBeanServerConnection server;
-
- public DeployerJBoss6()
- {
- this.server = JBossWSTestHelper.getServer();
- }
-
- public void deploy(final URL url) throws Exception
- {
- invokeMainDeployer("deploy", url);
- }
-
- public void undeploy(final URL url) throws Exception
- {
- invokeMainDeployer("undeploy", url);
- }
-
- private void invokeMainDeployer(final String methodName, final URL url) throws
Exception
- {
- server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[]
- {url}, new String[]
- {"java.net.URL"});
- }
-
- @Override
- public void addSecurityDomain(String name, Map<String, String>
authenticationOptions) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void removeSecurityDomain(String name) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
-}
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-02-17
13:45:17 UTC (rev 15682)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-02-17
13:45:53 UTC (rev 15683)
@@ -205,11 +205,6 @@
return JBossWSTestHelper.getServer();
}
- public static boolean isTargetJBoss6()
- {
- return JBossWSTestHelper.isTargetJBoss6();
- }
-
public static boolean isTargetJBoss7()
{
return JBossWSTestHelper.isTargetJBoss7();
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
---
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-17
13:45:17 UTC (rev 15682)
+++
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-17
13:45:53 UTC (rev 15683)
@@ -103,12 +103,6 @@
}
}
- public static boolean isTargetJBoss6()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss6");
- }
-
public static boolean isTargetJBoss7()
{
String target = getIntegrationTarget();
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-17
13:45:17 UTC (rev 15682)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-17
13:45:53 UTC (rev 15683)
@@ -570,7 +570,6 @@
<sysproperty key="test.archive.directory"
value="${tests.output.dir}/test-libs"/>
<sysproperty key="test.classes.directory"
value="${tests.output.dir}/test-classes"/>
<sysproperty key="test.resources.directory"
value="${tests.output.dir}/test-resources"/>
- <sysproperty key="org.jboss.wsf.spi.deployer.Deployer"
value="org.jboss.wsf.test.DeployerJBoss6"/>
<sysproperty key="binary.distribution" value="true"/>
<classpath>
<path refid="tests.client.classpath"/>
@@ -635,7 +634,6 @@
<sysproperty key="test.archive.directory"
value="${tests.output.dir}/test-libs"/>
<sysproperty key="test.classes.directory"
value="${tests.output.dir}/test-classes"/>
<sysproperty key="test.resources.directory"
value="${tests.output.dir}/test-resources"/>
- <sysproperty key="org.jboss.wsf.spi.deployer.Deployer"
value="org.jboss.wsf.test.DeployerJBoss6"/>
<sysproperty key="binary.distribution" value="true"/>
<classpath>
<path refid="tests.client.classpath"/>
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
---
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-02-17
13:45:17 UTC (rev 15682)
+++
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-02-17
13:45:53 UTC (rev 15683)
@@ -58,7 +58,7 @@
port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class);
InitialContext ctx = getInitialContext();
- remote = (StatelessRemote)ctx.lookup(getRemoteEjbJndiName());
+ remote = (StatelessRemote)ctx.lookup("ejb:/jaxws-jbws1841//" +
StatelessBean.class.getSimpleName() + "!" + StatelessRemote.class.getName());
}
}
@@ -92,16 +92,4 @@
assertEquals("Relay4", result);
}
- private static String getRemoteEjbJndiName()
- {
- if (isTargetJBoss6())
- {
- return "/" + StatelessBean.class.getSimpleName() +
"/remote";
- }
- else
- {
- return "ejb:/jaxws-jbws1841//" + StatelessBean.class.getSimpleName()
+ "!" + StatelessRemote.class.getName();
- }
- }
-
}