[jbossws-commits] JBossWS SVN: r14770 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2011-07-28 09:29:24 -0400 (Thu, 28 Jul 2011) New Revision: 14770 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java Log: Fixing wsconsumer testcase failure with native bindist against AS7 due to missing tools.jar in classpath Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-28 11:13:40 UTC (rev 14769) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-07-28 13:29:24 UTC (rev 14770) @@ -312,6 +312,7 @@ <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> <include name="xnio-nio-*.jar"/> </fileset> + <pathelement location="${tools.jar}"/> </path> </target> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-07-28 11:13:40 UTC (rev 14769) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-07-28 13:29:24 UTC (rev 14770) @@ -117,9 +117,9 @@ // as changing the current classloader results in a log4j configuration coming from thirdparty lib being used. jarFirstClasspath.addAll(jarURLs); jarFirstClasspath.addAll(classDirUrls); + this.origClassLoader = Thread.currentThread().getContextClassLoader(); URLClassLoader jarFirstClassLoader = new URLClassLoader(jarFirstClasspath.toArray( new URL[] {}), this.origClassLoader); - this.origClassLoader = Thread.currentThread().getContextClassLoader(); URL log4jXmlUrl = this.origClassLoader.getResource("log4j.xml"); this.origLog4jConf = System.getProperty(LOG4J_CONF);