Author: alessio.soldano(a)jboss.com Date: 2012-06-15 14:35:03 -0400 (Fri, 15 Jun 2012) New Revision: 423 Modified: core/trunk/core/pom.xml core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java core/trunk/core/src/test/resources/test-log4j.xml core/trunk/pom.xml Log: [WISE-174] Initial updates for moving to JBossWS 4 Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/pom.xml 2012-06-15 18:35:03 UTC (rev 423) @@ -65,16 +65,6 @@ </dependency> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </dependency> - - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency> @@ -106,6 +96,11 @@ </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <scope>runtime</scope> Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2012-06-15 18:35:03 UTC (rev 423) @@ -28,7 +28,6 @@ import java.util.List; import net.jcip.annotations.ThreadSafe; -import org.apache.tools.ant.taskdefs.Length.When; import org.jboss.wise.core.client.WSDynamicClient; import org.jboss.wise.core.client.WSMethod; import org.jboss.wise.core.exception.WiseRuntimeException; Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java 2012-06-15 18:35:03 UTC (rev 423) @@ -25,16 +25,14 @@ import java.io.InputStream; import java.net.ConnectException; import java.net.HttpURLConnection; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; -import sun.misc.BASE64Encoder; - import org.apache.commons.lang.StringUtils; import org.jboss.wise.core.exception.WiseRuntimeException; -import org.jboss.ws.core.utils.JarUrlConnection; +import org.jboss.ws.common.utils.JarUrlConnection; +import sun.misc.BASE64Encoder; + /** * * @author alessio.soldano(a)jboss.com Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2012-06-15 18:35:03 UTC (rev 423) @@ -46,10 +46,10 @@ import org.jboss.logging.Logger; import org.jboss.wise.core.utils.IDGenerator; -import org.jboss.ws.Constants; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.common.IOUtils; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.DOMUtils; +import org.jboss.ws.common.DOMWriter; +import org.jboss.ws.common.IOUtils; import org.w3c.dom.Element; import org.xml.sax.EntityResolver; Modified: core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-06-15 18:35:03 UTC (rev 423) @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; import org.jboss.wise.core.consumer.WSConsumer; import org.jboss.wise.core.exception.WiseRuntimeException; -import org.jboss.wsf.spi.tools.WSContractConsumer; +import org.jboss.ws.api.tools.WSContractConsumer; /** * @author alessio.soldano(a)jboss.com Modified: core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java =================================================================== --- core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java 2012-06-15 18:35:03 UTC (rev 423) @@ -27,7 +27,6 @@ import java.net.URL; import javax.management.ObjectName; import org.apache.log4j.Logger; -import org.jboss.wsf.test.JBossWSTestHelper; /** * Wise test base class. Subclass can use the methods in this class to @@ -46,8 +45,9 @@ * @param url url for webservice war * @throws Exception if the deployment is failed */ - public void deployWS(URL url) throws Exception { - JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); + public void deployWS(URL url) throws Exception { + throw new Exception("TODO"); +// JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); } /**Undeploy a webservice @@ -55,7 +55,8 @@ * @throws Exception if undeployment is failed */ public void undeployWS(URL url) throws Exception { - JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); + throw new Exception("TODO"); +// JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); } /**Get the URL path for a given webservice archive. It will find this war file under ${baseDir}/build/test-ws-archive @@ -81,16 +82,19 @@ * @return http://server-hostname:port */ public String getServerHostAndPort() { - return "http://" + JBossWSTestHelper.getServerHost() + ":" + getServerPort(); + Logger.getLogger(this.getClass()).warn("TODO!! implement getServerHostAndPort()"); + //return "http://" + JBossWSTestHelper.getServerHost() + ":" + getServerPort(); + return null; } /**Get the web service server port * @return webservice server configured port */ public String getServerPort() { - + Logger.getLogger(this.getClass()).warn("TODO!! implement getServerPort()"); try { - return JBossWSTestHelper.getServer().getAttribute(new ObjectName(WS_SERVER_CONFIG), "WebServicePort").toString(); +// return JBossWSTestHelper.getServer().getAttribute(new ObjectName(WS_SERVER_CONFIG), "WebServicePort").toString(); + return "8080"; } catch (Exception e) { logger.warn("WARNING: Failed to get server port; using default 8080"); return "8080"; Modified: core/trunk/core/src/test/resources/test-log4j.xml =================================================================== --- core/trunk/core/src/test/resources/test-log4j.xml 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/core/src/test/resources/test-log4j.xml 2012-06-15 18:35:03 UTC (rev 423) @@ -5,7 +5,7 @@ debug="false"> <appender name="FILE" class="org.apache.log4j.FileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/> <param name="File" value="target/test.log"/> <param name="Append" value="false"/> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2012-06-15 17:24:25 UTC (rev 422) +++ core/trunk/pom.xml 2012-06-15 18:35:03 UTC (rev 423) @@ -47,7 +47,7 @@ <surefire.usefile>false</surefire.usefile> <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags> <checkstyle.extension /> - <cxf.version>2.2.9</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf --> + <cxf.version>2.4.6</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf --> <compiler.fork>false</compiler.fork> </properties> @@ -128,38 +128,26 @@ <dependency> <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <version>2.2.0.CR1</version> + <artifactId>jboss-logging</artifactId> + <version>3.1.0.GA</version> </dependency> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <version>2.2.0.CR1</version> - </dependency> - - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> - <version>1.3.0.GA</version> + <version>2.0.2.GA</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> - <version>1.3.0.GA</version> + <version>2.0.3.GA</version> </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>3.3.1.GA</version> - </dependency> - - <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>3.3.1.GA</version> + <version>4.0.2.GA</version> </dependency> <dependency> @@ -198,6 +186,11 @@ <version>1.6.2</version> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> <dependency> <groupId>xalan</groupId>