cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r513698 - in /incubator/cxf/trunk/tools2: javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/ wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/ wsdlto/core/src/test...
Date Fri, 02 Mar 2007 10:50:10 GMT
Author: mmao
Date: Fri Mar  2 02:50:08 2007
New Revision: 513698

URL: http://svn.apache.org/viewvc?view=rev&rev=513698
Log:
CXF-308 - search/find the plugins automatically
 * Load default frontend and databinding only from the start point(WSDLToJava), 
   the container should throws exception if it can not find frontend and databinding from
the context.
 * Load all the plugins from the classpath automatically
 * Divide the cxf-tools-plugin.xml into two pieces, one for jaxws frontend, one for jaxb databinding,
so these two module can be moved to rt if it is necessary.

Added:
    incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
    incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/hello_world.wsdl
    incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/
    incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/
    incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
Removed:
    incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/cxf-tools-plugin.xml
    incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
Modified:
    incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
    incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
    incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
    incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
    incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
    incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
    incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java

Modified: incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
Fri Mar  2 02:50:08 2007
@@ -61,7 +61,7 @@
         classFile.mkdir();
         System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath()
                                               + File.separatorChar);
-        wj2Processor = new JAXWSContainer(toolspec);
+        wj2Processor = new JAXWSContainer(null);
     }
 
     public void tearDown() {

Modified: incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
(original)
+++ incubator/cxf/trunk/tools2/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ProcessorTestBase.java
Fri Mar  2 02:50:08 2007
@@ -28,6 +28,9 @@
 
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
+import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
+import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 
 public class ProcessorTestBase extends TestCase {
 
@@ -40,6 +43,8 @@
         output = new File(url.getFile());
         output = new File(output, "/resources");
         mkDir(output);
+        env.put(FrontEndProfile.class, PluginLoader.getInstance().getFrontEndProfile("jaxws"));
+        env.put(DataBindingProfile.class, PluginLoader.getInstance().getDataBindingProfile("jaxb"));
       
     }
 
     public void tearDown() {

Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
Fri Mar  2 02:50:08 2007
@@ -27,3 +27,5 @@
 
 
 
+FOUND_NO_DATABINDING = Can not find databinding
+FOUND_NO_FRONTEND = Can not find frontend
\ No newline at end of file

Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Fri Mar  2 02:50:08 2007
@@ -58,7 +58,6 @@
 import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
-import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 
     
@@ -97,22 +96,14 @@
             FrontEndProfile frontend = context.get(FrontEndProfile.class);
             
             if (frontend == null) {
-                String name = WSDLToJava.DEFAULT_FRONTEND_NAME;
-                if (context.get(ToolConstants.CFG_FRONTEND) != null) {
-                    name = (String)context.get(ToolConstants.CFG_FRONTEND);
-                }
-                frontend = PluginLoader.getInstance().getFrontEndProfile(name);
-                context.put(FrontEndProfile.class, frontend);
+                Message msg = new Message("FOUND_NO_FRONTEND", LOG);
+                throw new ToolException(msg);
             }
             
             DataBindingProfile dataBindingProfile = context.get(DataBindingProfile.class);
             if (dataBindingProfile == null) {
-                String name = WSDLToJava.DEFAULT_DATABINDING_NAME;
-                if (context.get(ToolConstants.CFG_DATABINDING) != null) {
-                    name = (String)context.get(ToolConstants.CFG_DATABINDING);
-                }
-                dataBindingProfile = PluginLoader.getInstance().getDataBindingProfile(name);
-                context.put(DataBindingProfile.class, dataBindingProfile);
+                Message msg = new Message("FOUND_NO_DATABINDING", LOG);
+                throw new ToolException(msg);
             }
             
             WSDLConstants.WSDLVersion version = getWSDLVersion();

Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
Fri Mar  2 02:50:08 2007
@@ -17,4 +17,8 @@
 DATABINDING_MISSING_NAME = Databinding must have a name, can not load THIS databinding from
<{0}> plugin.
 LOAD_CONTAINER_CLASS_FAILED = Tools can not load the container class : {0}
 NO_SERVICE_IN_DEFINITION = There is no service in this wsdl : {0}
-CAN_NOT_FIND_SERVICE = Can not find the service : {0} in wsdl :{1}
\ No newline at end of file
+CAN_NOT_FIND_SERVICE = Can not find the service : {0} in wsdl :{1}
+
+FOUND_NO_PLUGINS = WSDLTo tools can not find any plugins defined in the classpath.
+LOAD_PLUGIN_EXCEPTION = IOException during loading plugins
+PLUGIN_FILE_NOT_FOUND = Plugin file {0} can not be found
\ No newline at end of file

Modified: incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
Fri Mar  2 02:50:08 2007
@@ -19,11 +19,20 @@
 
 package org.apache.cxf.tools.wsdlto.core;
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -43,7 +52,8 @@
 public final class PluginLoader {
     public static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
     private static PluginLoader pluginLoader;
-    private static final String DEFAULT_PLUGIN = "/org/apache/cxf/tools/wsdlto/core/cxf-tools-plugin.xml";
+    //private static final String DEFAULT_PLUGIN = "/org/apache/cxf/tools/wsdlto/core/cxf-tools-plugin.xml";
+    private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
     
     private Map<String, Plugin> plugins = new LinkedHashMap<String, Plugin>();
 
@@ -60,13 +70,30 @@
         try {
             JAXBContext jc = JAXBContext.newInstance("org.apache.cxf.tools.plugin");
             unmarshaller = jc.createUnmarshaller();
+            loadPlugins(getClass().getClassLoader().getResources(PLUGIN_FILE_NAME));
         } catch (JAXBException e) {
             LOG.log(Level.SEVERE, "JAXB_CONTEXT_INIT_FAIL");
             Message msg = new Message("JAXB_CONTEXT_INIT_FAIL", LOG);
             throw new ToolException(msg);            
+        } catch (IOException ioe) {
+            Message msg = new Message("LOAD_PLUGIN_EXCEPTION", LOG);
+            LOG.log(Level.SEVERE, msg.toString());
+            throw new ToolException(msg);            
         }
 
-        loadPlugin(DEFAULT_PLUGIN);
+
+        //loadPlugin(DEFAULT_PLUGIN);
+    }
+
+    private void loadPlugins(Enumeration<URL> pluginFiles) throws IOException {
+        if (pluginFiles == null) {
+            LOG.log(Level.INFO, "FOUND_NO_PLUGINS");
+            return;
+        }
+
+        while (pluginFiles.hasMoreElements()) {
+            loadPlugin(pluginFiles.nextElement());
+        }
     }
 
     public static PluginLoader getInstance() {
@@ -76,6 +103,17 @@
         return pluginLoader;
     }
 
+    public void loadPlugin(URL url) throws IOException {
+        try {
+            LOG.log(Level.INFO, "PLUGIN_LOADING", url);
+            loadPlugin(getPlugin(url));
+        } catch (JAXBException e) {
+            Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, url);
+            LOG.log(Level.SEVERE, msg.toString());
+            throw new ToolException(msg, e);
+        }
+    }
+
     public void loadPlugin(String resource) {
         try {
             LOG.log(Level.INFO, "PLUGIN_LOADING", resource);
@@ -84,7 +122,12 @@
             LOG.log(Level.SEVERE, "PLUGIN_LOAD_FAIL", resource);
             Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, resource);
             throw new ToolException(msg, e);
+        } catch (FileNotFoundException fe) {
+            Message msg = new Message("PLUGIN_FILE_NOT_FOUND", LOG, resource);
+            LOG.log(Level.SEVERE, msg.toString());
+            throw new ToolException(msg, fe);
         }
+
     }
     
     protected void loadPlugin(Plugin plugin) {
@@ -110,10 +153,35 @@
         }
     }
 
-    protected Plugin getPlugin(String resource) throws JAXBException {
+    protected Plugin getPlugin(URL url) throws IOException, JAXBException, FileNotFoundException
{
+        Plugin plugin = plugins.get(url.getFile());
+        InputStream is = null;
+        if (plugin == null) {
+            is = url.openStream();
+            plugin = getPlugin(is);
+            if (plugin == null || StringUtils.isEmpty(plugin.getName())) {
+                Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, url);
+                LOG.log(Level.SEVERE, msg.toString());
+                throw new ToolException(msg);
+            }
+            plugins.put(url.getFile(), plugin);
+        }        
+        if (is == null) {
+            return getPlugin(url.getFile());
+        }
+        return plugin;
+    }
+    
+    protected Plugin getPlugin(String resource) throws JAXBException, FileNotFoundException
{
         Plugin plugin = plugins.get(resource);
         if (plugin == null) {
-            InputStream is = getClass().getResourceAsStream(resource);
+            InputStream is = null;
+            if (new File(resource).exists()) {
+                is = new BufferedInputStream(new FileInputStream(new File(resource)));
+            } else {
+                is = getClass().getResourceAsStream(resource);                
+            }
+
             if (is == null) {
                 LOG.log(Level.SEVERE, "PLUGIN_MISSING", resource);
                 Message msg = new Message("PLUGIN_MISSING", LOG, resource);

Added: incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java?view=auto&rev=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
(added)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
Fri Mar  2 02:50:08 2007
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.tools.wsdlto;
+
+import junit.framework.TestCase;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.common.ToolException;
+
+public class WSDLToJavaContainerTest extends TestCase {
+    public void testNoPlugin() throws Exception {
+        WSDLToJavaContainer container = new WSDLToJavaContainer("dummy", null);
+
+        ToolContext context = new ToolContext();
+        context.put(ToolConstants.CFG_WSDLURL, getLocation("hello_world.wsdl"));
+        container.setContext(context);
+        
+        try {
+            container.execute();
+        } catch (ToolException te) {
+            assertEquals(getLogMessage("FOUND_NO_FRONTEND"), te.getMessage());
+        } catch (Exception e) {
+            fail("Should not throw any exception but ToolException.");
+        }
+    }
+
+    private String getLocation(String wsdlFile) {
+        return this.getClass().getResource(wsdlFile).getFile();
+    }
+
+    protected String getLogMessage(String key, Object...params) {
+        return new Message(key, WSDLToJavaContainer.LOG, params).toString();
+    }
+}

Added: incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/hello_world.wsdl?view=auto&rev=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/hello_world.wsdl
(added)
+++ incubator/cxf/trunk/tools2/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/hello_world.wsdl
Fri Mar  2 02:50:08 2007
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		  xmlns:tns="http://apache.org/hello_world_soap_http"
+		  xmlns:x1="http://apache.org/hello_world_soap_http/types"
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		  targetNamespace="http://apache.org/hello_world_soap_http" name="HelloWorld">
+    <wsdl:types>
+	<schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:x1="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+	    <element name="sayHi">
+		<complexType/>
+	    </element>
+	    <element name="sayHiResponse">
+		<complexType>
+		    <sequence>
+			<element name="responseType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMe">
+		<complexType>
+		    <sequence>
+			<element name="requestType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMeResponse">
+		<complexType>
+		    <sequence>
+			<element name="responseType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+
+	    <element name="testNillable">
+		<complexType>
+		    <sequence>
+			<element name="NillElem" nillable="true" type="string"/>
+			<element name="intElem" type="int"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="testNillableResponse">
+		<complexType>
+		    <sequence>
+			<element name="responseType" nillable="true" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+
+	    <element name="greetMeLater">
+		<complexType>
+		    <sequence>
+			<element name="requestType" type="long"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMeLaterResponse">
+		<complexType>
+		    <sequence>
+			<element name="responseType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMeSometime">
+		<complexType>
+		    <sequence>
+			<element name="requestType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMeSometimeResponse">
+		<complexType>
+		    <sequence>
+			<element name="responseType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="greetMeOneWay">
+		<complexType>
+		    <sequence>
+			<element name="requestType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="testDocLitFault">
+		<complexType>
+		    <sequence>
+			<element name="faultType" type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="testDocLitFaultResponse">
+		<complexType>
+		    <sequence/>
+		</complexType>
+	    </element>
+	    <complexType name="ErrorCode">
+		<sequence>
+		    <element name="minor" type="short"/>
+		    <element name="major" type="short"/>
+		</sequence>
+	    </complexType>
+	    <element name="NoSuchCodeLit">
+		<complexType>
+		    <sequence>
+			<element name="code" type="x1:ErrorCode"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="BadRecordLit" type="string"/>
+	    <complexType name="BadRecord">
+		<sequence>
+		    <element name="reason" type="string"/>
+		    <element name="code" type="short"/>
+		</sequence>
+	    </complexType>
+	    <complexType name="addNumbers">
+		<sequence>
+		    <element name="arg0" type="int"/>
+		    <element name="arg1" type="int"/>
+		</sequence>
+	    </complexType>
+	    <element name="addNumbers" type="x1:addNumbers"/>
+	    <complexType name="addNumbersResponse">
+		<sequence>
+		    <element name="return" type="int"/>
+		</sequence>
+	    </complexType>
+	    <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
+	    <complexType name="stringStruct">
+		<sequence>
+		    <element name="arg0" type="string"/>
+		    <element name="arg1" type="string"/>
+		</sequence>
+	    </complexType>
+	    <element name="BareDocument" type="string"/>
+	    <element name="BareDocumentResponse">
+		<complexType>
+		    <sequence>
+			<element name="company" type="string"/>
+		    </sequence>
+		    <attribute name="id" type="int"/>
+		</complexType>
+	    </element>      
+	</schema>
+    </wsdl:types>
+    <wsdl:message name="sayHiRequest">
+	<wsdl:part name="in" element="x1:sayHi"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+	<wsdl:part name="out" element="x1:sayHiResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+	<wsdl:part name="in" element="x1:greetMe"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+	<wsdl:part name="out" element="x1:greetMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="testNillableRequest">
+	<wsdl:part name="in" element="x1:testNillable"/>
+    </wsdl:message>
+    <wsdl:message name="testNillableResponse">
+	<wsdl:part name="out" element="x1:testNillableResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeLaterRequest">
+	<wsdl:part name="in" element="x1:greetMeLater"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeLaterResponse">
+	<wsdl:part name="out" element="x1:greetMeLaterResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeSometimeRequest">
+	<wsdl:part name="in" element="x1:greetMeSometime"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeSometimeResponse">
+	<wsdl:part name="out" element="x1:greetMeSometimeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeOneWayRequest">
+	<wsdl:part name="in" element="x1:greetMeOneWay"/>
+    </wsdl:message>
+    <wsdl:message name="testDocLitFaultRequest">
+	<wsdl:part name="in" element="x1:testDocLitFault"/>
+    </wsdl:message>
+    <wsdl:message name="testDocLitFaultResponse">
+	<wsdl:part name="out" element="x1:testDocLitFaultResponse"/>
+    </wsdl:message>
+    <wsdl:message name="NoSuchCodeLitFault">
+	<wsdl:part name="NoSuchCodeLit" element="x1:NoSuchCodeLit"/>
+    </wsdl:message>
+    <wsdl:message name="BadRecordLitFault">
+	<wsdl:part name="BadRecordLit" element="x1:BadRecordLit"/>
+    </wsdl:message>
+    <wsdl:message name="testDocLitBareRequest">
+	<wsdl:part name="in" element="x1:BareDocument"/>
+    </wsdl:message>
+    <wsdl:message name="testDocLitBareResponse">
+	<wsdl:part name="out" element="x1:BareDocumentResponse"/>
+    </wsdl:message> 
+    <wsdl:portType name="Greeter">
+	<wsdl:operation name="sayHi">
+	    <wsdl:input name="sayHiRequest" message="tns:sayHiRequest"/>
+	    <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="greetMe">
+	    <wsdl:input name="greetMeRequest" message="tns:greetMeRequest"/>
+	    <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="testNillable">
+	    <wsdl:input name="testNillableRequest" message="tns:testNillableRequest"/>
+	    <wsdl:output name="testNillableResponse" message="tns:testNillableResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeLater">
+	    <wsdl:input name="greetMeLaterRequest" message="tns:greetMeLaterRequest"/>
+	    <wsdl:output name="greetMeLaterResponse" message="tns:greetMeLaterResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeSometime">
+	    <wsdl:input name="greetMeSometimeRequest" message="tns:greetMeSometimeRequest"/>
+	    <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeOneWay">
+	    <wsdl:input name="greetMeOneWayRequest" message="tns:greetMeOneWayRequest"/>
+	</wsdl:operation>
+	<wsdl:operation name="testDocLitFault">
+	    <wsdl:input name="testDocLitFaultRequest" message="tns:testDocLitFaultRequest"/>
+	    <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"/>
+	    <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"/>
+	    <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"/>
+	</wsdl:operation>
+
+    </wsdl:portType>
+
+    <wsdl:portType name="DocLitBare">
+	<wsdl:operation name="testDocLitBare">
+	    <wsdl:input name="testDocLitBareRequest" message="tns:testDocLitBareRequest"/>
+	    <wsdl:output name="testDocLitBareResponse" message="tns:testDocLitBareResponse"/>
+	</wsdl:operation>       
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+	<wsdl:operation name="sayHi">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMe">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="testNillable">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeLater">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeSometime">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMeOneWay">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	</wsdl:operation>
+	<wsdl:operation name="testDocLitFault">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	    <wsdl:fault name="NoSuchCodeLitFault">
+		<soap:fault name="NoSuchCodeLitFault" use="literal"/>
+	    </wsdl:fault>
+	    <wsdl:fault name="BadRecordLitFault">
+		<soap:fault name="BadRecordLitFault" use="literal"/>
+	    </wsdl:fault>
+	</wsdl:operation>
+
+    </wsdl:binding>
+    <wsdl:binding name="Doc_Lit_Bare_SOAPBinding" type="tns:DocLitBare">
+	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+	<wsdl:operation name="testDocLitBare">
+	    <soap:operation style="document" soapAction="http://apache.org/hello_world_soap_http/testDocLitBare"/>
+	    <wsdl:input name="testDocLitBareRequest">
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output name="testDocLitBareResponse">
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+    </wsdl:binding>
+
+
+    <wsdl:service name="SOAPService">
+	<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+	</wsdl:port>
+
+	<wsdl:port name="SoapPort1" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:7000/SoapContext/SoapPort"/>
+	</wsdl:port>
+    </wsdl:service>
+
+    <wsdl:service name="SOAPProviderService">
+	<wsdl:port name="SoapProviderPort" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9003/SoapContext/SoapProviderPort"/>
+	</wsdl:port>
+    </wsdl:service>
+
+    <wsdl:service name="SOAPDispatchService">
+	<wsdl:port name="SoapDispatchPort" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9006/SOAPDispatchService/SoapDispatchPort"/>
+	</wsdl:port>
+    </wsdl:service>
+
+    <wsdl:service name="SOAPService_DocLitBare">
+	<wsdl:port name="SoapPort2" binding="tns:Doc_Lit_Bare_SOAPBinding">
+	    <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
+	</wsdl:port>
+    </wsdl:service>
+    <wsdl:service name="SOAPServiceAddressingDocLitBare">
+	<wsdl:port name="SoapPort" binding="tns:Doc_Lit_Bare_SOAPBinding">
+	    <soap:address location="http://localhost:7600/SoapContext/SoapPort"/>
+	    <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
+	</wsdl:port>
+    </wsdl:service>
+    <wsdl:service name="SOAPService_Test1">
+	<wsdl:port name="SoapPort_Test1" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9100"/>
+	</wsdl:port>
+	<wsdl:port name="SoapPort_Test2" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9101"/>
+	</wsdl:port>
+    </wsdl:service>
+    <wsdl:service name="SOAPServiceAddressing">
+	<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9008/SoapContext/SoapPort"/>
+	    <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
+	</wsdl:port>
+    </wsdl:service>
+    <wsdl:service name="SOAPServiceConcurrencyTest">
+	<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
+	    <soap:address location="http://localhost:9009/SoapContext/SoapPort"/>
+	</wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
+

Added: incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml?view=auto&rev=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
(added)
+++ incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
Fri Mar  2 02:50:08 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<plugin name="default" version="" provider="" xmlns="http://cxf.apache.org/tools/plugin">
+    <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/>
+</plugin>
\ No newline at end of file

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml?view=auto&rev=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
(added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
Fri Mar  2 02:50:08 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<plugin name="default" version="" provider="" xmlns="http://cxf.apache.org/tools/plugin">
+    <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
+	<container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
+	<processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
+	<builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
+	<generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
+	    <generator name="AntGenerator"/>
+	    <generator name="ClientGenerator"/>
+	    <generator name="FaultGenerator"/>
+	    <generator name="ImplGenerator"/>
+	    <generator name="SEIGenerator"/>
+	    <generator name="ServerGenerator"/>
+	    <generator name="ServiceGenerator"/>
+	</generators>
+    </frontend>
+</plugin>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
Fri Mar  2 02:50:08 2007
@@ -25,6 +25,9 @@
 import java.util.Locale;
 
 import junit.framework.TestCase;
+import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
+import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
+import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 
 /*import org.apache.cxf.tools.common.ProcessorEnvironment;
 import org.apache.cxf.tools.common.ToolException;*/
@@ -40,6 +43,11 @@
         output = new File(url.getFile());
         output = new File(output, "/resources");
         mkDir(output);
+
+        env.put(FrontEndProfile.class, PluginLoader.getInstance().getFrontEndProfile("jaxws"));
+        env.put(DataBindingProfile.class, PluginLoader.getInstance().getDataBindingProfile("jaxb"));
+        env.put(ToolConstants.CFG_IMPL, "impl");
+        env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
     }
 
     public void tearDown() {

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
Fri Mar  2 02:50:08 2007
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import junit.framework.TestCase;
-
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.plugin.DataBinding;
 import org.apache.cxf.tools.plugin.FrontEnd;
@@ -34,7 +33,7 @@
     
     public void testLoadPlugins() throws Exception {
         PluginLoader loader = PluginLoader.getInstance();
-        assertEquals(1, loader.getPlugins().size());
+        assertEquals(2, loader.getPlugins().size());
         assertEquals("default", getPlugin(loader, 0).getName());
 
         Plugin plugin = getPlugin(loader, 0);

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Fri Mar  2 02:50:08 2007
@@ -18,11 +18,11 @@
  */
 package org.apache.cxf.tools.wsdlto.jaxws;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
-
 import javax.jws.WebService;
 
 import org.apache.cxf.tools.common.ProcessorTestBase;
@@ -44,11 +44,8 @@
                                               + File.separatorChar);
         classLoader = AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
         env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
-        
-        env.put(ToolConstants.CFG_IMPL, "impl");
-        env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-        
+
         processor = new JAXWSContainer(null); 
 
     }
@@ -181,7 +178,7 @@
         processor.execute();
         File file = new File(output.getCanonicalPath(), "build.xml");
         FileInputStream fileinput = new FileInputStream(file);
-        java.io.BufferedInputStream filebuffer = new java.io.BufferedInputStream(fileinput);
+        BufferedInputStream filebuffer = new BufferedInputStream(fileinput);
         byte[] buffer = new byte[(int)file.length()];
         filebuffer.read(buffer);
         String content = new String(buffer);

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
Fri Mar  2 02:50:08 2007
@@ -37,8 +37,6 @@
                                               + File.separatorChar);
         classLoader = AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
         env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
-        env.put(ToolConstants.CFG_IMPL, "impl");
-        env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
 
         processor = new JAXWSContainer(null); 

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Fri Mar  2 02:50:08 2007
@@ -51,8 +51,6 @@
                                               + File.separatorChar);
         classLoader = AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
         env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
-        env.put(ToolConstants.CFG_IMPL, "impl");
-        env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
         
         processor = new JAXWSContainer(null); 

Modified: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java?view=diff&rev=513698&r1=513697&r2=513698
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
(original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
Fri Mar  2 02:50:08 2007
@@ -28,7 +28,6 @@
 
     public void setUp() throws Exception {
         super.setUp();
-        env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_VERBOSE, ToolConstants.CFG_VERBOSE);
         //env.put(ToolConstants.CFG_VALIDATE_WSDL, ToolConstants.CFG_VALIDATE_WSDL);
     }



Mime
View raw message