[jbossws-commits] JBossWS SVN: r4637 - stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-09-27 03:15:53 -0400 (Thu, 27 Sep 2007)
New Revision: 4637

Modified:
   stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
Log:
disable support for jax-ws 2.1

Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java	2007-09-26 18:58:20 UTC (rev 4636)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIConsumerImpl.java	2007-09-27 07:15:53 UTC (rev 4637)
@@ -48,7 +48,7 @@
 	private String targetPackage = null;
 	private PrintStream messageStream = null;
 	private String wsdlLocation = null;
-	private List<String> additionalCompilerClassPath = null;
+	private List<String> additionalCompilerClassPath = new ArrayList<String>();
    private String target = "2.0";
 
    @Override
@@ -154,13 +154,27 @@
 		args.add(outputDir.getAbsolutePath());
 
       // Always set the target
+      if(!target.equals("2.0"))
+         throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0");
+      
       args.add("-target");
       args.add(target);
 
       // finally the WSDL file
       args.add(wsdl.toString());
 
-		try
+      // See WsimportTool#compileGeneratedClasses()
+      if(!additionalCompilerClassPath.isEmpty())
+      {
+         StringBuffer javaCP = new StringBuffer();
+         for(String s : additionalCompilerClassPath)
+         {
+            javaCP.append(s).append(File.pathSeparator);
+         }
+         System.setProperty("java.class.path", javaCP.toString());
+      }
+      
+      try
 		{
 			// enforce woodstox
 			if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))