[jbossws-commits] JBossWS SVN: r15391 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 17 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:35:07 -0500 (Thu, 15 Dec 2011) New Revision: 15391 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ 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/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: [JBWS-3393] Remove support for AS 6 target container 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 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -206,6 +206,21 @@ return JBossWSTestHelper.isTargetJBoss6(); } + public static boolean isTargetJBoss7() + { + return JBossWSTestHelper.isTargetJBoss7(); + } + + public static boolean isTargetJBoss70() + { + return JBossWSTestHelper.isTargetJBoss70(); + } + + public static boolean isTargetJBoss71() + { + return JBossWSTestHelper.isTargetJBoss71(); + } + public static boolean isIntegrationNative() { return JBossWSTestHelper.isIntegrationNative(); 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 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, 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. * @@ -28,15 +28,11 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.util.Hashtable; import java.util.Map; import javax.management.MBeanServerConnection; -import javax.management.ObjectName; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.Service; @@ -44,7 +40,6 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.common.ObjectNameFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployer.Deployer; @@ -54,6 +49,7 @@ * * @author Thomas.Diesler(a)jboss.org * @author ropalka(a)redhat.com + * @author alessio.soldano(a)jboss.com */ public class JBossWSTestHelper { @@ -106,6 +102,24 @@ return target.startsWith("jboss6"); } + public static boolean isTargetJBoss7() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss7"); + } + + public static boolean isTargetJBoss70() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss70"); + } + + public static boolean isTargetJBoss71() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss71"); + } + public static boolean isIntegrationNative() { String vendor = getImplementationVendor(); @@ -176,19 +190,19 @@ } } - @SuppressWarnings("unchecked") public static MBeanServerConnection getServer() { if (server == null) { - if (getIntegrationTarget().startsWith("jboss7")) - { - server = getAS7ServerConnection(); - } - else - { - server = getAS6ServerConnection(); - } + String integrationTarget = getIntegrationTarget(); + if (integrationTarget.startsWith("jboss7")) + { + server = getAS7ServerConnection(); + } + else + { + throw new IllegalStateException("Unsupported target container: " + integrationTarget); + } } return server; } @@ -205,21 +219,6 @@ } } - private static MBeanServerConnection getAS6ServerConnection() - { - Hashtable jndiEnv = null; - try - { - InitialContext iniCtx = new InitialContext(); - jndiEnv = iniCtx.getEnvironment(); - return (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - } - catch (NamingException ex) - { - throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex); - } - } - public static String getIntegrationTarget() { if (integrationTarget == null) @@ -229,36 +228,7 @@ if (integrationTarget == null) throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_JBOSSWS_INTEGRATION_TARGET); - LOGGER.warn("TODO: [JBWS-3211] include AS 7.x into integrationTarget mismatch check"); - if (!integrationTarget.startsWith("jboss7")) - { - // Read the JBoss SpecificationVersion - String jbossVersion = null; - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - if (jbossVersion == null) - throw new IllegalStateException("Cannot obtain jboss version"); - - if (jbossVersion.startsWith("5.1")) - 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 throw new IllegalStateException("Unsupported jboss version: " + jbossVersion); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - - if (integrationTarget.startsWith(jbossVersion) == false) - throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")"); - } + LOGGER.warn("TODO: [JBWS-3211] implement integrationTarget mismatch check for AS 7.x"); } return integrationTarget; 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 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, 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. * @@ -45,6 +45,7 @@ * A test setup that deploys/undeploys archives * * @author Thomas.Diesler(a)jboss.org + * @author alessio.soldano(a)jboss.com * @since 14-Oct-2004 */ public class JBossWSTestSetup extends TestSetup Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -283,23 +283,6 @@ </jar> <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/test-libs/as6"> - <include name="jaxws-jbws1581-pojo.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="jboss-app.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -507,18 +507,7 @@ </classes> </war> - <!-- management-recording.jar --> - <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> + <!-- management-recording-as7.jar --> <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> @@ -528,18 +517,6 @@ <attribute name="Dependencies" value="org.jboss.logging"/> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/management-recording.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/*.xml"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> <!-- saaj-jbws3084 --> <war Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -31,12 +31,6 @@ <target name="tests-prepare" depends="prepare"> <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss600.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> - </condition> - <condition property="jboss.home" value="${jboss610.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> - </condition> <condition property="jboss.home" value="${jboss700.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> </condition> @@ -102,16 +96,8 @@ <mkdir dir="${tests.output.dir}"/> <delete file="${tests.output.dir}/test.log" failonerror="false"/> - <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> - <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <condition property="jboss.server.lib" value="${jboss.home}/common/lib" else="${jboss.server}/lib"> - <available file="${jboss.home}/common/lib"/> - </condition> - <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - <property name="jboss.server.deployers" value="${jboss.server}/deployers"/> - <!-- Java Endorsed --> <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed${path.separator}${jboss.home}/modules/javax/xml/ws/api/main/"> <isset property="jboss.home"/> @@ -130,7 +116,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700,tests-classpath-jboss60"> + <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -141,86 +127,6 @@ </path> </target> - <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60"> - - <path id="integration.target.javac.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-api_1.1_spec.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb-api_3.1_spec.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-jaxr-api_1.0_spec.jar"/> - <pathelement location="${jboss.client}/jboss-logging.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-client.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-common.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-servlet-api_3.0_spec.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - </path> - - <!-- - The 's.client.classpath' contains jars that are available in the target container's client directory. - There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. - - The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="integration.target.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-client.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-common.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/trove.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> - <!-- FIXME jars should be available in the client dir --> - <pathelement location="${jboss.lib}/jboss-classloader.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-kernel.jar"/> - <pathelement location="${jboss.lib}/jboss-reflect.jar"/> - <pathelement location="${jboss.lib}/jboss-system.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-vfs-spi.jar"/> - <pathelement location="${jboss.server.lib}/hibernate-core.jar"/> - <pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests --> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> - </path> - </target> - <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700"> <path id="integration.target.javac.classpath"> @@ -626,7 +532,6 @@ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/> @@ -681,7 +586,6 @@ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -80,7 +80,7 @@ public void testBasicSecuredSLSB() throws Exception { InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup(isTargetJBoss6() ? "ejb/BasicSecuredSLSB" : "ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); OrganizationRemote bean = home.create(); String info = bean.getContactInfo("mafia"); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -52,7 +52,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient" : "ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581EarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581WarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); } public void setUp() throws MalformedURLException Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testMTOM() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testClient() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2527TestCase.class, "", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2527TestCase.class, "", true); } public void test() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -64,8 +64,7 @@ public void testServletAccess() throws Exception { - boolean clCheck = !isTargetJBoss6(); - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=" + clCheck); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=true"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/remote" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -69,7 +69,7 @@ public void testNarrowedRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/home" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); + Object obj = iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); EJB3RemoteInterface ejb3Remote = ejb3Home.create(); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", true); } public void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", true); } public void setUp() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", true); } private SecureEndpoint getPort() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -73,7 +73,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient/remote" : "ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -42,7 +42,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", true); } public void testServletClient() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -153,15 +153,7 @@ assertNotNull(response); assertNotNull(response.getDataHandler().getContent()); - File tmpDir = null; - if (isTargetJBoss6()) - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); - } - else - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); - } + File tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists()); //[JBWS-2834]: windows file delete issue Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -76,11 +76,6 @@ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".bat").exists()); - - if (!isTargetJBoss6()) return; // wsrunclient not available since AS7x - - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".sh").exists()); - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".bat").exists()); } protected void tearDown() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -22,7 +22,6 @@ package org.jboss.test.ws.management.recording; import java.net.URL; -import java.rmi.RMISecurityManager; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -48,27 +47,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testAddCustomProcessor() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -55,27 +55,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testRecording() throws Exception Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -149,13 +149,7 @@ sb.append("project.name=" + projectName + "\n"); sb.append("project.jboss.home=" + jbossHome.replace('\\', '/') + "\n"); sb.append("project.type=jar\n"); - if (isTargetJBoss6()) { - sb.append("project.jboss.conf=default\n"); - } - else - { - sb.append("project.jboss.conf=standalone\n"); - } + sb.append("project.jboss.conf=standalone\n"); sb.append("workspace.home=" + binDistroDir.getAbsolutePath().replace('\\', '/') + "\n"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); out.write(sb.toString());