Author: alessio.soldano(a)jboss.com Date: 2013-04-29 10:32:18 -0400 (Mon, 29 Apr 2013) New Revision: 17520 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3627] JBoss AS -> WildFly 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 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-04-29 14:32:18 UTC (rev 17520) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2013, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -40,7 +40,6 @@ import javax.xml.ws.Service.Mode; import javax.xml.ws.soap.SOAPBinding; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployer.Deployer; @@ -54,8 +53,6 @@ */ public class JBossWSTestHelper { - private static final Logger LOGGER = Logger.getLogger(JBossWSTestHelper.class); - private static final String SYSPROP_JBOSSWS_INTEGRATION_TARGET = "jbossws.integration.target"; private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; @@ -145,16 +142,28 @@ return target.startsWith("jboss72"); } + @Deprecated public static boolean isTargetJBoss8() { + return isTargetJBoss8(); + } + + public static boolean isTargetWildFly8() + { String target = getIntegrationTarget(); - return target.startsWith("jboss8"); + return target.startsWith("wildfly8"); } + @Deprecated public static boolean isTargetJBoss80() { + return isTargetWildFly80(); + } + + public static boolean isTargetWildFly80() + { String target = getIntegrationTarget(); - return target.startsWith("jboss80"); + return target.startsWith("wildfly80"); } public static boolean isIntegrationNative() @@ -191,11 +200,6 @@ return obj; } - private static String getImplementationPackage() - { - return getImplementationObject().getClass().getPackage().getName(); - } - /** * Get the JBoss server host from system property "jboss.bind.address" * This defaults to "localhost" @@ -240,7 +244,7 @@ if (server == null) { String integrationTarget = getIntegrationTarget(); - if (integrationTarget.startsWith("jboss7") || integrationTarget.startsWith("jboss8")) + if (integrationTarget.startsWith("jboss7") || integrationTarget.startsWith("wildfly8") || integrationTarget.startsWith("jboss8")) { server = getAS7ServerConnection(integrationTarget); } @@ -361,9 +365,9 @@ getDeployer().removeSecurityDomain(name); } - public static void addHttpsConnector(Map<String, String> sslOptions) throws Exception + public static void addHttpsConnector(Map<String, String> options) throws Exception { - getDeployer().addHttpsConnector(sslOptions); + getDeployer().addHttpsConnector(options); } public static void removeHttpsConnector() throws Exception Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2013-04-29 14:32:18 UTC (rev 17520) @@ -64,7 +64,7 @@ private ClassLoader originalClassLoader; private Map<String, Map<String, String>> securityDomains; private boolean defaultSecurityDomainRequirement = false; - private Map<String, String> httpsConnSslOptions; + private Map<String, String> httpsConnOptions; private CleanupOperation cleanupOp; public JBossWSTestSetup(Class<?> testClass, String archiveList) @@ -211,8 +211,8 @@ log.warn("Could not add default security domain!", e); } } - if (httpsConnSslOptions != null) { - JBossWSTestHelper.addHttpsConnector(httpsConnSslOptions); + if (httpsConnOptions != null) { + JBossWSTestHelper.addHttpsConnector(httpsConnOptions); } List<URL> clientJars = new ArrayList<URL>(); @@ -308,7 +308,7 @@ { JBossWSTestHelper.removeSecurityDomain(JBOSSWS_SEC_DOMAIN); } - if (httpsConnSslOptions != null) + if (httpsConnOptions != null) { JBossWSTestHelper.removeHttpsConnector(); } @@ -338,7 +338,7 @@ this.defaultSecurityDomainRequirement = defaultSecurityDomainRequirement; } - public void setHttpsConnectorRequirement(Map<String, String> sslOptions) { - httpsConnSslOptions = sslOptions; + public void setHttpsConnectorRequirement(Map<String, String> options) { + httpsConnOptions = options; } } Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-28 07:35:00 UTC (rev 17519) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-29 14:32:18 UTC (rev 17520) @@ -40,8 +40,8 @@ <condition property="jboss.home" value="${jboss720.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </condition> - <condition property="jboss.home" value="${jboss800.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss800"/> + <condition property="jboss.home" value="${wildfly800.home}"> + <equals arg1="${jbossws.integration.target}" arg2="wildfly800"/> </condition> <!-- Verify required properties that must be set before this file is imported --> @@ -120,7 +120,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-jboss80x"> + <target name="tests-classpath" depends="tests-classpath-jboss71x,tests-classpath-jboss72x,tests-classpath-wildfly80x"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -459,7 +459,7 @@ </path> </target> - <target name="tests-classpath-jboss80x" depends="tests-prepare" if="jbossws.integration.jboss80x"> + <target name="tests-classpath-wildfly80x" depends="tests-prepare" if="jbossws.integration.wildfly80x"> <!-- Java Endorsed --> <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">