[jbossws-commits] JBossWS SVN: r3824 - in trunk/jbossws-core/src: main/java/org/jboss/ws/tools and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Jul 9 12:17:39 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-07-09 12:17:39 -0400 (Mon, 09 Jul 2007)
New Revision: 3824
Modified:
trunk/jbossws-core/src/main/etc/wsrunclient.bat
trunk/jbossws-core/src/main/etc/wsrunclient.sh
trunk/jbossws-core/src/main/etc/wstools.bat
trunk/jbossws-core/src/main/etc/wstools.sh
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
Log:
svn merge -r 3458:3463 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r 3474:3482 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r 3486:3504 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat
===================================================================
--- trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/etc/wsrunclient.bat 2007-07-09 16:17:39 UTC (rev 3824)
@@ -63,6 +63,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-remoting.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
rem Execute the JVM
"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS%
:EOF
Modified: trunk/jbossws-core/src/main/etc/wsrunclient.sh
===================================================================
--- trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/etc/wsrunclient.sh 2007-07-09 16:17:39 UTC (rev 3824)
@@ -58,6 +58,7 @@
# Setup the client classpath
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
# JBossAS-5.0 subset of jbossall-client.jar
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-logging-spi.jar"
Modified: trunk/jbossws-core/src/main/etc/wstools.bat
===================================================================
--- trunk/jbossws-core/src/main/etc/wstools.bat 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/etc/wstools.bat 2007-07-09 16:17:39 UTC (rev 3824)
@@ -35,7 +35,13 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
+
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar
+
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar
+set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/concurrent.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
Modified: trunk/jbossws-core/src/main/etc/wstools.sh
===================================================================
--- trunk/jbossws-core/src/main/etc/wstools.sh 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/etc/wstools.sh 2007-07-09 16:17:39 UTC (rev 3824)
@@ -53,7 +53,13 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
+
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/concurrent.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-07-09 16:17:39 UTC (rev 3824)
@@ -82,7 +82,7 @@
usage();
}
- for (int i = 0; i < args.length; i++)
+ for (int i = 0; i < args.length; i++)
{
String arg = args[i];
@@ -117,7 +117,7 @@
}
else
{
- usage();
+ usage();
}
}
@@ -128,16 +128,16 @@
{
System.out.println("Usage: wstools (-classpath|-cp) <classpath> -config <config> [-dest <destination path>]");
System.exit(1);
- }
+ }
- private boolean process(Configuration config, String outputDir) throws IOException
+ private boolean process(Configuration config, String outputDir) throws IOException
{
if (config == null)
throw new IllegalArgumentException("Configuration is null");
-
+
if (outputDir == null)
outputDir = ".";
-
+
ToolsHelper helper = new ToolsHelper();
if (config.getJavaToWSDLConfig(false) != null)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-09 16:17:39 UTC (rev 3824)
@@ -23,19 +23,6 @@
// $Id$
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.ConnectException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
@@ -47,6 +34,18 @@
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.DocumentBuilder;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.ConnectException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* A factory that creates a <code>WSDLDefinitions</code> object from an URL.
*
@@ -110,7 +109,9 @@
String defaultNamespace = getDefaultNamespace(wsdlDoc);
if (Constants.NS_WSDL11.equals(defaultNamespace))
{
+
WSDLFactory wsdlFactory = WSDLFactory.newInstance(JBossWSDLFactoryImpl.class.getName());
+
WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-07-09 11:34:47 UTC (rev 3823)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-07-09 16:17:39 UTC (rev 3824)
@@ -21,27 +21,24 @@
*/
package org.jboss.test.ws.jaxws.jbws1283;
+import junit.framework.Test;
+import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
-import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
-import org.jboss.test.ws.jaxws.jbws1357.JBWS1357;
-import junit.framework.Test;
import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.SOAPException;
-import javax.activation.DataHandler;
import java.net.URL;
-import java.net.HttpURLConnection;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
* Attachment dropped on outbound messages if they have been
More information about the jbossws-commits
mailing list