[jbossws-commits] JBossWS SVN: r9104 - framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

Author: alessio.soldano(a)jboss.com Date: 2009-01-23 05:48:57 -0500 (Fri, 23 Jan 2009) New Revision: 9104 Modified: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java Log: [JBWS-2482] Running WSConsumerTestCase.testTarget() in binary distro mode only Modified: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-01-23 10:41:44 UTC (rev 9103) +++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-01-23 10:48:57 UTC (rev 9104) @@ -57,6 +57,8 @@ protected void setupClasspath() throws Exception { String classpath = System.getProperty("surefire.test.class.path"); + if (classpath == null) //no maven surefire classpath hacks required + return; List<URL> jarURLs = new LinkedList<URL>(); StringBuffer jarURLString = new StringBuffer(); List<URL> classDirUrls = new LinkedList<URL>(); Modified: framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-01-23 10:41:44 UTC (rev 9103) +++ framework/branches/jaxws21/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-01-23 10:48:57 UTC (rev 9104) @@ -265,13 +265,13 @@ consumer.setGenerateSource(true); consumer.setTarget("2.1"); consumer.setNoCompile(false); - - if (isIntegrationNative()) + + //this test is run in binary distribution mode only because the way Maven builds classpath doesn't allow to run the + //wsimport tool in Native stack from a Surefire test (the jaxws classes are of course loaded from the included + //jaxws source module and that causes the Sun's ParallelWorldClassLoader to throw an exception as EndpointReference + //is not loaded from a jar resource) + if (Boolean.getBoolean("binary.distribution")) { - System.out.println("FIXME [JBWS-] Fix WSConsumerPlugin.testTarget() classloading issue"); - } - else - { consumeWSDL(); ClassLoader loader = getArtefactClassLoader(); Class<?> service = loader.loadClass("org.jboss.test.ws.tools.testTarget.TestService");