[jbossws-commits] JBossWS SVN: r3825 - in trunk/jbossws-core/src/main: java/org/jboss/ws/tools and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-07-09 12:22:39 -0400 (Mon, 09 Jul 2007)
New Revision: 3825

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
Log:
Cleanup previous merge from branch 2.0

Modified: trunk/jbossws-core/src/main/etc/wsrunclient.bat
===================================================================
--- trunk/jbossws-core/src/main/etc/wsrunclient.bat	2007-07-09 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/etc/wsrunclient.bat	2007-07-09 16:22:39 UTC (rev 3825)
@@ -63,7 +63,6 @@
 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 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/etc/wsrunclient.sh	2007-07-09 16:22:39 UTC (rev 3825)
@@ -58,7 +58,6 @@
 # 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 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/etc/wstools.bat	2007-07-09 16:22:39 UTC (rev 3825)
@@ -35,13 +35,7 @@
 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 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/etc/wstools.sh	2007-07-09 16:22:39 UTC (rev 3825)
@@ -53,13 +53,7 @@
 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 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java	2007-07-09 16:22:39 UTC (rev 3825)
@@ -76,7 +76,6 @@
    {
       String configLocation = null;
       String outputDir = null;
-
 		if(args.length==0)
 		{
 			usage();

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 16:17:39 UTC (rev 3824)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java	2007-07-09 16:22:39 UTC (rev 3825)
@@ -109,9 +109,7 @@
          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);