Author: asoldano Date: 2014-03-31 09:26:10 -0400 (Mon, 31 Mar 2014) New Revision: 18549 Removed: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties stack/cxf/trunk/modules/testsuite/src/test/resources/jboss720/ stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly800/ stack/cxf/trunk/modules/testsuite/src/test/resources/wildfly801/ Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java Log: [JBWS-3784] Removing appclient-ws.xml usage Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-03-31 13:26:10 UTC (rev 18549) @@ -44,15 +44,6 @@ <!-- Verify required properties that must be set before this file is imported --> <fail message="Tests output dir not set." unless="tests.output.dir"/> - <!-- appclient patch --> - <copy - file="${basedir}/tests/etc/appclient/${jbossws.integration.target}/appclient-ws.xml" - tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" - failonerror="false" - overwrite="true" - verbose="true" - /> - <!-- Verify availabililty of tools.jar --> <condition property="tools.jar" value="${java.home}/lib/tools.jar"> <available file="${java.home}/lib/tools.jar"/> Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549) @@ -1,7 +0,0 @@ -java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory -java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client -java.naming.provider.url=remote://@jboss.bind.address@:4448 -jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549) @@ -1,7 +0,0 @@ -java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory -java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client -java.naming.provider.url=remote://@jboss.bind.address@:4448 -jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-03-31 13:26:10 UTC (rev 18549) @@ -94,24 +94,6 @@ </target> </configuration> </execution> - <execution> - <id>appclient-patch</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy - file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" - tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </target> - </configuration> - </execution> </executions> </plugin> <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run --> Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2014-03-31 13:26:10 UTC (rev 18549) @@ -1,7 +0,0 @@ -java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory -java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client -java.naming.provider.url=remote://@jboss.bind.address@:4448 -jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_CORE_THREADS=1 -jboss.naming.client.endpoint.create.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4 Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2014-03-31 13:26:10 UTC (rev 18549) @@ -136,7 +136,7 @@ ap.output = new ByteArrayOutputStream(); final List<String> args = new LinkedList<String>(); args.add(appclientScript); - String appclientConfigName = System.getProperty("APPCLIENT_CONFIG_NAME", "appclient-ws.xml"); + String appclientConfigName = System.getProperty("APPCLIENT_CONFIG_NAME", "appclient.xml"); String configArg = "--appclient-config=" + appclientConfigName; args.add(configArg); args.add(appclientFullName); Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-03-28 10:59:46 UTC (rev 18548) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-03-31 13:26:10 UTC (rev 18549) @@ -284,16 +284,6 @@ return env; } - /** Gets the appclient remote env context. - * Every test calling this method have to ensure InitialContext.close() - * method is called at end of test to clean up all associated caches. - */ - public static InitialContext getAppclientInitialContext() throws NamingException, IOException - { - final Hashtable<String, String> env = getEnvironment("appclient.jndi.properties"); - return new InitialContext(env); - } - /** Get the server remote env context * Every test calling this method have to ensure InitialContext.close() * method is called at end of test to clean up all associated caches.