cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r494369 [2/6] - in /incubator/cxf/trunk/tools2: common/ common/src/main/java/org/apache/cxf/tools/common/ wsdlto/core/ wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/ wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/ wsdlto...
Date Tue, 09 Jan 2007 10:50:52 GMT
Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java Tue Jan  9 02:50:47 2007
@@ -34,6 +34,7 @@
 import org.apache.cxf.tools.common.model.JavaModel;
 import org.apache.cxf.tools.util.ClassCollector;
 
+
 public class FaultProcessor extends AbstractProcessor {
     private ClassCollector  collector;
    

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java Tue Jan  9 02:50:47 2007
@@ -35,6 +35,7 @@
 import org.apache.cxf.tools.common.model.JavaMethod;
 import org.apache.cxf.tools.common.model.JavaParameter;
 import org.apache.cxf.tools.common.model.JavaReturn;
+
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.SoapBindingAnnotator;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.WebMethodAnnotator;
@@ -113,8 +114,14 @@
 
 
     private void setWrapper(OperationInfo operation) {
-        MessagePartInfo inputPart = operation.getInput().getMessageParts().iterator().next();
-        MessagePartInfo outputPart = operation.getOutput().getMessageParts().iterator().next();
+        MessagePartInfo inputPart = null;
+        if (operation.getInput() != null && operation.getInput().getMessageParts() != null) {
+            inputPart = operation.getInput().getMessageParts().iterator().next();
+        }
+        MessagePartInfo outputPart = null;
+        if (operation.getOutput() != null && operation.getOutput().getMessageParts() != null) {
+            outputPart = operation.getOutput().getMessageParts().iterator().next();
+        }
         
         if (inputPart != null) {
             wrapperRequest = new JavaParameter();

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Tue Jan  9 02:50:47 2007
@@ -143,7 +143,8 @@
             return;
         }
         for (QName item : wrappedElements) {
-            addParameter(method, getParameterFromQName(item, JavaType.Style.IN, part));
+            addParameter(method, getParameterFromQName(part.getElementQName(), 
+                                                       item, JavaType.Style.IN, part));
         }
     }
 
@@ -227,8 +228,8 @@
             boolean sameWrapperChild = false;
             for (QName inElement : inputWrapElement) {
                 if (isSameWrapperChild(inElement, outElement)) {
-                    addParameter(method, getParameterFromQName(outElement, JavaType.Style.INOUT,
-                                                                  outputPart));
+                    addParameter(method, getParameterFromQName(outputPart.getElementQName(), outElement, 
+                                                               JavaType.Style.INOUT, outputPart));
                     sameWrapperChild = true;
                     if (method.getReturn() == null) {
                         addVoidReturn(method);
@@ -256,15 +257,16 @@
             if (inputWrapElement != null) {
                 for (QName inElement : inputWrapElement) {
                     if (isSameWrapperChild(inElement, outElement)) {
-                        addParameter(method, getParameterFromQName(outElement, JavaType.Style.INOUT,
-                                                                      outputPart));
+                        addParameter(method, getParameterFromQName(outputPart.getElementQName(), outElement, 
+                                                                   JavaType.Style.INOUT, outputPart));
                         sameWrapperChild = true;
                         break;
                     }
                 }
             }
             if (!sameWrapperChild) {
-                addParameter(method, getParameterFromQName(outElement, JavaType.Style.OUT, outputPart));
+                addParameter(method, getParameterFromQName(outputPart.getElementQName(), outElement, 
+                                                           JavaType.Style.OUT, outputPart));
             }
         }
         if (method.getReturn() == null) {
@@ -288,12 +290,13 @@
         return true;
     }
 
-    private JavaParameter getParameterFromQName(QName element, JavaType.Style style, MessagePartInfo part) {
+    private JavaParameter getParameterFromQName(QName wrapperElement, QName item, JavaType.Style style, 
+                                                MessagePartInfo part) {
 
         String fullJavaName = "";
         String simpleJavaName = "";
               
-        fullJavaName = this.dataBinding.getType(element);
+        fullJavaName = this.dataBinding.getWrappedElementType(wrapperElement, item);
         simpleJavaName = fullJavaName;
         
         int index = fullJavaName.lastIndexOf(".");
@@ -304,11 +307,11 @@
         
         String targetNamespace = ProcessorUtil.resolvePartNamespace(part);
         if (targetNamespace == null) {
-            targetNamespace = element.getNamespaceURI();
+            targetNamespace = wrapperElement.getNamespaceURI();
         }
         JavaParameter parameter = new JavaParameter(simpleJavaName, fullJavaName, targetNamespace);
         parameter.setStyle(style);
-        parameter.setQName(element);
+        parameter.setQName(item);
         if (style == JavaType.Style.OUT || style == JavaType.Style.INOUT) {
             parameter.setHolder(true);
             parameter.setHolderName(javax.xml.ws.Holder.class.getName());
@@ -325,10 +328,8 @@
     private JavaReturn getReturnFromQName(QName element, MessagePartInfo part) {
         String fullJavaName = "";
         String simpleJavaName = "";
-        
-       
-        
-        fullJavaName = this.dataBinding.getType(element);
+         
+        fullJavaName = this.dataBinding.getWrappedElementType(part.getElementQName(), element);
         simpleJavaName = fullJavaName;
         
         int index = fullJavaName.lastIndexOf(".");

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java Tue Jan  9 02:50:47 2007
@@ -46,6 +46,7 @@
 import org.apache.cxf.tools.util.ClassCollector;
 import org.apache.cxf.tools.util.URIParserUtil;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
+import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -350,21 +351,24 @@
         
         ServiceInfo serviceInfo = (ServiceInfo)context.get(ServiceInfo.class);
         XmlSchemaCollection schema = (XmlSchemaCollection)serviceInfo
-            .getProperty("WSDLServiceBuilder.SCHEMA");
-
+            .getProperty(WSDLServiceBuilder.WSDL_SCHEMA_LIST);
+        
         XmlSchemaElement elementByName = schema.getElementByQName(partElement);
 
         XmlSchemaComplexType type = (XmlSchemaComplexType)elementByName.getSchemaType();
 
         XmlSchemaSequence seq = (XmlSchemaSequence)type.getParticle();
+       
+        if (seq != null) {
 
-        XmlSchemaObjectCollection items = seq.getItems();
+            XmlSchemaObjectCollection items = seq.getItems();
 
-        Iterator ite = items.getIterator();
+            Iterator ite = items.getIterator();
 
-        while (ite.hasNext()) {
-            XmlSchemaElement subElement = (XmlSchemaElement)ite.next();
-            qnames.add(subElement.getQName());
+            while (ite.hasNext()) {
+                XmlSchemaElement subElement = (XmlSchemaElement)ite.next();
+                qnames.add(subElement.getQName());
+            }
         }
         return qnames;
     }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java Tue Jan  9 02:50:47 2007
@@ -167,15 +167,16 @@
         
         JAXWSBinding infBinding = infInfo.getExtensor(JAXWSBinding.class);
         
-        if (!infBinding.isEnableAsyncMapping()) {
+        if (infBinding != null && !infBinding.isEnableAsyncMapping()) {
             jaxwsBinding.setEnableAsyncMapping(false);
         }
         
-        if (!infBinding.isEnableWrapperStyle()) {
+        if (infBinding != null && !infBinding.isEnableWrapperStyle()) {
             jaxwsBinding.setEnableWrapperStyle(false);
         }
         
-        if (infBinding.getJaxwsClass() != null && infBinding.getJaxwsClass().getClassName() != null) {
+        if (infBinding != null && infBinding.getJaxwsClass() != null 
+            && infBinding.getJaxwsClass().getClassName() != null) {
             String className = ProcessorUtil.mangleNameToClassName(infBinding.getJaxwsClass().getClassName());
             jport.setInterfaceClass(className);
         } else {

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java Tue Jan  9 02:50:47 2007
@@ -19,19 +19,16 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper;
 
-import java.util.logging.Logger;
-
-import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.common.model.JavaInterface;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
 
+
+
 public final class InterfaceMapper {
-    private static final Logger LOG = LogUtils.getL7dLogger(InterfaceMapper.class);
+    //private static final Logger LOG = LogUtils.getL7dLogger(InterfaceMapper.class);
     private ToolContext context;
 
     public InterfaceMapper(ToolContext c) {
@@ -43,22 +40,14 @@
         String namespace = interfaceInfo.getName().getNamespaceURI();
         String packageName = ProcessorUtil.parsePackageName(namespace, context.mapPackageName(namespace));
         
-        String location = (String)context.get(ToolConstants.CFG_WSDLURL);
-        String urlLocation;
-        try {
-            location = ProcessorUtil.getAbsolutePath(location);
-            urlLocation = ProcessorUtil.getWSDLURL(location).toString();
-        } catch (Exception ioe) {
-            Message msg = new Message("CANNOT_FIND_WSDL", LOG, context.get(ToolConstants.CFG_WSDLURL));
-            throw new ToolException(msg, ioe);
-        }
+        String loc = (String)context.get(ToolConstants.CFG_WSDLURL);
         String webServiceName = interfaceInfo.getName().getLocalPart();
 
         intf.setWebServiceName(webServiceName);
         intf.setName(ProcessorUtil.mangleNameToClassName(webServiceName));
         intf.setNamespace(namespace);
         intf.setPackageName(packageName);
-        intf.setLocation(urlLocation);
+        intf.setLocation(loc);
 
         return intf;
     }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/ParameterMapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/ParameterMapper.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/ParameterMapper.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/ParameterMapper.java Tue Jan  9 02:50:47 2007
@@ -25,6 +25,7 @@
 import org.apache.cxf.tools.common.model.JavaType;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
 
+
 public final class ParameterMapper {
 
     private ParameterMapper() {

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<!-- 
+     Generated by WSDLToJava Compiler. 
+     /**
+     * This class was generated by the cxf $version
+     * $currentdate
+     * Generated source version: $version
+     * 
+     */
+-->
+
+<project name="cxf wsdltojava" default="build" basedir=".">
+    
+    <property environment="env"/>
+    <property name="build.dir" location ="${basedir}/build"/>
+    <property name="build.classes.dir" location ="${build.dir}/classes"/>
+    <property name="build.src.dir" location ="${basedir}"/>
+
+    <!-- find the tools jar, which on darwin, tools.jar does not exist -->
+    <available property="tools.jar" value="$${env.JAVA_HOME}/lib/tools.jar"
+	       file="${env.JAVA_HOME}/lib/tools.jar"/>
+    <path id="jdk.tools.classpath">
+	<pathelement location="${tools.jar}"/>
+    </path>
+
+    <condition property="is.java.version.15">
+	<equals arg1="${ant.java.version}" arg2="1.5"/>
+    </condition>
+
+    <fail message="cxf requires Java version 1.5 or higher. You are currently using Java version ${ant.java.version}."
+	  unless="is.java.version.15"/>
+
+    <!-- Determine cxf.home, either from the environment variable CXF_HOME
+	 - or using ../..
+    -->
+    <condition property="cxf.home" value="${env.CXF_HOME}">
+	<isset property="env.CXF_HOME"/>
+    </condition>
+
+    <fail message="Please set CXF_HOME environment variable." unless="cxf.home"/>
+
+    <!-- Determine cxf.jar.file, either ${cxf.home}/build/lib/cxf.jar
+	 - in a source distribution, or ${cxf.home}/lib/cxf-incubator.jar in a binary
+	 - distribution.
+    -->
+    <condition property="cxf-incubator.jar.file" value="${cxf.home}/build/lib/cxf-incubator.jar">
+	<available file="cxf-incubator.jar" type="file" filepath="${cxf.home}/build/lib"/>
+    </condition>
+    <property name="cxf-incubator.jar.file" value="${cxf.home}/lib/cxf-incubator.jar"/>
+
+    <fail message="The location ${cxf.home} does not seem to contain a cxf installation; if you are importing this common build file from a location other than the cxf samples directory then you need to set the cxf_HOME environment variable.">
+	<condition>
+	    <not>
+		<isset property="cxf-incubator.jar.file" />
+	    </not>
+	</condition>
+    </fail>
+
+    <!-- Determine the tools directory, either ${cxf.home}/tools
+	 - in a source distribution, or ${cxf.home}/lib in a binary
+	 - distribution.
+    -->
+    <condition property="thirdparty.tools.dir" value="${cxf.home}/tools">
+	<available file="tools" type="dir" filepath="${cxf.home}"/>
+    </condition>
+
+    <condition property="thirdparty.tools.dir" value="${cxf.home}/lib">
+	<available file="lib" type="dir" filepath="${cxf.home}"/>
+    </condition>
+
+    <property name="cxf.etc.dir" location="${cxf.home}/etc"/>
+
+    <path id="cxf.classpath">
+	<pathelement location="${build.classes.dir}"/>
+	<pathelement location="${cxf-incubator.jar.file}"/>
+    </path>
+
+#foreach ($interface in $intfs)
+    <target name="${interface.Name}.Client" description="Run ${interface.Name} client" depends="compile">
+	<property name="param" value=""/>
+	<cxfrun classname="${interface.PackageName}.${interface.Name}Client"
+		   param1="$wsdlLocation"
+		   param2="${op}" 
+		   param3="${param}"/>
+    </target> 
+
+    <target name="${interface.Name}.Server" description="Run ${interface.Name} server" depends="compile">
+	<cxfrun classname="${interface.PackageName}.${interface.Name}Server" 
+		   param1="$wsdlLocation"/>
+    </target>
+#end
+
+
+    <target name="compile">
+	<mkdir dir="${build.classes.dir}"/>
+	<javac srcdir="${build.src.dir}" destdir="${build.classes.dir}" debug="true">
+	    <classpath refid="cxf.classpath" />
+	</javac>
+    </target>
+
+    <target name="checkstyle">
+	<checkstyle config="${checkstyle.config.file}">
+	    <fileset dir="${basedir}/src" includes="**/*.java"/>
+	    <classpath>
+		<path refid="cxf.classpath"/>
+	    </classpath>
+	</checkstyle>
+    </target>
+
+    <target name="clean">
+	<delete dir="${build.classes.dir}"/>
+	<delete file="${java.timestamp.file}"/>
+	<delete file="demo.log"/>
+    </target>
+    
+    <target name="build"  depends="compile" description="build demo client and server"/>
+
+    <macrodef name="cxfrun">
+	<attribute name="classname"/>
+	<attribute name="param1" default=""/>
+	<attribute name="param2" default=""/>
+	<attribute name="param3" default=""/>
+	<attribute name="param4" default=""/>
+	<attribute name="param5" default=""/>
+	<attribute name="jvmarg1" default="-D"/>
+	<attribute name="jvmarg2" default="-D"/>
+	<attribute name="jvmarg3" default="-D"/>
+	<attribute name="jvmarg4" default="-D"/>
+	<attribute name="jvmarg5" default="-D"/>
+	<sequential>
+	    <java classname="@{classname}" fork="yes">
+		<classpath>
+		    <path refid="cxf.classpath"/>
+		</classpath>
+		<arg value="@{param1}"/>
+		<arg value="@{param2}"/>
+		<arg value="@{param3}"/>
+		<arg value="@{param4}"/>
+		<arg value="@{param5}"/>
+		<jvmarg value="@{jvmarg1}"/>
+		<jvmarg value="@{jvmarg2}"/>
+		<jvmarg value="@{jvmarg3}"/>
+		<jvmarg value="@{jvmarg4}"/>
+		<jvmarg value="@{jvmarg5}"/>
+		<assertions>
+		    <enable package="org.apache.cxf"/>
+		</assertions>
+		<sysproperty key="java.util.logging.config.file" value="${cxf.etc.dir}/logging.properties"/>
+		<sysproperty key="log4j.configuration" value="file:///${cxf.etc.dir}/log4j.properties"/>
+	    </java>
+	</sequential>
+    </macrodef>
+</project>

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,92 @@
+/**
+ * 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 $intf.PackageName;
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+
+public final class ${clientClassName} {
+
+    private static final QName SERVICE_NAME = new QName("$intf.Namespace", "$service.ServiceName");
+
+    private ${clientClassName}() {
+    }
+
+    public static void main(String args[]) throws Exception {
+
+        if (args.length == 0) { 
+            System.out.println("please specify wsdl");
+            System.exit(1); 
+        }
+        URL wsdlURL = null;
+        File wsdlFile = new File(args[0]);
+        try {
+            if (wsdlFile.exists()) {
+                wsdlURL = wsdlFile.toURL();
+            } else {
+                wsdlURL = new URL(args[0]);
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+      
+        $service.Name ss = new ${service.Name}(wsdlURL, SERVICE_NAME);
+        $intf.Name port = ss.get${port.Name}();  
+        
+#foreach ($method in $intf.Methods)
+
+        System.out.println("Invoking ${method.Name}...");
+#if($method.Exceptions.size() > 0)
+        try{
+            #if($method.return.Type != "void")
+            $method.return.ClassName _${method.Name}_$method.return.Name=#end  port.${method.Name}(#foreach ($parameter in $method.Parameters) ${parameter.DefaultTypeValue}  #if ($velocityCount != $method.parameterCount) , #end #end);
+            #if($method.return.Type != "void")
+            System.out.println("${method.Name}.result=" + _${method.Name}_$method.return.Name);
+            #end
+        }#foreach($exception in $method.Exceptions)
+        catch($exception.ClassName e){ 
+        System.out.println("Expected exception: $exception.Name has occurred.");
+        System.out.println(e.toString());
+        }#end
+        #else
+        #if($method.return.ClassName != "void")$method.return.ClassName _${method.Name}_$method.return.Name =#end port.${method.Name}(#foreach($parameter in $method.Parameters)${parameter.DefaultTypeValue}#if($velocityCount != $method.parameterCount),#end#end);
+#end#if($method.return.Type != "void")
+        #end
+#end
+        
+        
+        System.exit(0);
+    }
+
+}

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,59 @@
+/**
+ * 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 $expClass.PackageName;
+
+import javax.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+
+#foreach ($field in $expClass.Fields)
+@WebFault(name = "$field.Name", targetNamespace = "$field.TargetNamespace")
+#end
+
+public class $expClass.Name extends Exception {
+#foreach ($field in $expClass.Fields)
+    
+    $field.Modifier $field.ClassName $paraName;
+
+    public $expClass.Name (String message) {
+        super(message);
+    }
+
+    public $expClass.Name (String message, $field.ClassName $paraName) {
+        super(message);
+        this.$paraName = $paraName;
+    }
+
+    public $expClass.Name (String message, $field.ClassName $paraName, Throwable cause) {
+        super(message, cause);
+        this.$paraName = $paraName;
+    }
+
+    public $field.ClassName getFaultInfo() {
+        return this.$paraName;
+    }
+#end
+}

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,77 @@
+/**
+ * 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.
+ */
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+package $intf.PackageName;
+
+import java.util.logging.Logger;
+#foreach ($import in $intf.Imports)
+import ${import};
+#end
+
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+
+@javax.jws.WebService(name = "$intf.Name", serviceName = "$service",
+                      portName = "$port",
+                      targetNamespace = "$intf.Namespace", 
+                      wsdlLocation = "$intf.Location" ,
+		      endpointInterface = "$intf.PackageName.$intf.Name")
+                      
+public class ${intf.Name}Impl implements $intf.Name {
+
+    private static final Logger LOG = 
+        Logger.getLogger(${intf.Name}Impl.class.getPackage().getName());
+
+#foreach ($method in $intf.Methods)
+    /* (non-Javadoc)
+     * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter in $method.Parameters)$parameter.ClassName  $parameter.Name #if ($velocityCount != $method.getParameters().size()),#end)#end*
+     */
+    public $method.return.ClassName ${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 0))#end
+#if($method.ParameterListWithoutAnnotation.size() != 0)
+
+#foreach ($param in ${method.ParameterListWithoutAnnotation})
+        $param
+#end
+    )#end
+
+###foreach ($parameter in $method.Parameters)$parameter.ClassName  _$parameter.Name #if ($velocityCounter != $method.getParameters().size()),#end#end)
+#if($method.Exceptions.size() > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName #if($velocityCount != $method.Exceptions.size()),#end #end #end
+    { 
+       LOG.info("Executing operation $method.Name");
+#if ($method.return.ClassName != "void")    ##
+    return ${method.return.DefaultTypeValue};
+#end
+#if ($method.Exceptions.size() > 0) 
+#foreach($exception in $method.Exceptions)
+    //throw new ${exception.ClassName}("${exception.Name}...");
+#end
+#end
+    }
+
+#end
+}

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,56 @@
+/**
+ * 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 $intf.PackageName;
+
+import javax.jws.WebParam.Mode;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding;
+#foreach ($import in $intf.Imports)
+import ${import};
+#end
+
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+
+#foreach ($annotation in $intf.Annotations)
+$annotation
+#end
+
+public interface $intf.Name {
+#foreach ($method in $intf.Methods)
+
+#foreach ($annotation in $method.Annotations)
+    $annotation
+#end
+    public $method.return.ClassName ${method.Name}(#if($method.ParameterList.size() == 0))#end
+#if($method.ParameterList.size() != 0)
+
+#foreach ($param in ${method.ParameterList})
+        $param
+#end
+    )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end;
+#end
+}

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,48 @@
+/**
+ * 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 $intf.PackageName;
+
+import javax.xml.ws.Endpoint;
+
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+ 
+public class ${serverClassName}{
+
+    protected ${serverClassName}() throws Exception {
+        System.out.println("Starting Server");
+        Object implementor = new ${impl}();
+        String address = "${address}";
+        Endpoint.publish(address, implementor);
+    }
+    
+    public static void main(String args[]) throws Exception { 
+        new ${serverClassName}();
+        System.out.println("Server ready..."); 
+        
+        Thread.sleep(5 * 60 * 1000); 
+        System.out.println("Server exitting");
+        System.exit(0);
+    }
+}

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm Tue Jan  9 02:50:47 2007
@@ -0,0 +1,76 @@
+/**
+ * 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 $service.PackageName;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+#foreach ($port in ${service.Ports})    
+import ${port.PackageName}.${port.InterfaceClass};
+#end
+/**
+ * This class was generated by the CXF $version
+ * $currentdate
+ * Generated source version: $version
+ * 
+ */
+
+@WebServiceClient(name = "${service.ServiceName}", targetNamespace = "$service.Namespace", wsdlLocation = "$wsdlLocation")
+public class ${service.Name} extends Service {
+
+    private final static URL WSDL_LOCATION;
+    private final static QName SERVICE = new QName("$service.Namespace", "$service.ServiceName");
+#foreach ($port in ${service.Ports})
+    private final static QName $port.Name = new QName("$service.Namespace", "$port.PortName");
+#end
+    static {
+        URL url = null;
+        try {
+            url = new URL("$wsdlLocation");
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        WSDL_LOCATION = url;
+    }
+
+    public ${service.Name}(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ${service.Name}() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+
+#foreach ($port in $service.Ports)
+    /**
+     * 
+     * @return
+     *     returns ${port.Name}
+     */
+    @WebEndpoint(name = "${port.PortName}")
+    public ${port.InterfaceClass} get${port.Name}() {
+        return (${port.InterfaceClass})super.getPort($port.Name, ${port.InterfaceClass}.class);
+    }
+#end
+
+}

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/DummyDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/DummyDataBinding.java?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/DummyDataBinding.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/DummyDataBinding.java Tue Jan  9 02:50:47 2007
@@ -31,4 +31,8 @@
     public String getType(QName qn) {
         return null;
     }
+    
+    public String getWrappedElementType(QName parent, QName qn) {
+        return null;
+    }
 }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml Tue Jan  9 02:50:47 2007
@@ -5,7 +5,7 @@
 	<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.wsdl2java.frontend.jaxws">
+	<generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
 	    <generator name="AntGenerator"/>
 	    <generator name="ImplGenerator"/>
 	</generators>

Modified: incubator/cxf/trunk/tools2/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/pom.xml?view=diff&rev=494369&r1=494368&r2=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/pom.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/test/pom.xml Tue Jan  9 02:50:47 2007
@@ -58,12 +58,11 @@
 	    <artifactId>cxf-tools2-wsdlto-databinding-jaxb</artifactId>
 	    <version>${project.version}</version>	 	
 	</dependency>
-	
-	
+		
 	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools2-wsdlto-core</artifactId>
-	    <version>${project.version}</version>
+		    <groupId>org.apache.cxf</groupId>
+		    <artifactId>cxf-tools2-wsdlto-frontend-jaxws</artifactId>
+		    <version>${project.version}</version>
 	</dependency>
     </dependencies>
 </project>

Added: 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=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java Tue Jan  9 02:50:47 2007
@@ -0,0 +1,146 @@
+/**
+ * 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.common;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Locale;
+
+import junit.framework.TestCase;
+
+/*import org.apache.cxf.tools.common.ProcessorEnvironment;
+import org.apache.cxf.tools.common.ToolException;*/
+
+public class ProcessorTestBase extends TestCase {
+
+    private static final int RETRY_SLEEP_MILLIS = 10;
+    protected ToolContext env = new ToolContext();
+    protected File output;
+
+    public void setUp() throws Exception {
+        URL url = ProcessorTestBase.class.getResource(".");
+        output = new File(url.getFile());
+        output = new File(output, "/resources");
+        mkDir(output);
+    }
+
+    public void tearDown() {
+        removeDir(output);
+        output = null;
+        env = null;
+    }
+
+    private void mkDir(File dir) {
+        if (dir == null) {
+            throw new ToolException("dir attribute is required");
+        }
+
+        if (dir.isFile()) {
+            throw new ToolException("Unable to create directory as a file "
+                                    + "already exists with that name: " + dir.getAbsolutePath());
+        }
+
+        if (!dir.exists()) {
+            boolean result = doMkDirs(dir);
+            if (!result) {
+                String msg = "Directory " + dir.getAbsolutePath()
+                             + " creation was not successful for an unknown reason";
+                throw new ToolException(msg);
+            }
+        }
+    }
+
+    /**
+     * Attempt to fix possible race condition when creating directories on
+     * WinXP, also Windows2000. If the mkdirs does not work, wait a little and
+     * try again.
+     */
+    private boolean doMkDirs(File f) {
+        if (!f.mkdirs()) {
+            try {
+                Thread.sleep(RETRY_SLEEP_MILLIS);
+                return f.mkdirs();
+            } catch (InterruptedException ex) {
+                return f.mkdirs();
+            }
+        }
+        return true;
+    }
+
+    private void removeDir(File d) {
+        String[] list = d.list();
+        if (list == null) {
+            list = new String[0];
+        }
+        for (int i = 0; i < list.length; i++) {
+            String s = list[i];
+            File f = new File(d, s);
+            if (f.isDirectory()) {
+                removeDir(f);
+            } else {
+                delete(f);
+            }
+        }
+        delete(d);
+    }
+
+    private void delete(File f) {
+        if (!f.delete()) {
+            if (isWindows()) {
+                System.gc();
+            }
+            try {
+                Thread.sleep(RETRY_SLEEP_MILLIS);
+            } catch (InterruptedException ex) {
+                // Ignore Exception
+            }
+            if (!f.delete()) {
+                f.deleteOnExit();
+            }
+        }
+    }
+
+    private boolean isWindows() {
+        String osName = System.getProperty("os.name").toLowerCase(Locale.US);
+        return osName.indexOf("windows") > -1;
+    }
+
+    protected String getClassPath() {
+        ClassLoader loader = getClass().getClassLoader();
+        StringBuffer classPath = new StringBuffer();
+        if (loader instanceof URLClassLoader) {
+            URLClassLoader urlLoader = (URLClassLoader)loader;
+            for (URL url : urlLoader.getURLs()) {               
+                File file = new File(url.getFile());
+                String filename = file.getAbsolutePath();                
+                if (filename.indexOf("junit") == -1) {
+                    classPath.append(filename);
+                    classPath.append(System.getProperty("path.separator"));
+                }
+            }
+        }
+        return classPath.toString();
+    }
+    
+    
+    
+
+}

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/common/ProcessorTestBase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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=494369&r1=494368&r2=494369
==============================================================================
--- 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 Tue Jan  9 02:50:47 2007
@@ -24,25 +24,21 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.common.i18n.Message;
-import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.plugin.DataBinding;
 import org.apache.cxf.tools.plugin.FrontEnd;
 import org.apache.cxf.tools.plugin.Generator;
 import org.apache.cxf.tools.plugin.Plugin;
 
 public class PluginLoaderTest extends TestCase {
-
+   
+    
     public void testLoadPlugins() throws Exception {
         PluginLoader loader = PluginLoader.getInstance();
         assertEquals(1, loader.getPlugins().size());
         assertEquals("default", getPlugin(loader, 0).getName());
-        
-        loader.loadPlugin("/org/apache/cxf/tools/wsdlto/core/plugin.xml");
-        assertEquals(2, loader.getPlugins().size());
-        Plugin plugin = getPlugin(loader, 1);
-        assertEquals("test", plugin.getName());
-        assertEquals("2.0", plugin.getVersion());
-        assertEquals("apache cxf", plugin.getProvider());
+
+        Plugin plugin = getPlugin(loader, 0);
+        assertEquals("default", plugin.getName());
         
         Map<String, FrontEnd> frontends = loader.getFrontEnds();
         assertNotNull(frontends);
@@ -54,24 +50,14 @@
         assertEquals("JAXWSProfile", frontend.getProfile());
         assertNotNull(frontend.getGenerators());
         assertNotNull(frontend.getGenerators().getGenerator());
-        assertEquals(2, frontend.getGenerators().getGenerator().size());
+        
         assertEquals("AntGenerator", getGenerator(frontend, 0).getName());
-        assertEquals("ImplGenerator", getGenerator(frontend, 1).getName());
-
-        assertEquals("org.apache.cxf.tools.wsdlto.core", frontend.getContainer().getPackage());
-        assertEquals("DummyContainer", frontend.getContainer().getName());
-        assertEquals("dummy.toolspec", frontend.getContainer().getToolspec());
-
-        try {
-            loader.getFrontEndProfile("jaxws");
-            fail("JaxWs frontend not loaded yet");
-        } catch (ToolException e) {
-            assertEquals(getLogMessage("FRONTEND_PROFILE_LOAD_FAIL", frontend.getPackage()
-                                       + "."
-                                       + frontend.getProfile()),
-                         e.getMessage());
-        }
         
+        assertEquals("JAXWSContainer", frontend.getContainer().getName());
+        assertEquals("jaxws-toolspec.xml", frontend.getContainer().getToolspec());
+        
+        loader.getFrontEndProfile("jaxws");
+                  
         Map<String, DataBinding> databindings = loader.getDataBindings();
         assertNotNull(databindings);
         assertEquals(1, databindings.size());
@@ -79,7 +65,7 @@
         DataBinding databinding = getDataBinding(databindings, 0);
         assertEquals("jaxb", databinding.getName());
         assertEquals("org.apache.cxf.tools.wsdlto.databinding.jaxb", databinding.getPackage());
-        assertEquals("JAXBBindingGenerator", databinding.getProfile());
+        assertEquals("JAXBDataBinding", databinding.getProfile());
     }
 
     protected String getLogMessage(String key, Object...params) {

Added: 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=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Tue Jan  9 02:50:47 2007
@@ -0,0 +1,49 @@
+/**
+ * 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.jaxws;
+
+import java.io.File;
+
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.wsdlto.WSDLToJava;
+
+public class CodeGenTest extends ProcessorTestBase {
+
+    public void setUp() throws Exception {
+        super.setUp();
+        File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
+        classFile.mkdir();
+    }
+
+    public void tearDown() {
+        super.tearDown();
+
+    }
+
+    public void testHelloWorld() throws Exception {
+
+        String[] args = new String[] {"-d", output.getCanonicalPath(),
+                                      getLocation("/wsdl2java_wsdl/hello_world.wsdl")};
+        WSDLToJava.main(args);
+    }
+
+    private String getLocation(String wsdlFile) {
+        return this.getClass().getResource(wsdlFile).getFile();
+    }
+}

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd Tue Jan  9 02:50:47 2007
@@ -0,0 +1,93 @@
+<?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.
+-->
+<!--XSD file template-->
+<!--Created by IONA Artix Designer-->
+<schema targetNamespace="http://apache.org/Invoice" 
+	xmlns="http://www.w3.org/2001/XMLSchema" 
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+	xmlns:tns="http://apache.org/Invoice" 
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+    <complexType name="InvoiceHeader">
+	<sequence>
+	    <element maxOccurs="1" minOccurs="1" name="shippingDate" type="date"/>
+	    <element maxOccurs="1" minOccurs="1" name="paymentDueDate" type="date"/>
+	    <element maxOccurs="1" minOccurs="1" name="customer" type="tns:Customer"/>
+	</sequence>
+    </complexType>
+    <complexType name="InvoiceLine">
+	<sequence>
+	    <element maxOccurs="1" minOccurs="1" name="productCode" type="int"/>
+	    <element maxOccurs="1" minOccurs="1" name="description" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="quantity" type="int"/>
+	    <element maxOccurs="1" minOccurs="1" name="unitCost" type="double"/>
+	    <element maxOccurs="1" minOccurs="1" name="totalCost" type="double"/>
+	</sequence>
+    </complexType>
+    <complexType name="Invoice">
+	<sequence>
+	    <element maxOccurs="1" minOccurs="1" name="header" type="tns:InvoiceHeader"/>
+	    <element maxOccurs="unbounded" minOccurs="1" name="invoiceLine" 
+		     type="tns:InvoiceLine"/>
+	</sequence>
+    </complexType>
+    <complexType name="Address">
+	<sequence>
+	    <element maxOccurs="1" minOccurs="1" name="addressLine1" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="addressLine2" nillable="true" 
+		     type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="city" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="stateProvinceRegion" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="ZIPPostalCode" nillable="true" 
+		     type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="country" type="string"/>
+	</sequence>
+    </complexType>
+    <complexType name="Person">
+	<sequence>
+	    <element maxOccurs="1" minOccurs="1" name="firstName" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="lastName" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="email" nillable="true" 
+		     type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="contactPhoneNumber" 
+		     nillable="true" type="string"/>
+	    <element maxOccurs="1" minOccurs="1" name="address" nillable="true" 
+		     type="tns:Address"/>
+	</sequence>
+    </complexType>
+    <complexType name="Customer">
+	<complexContent>
+	    <extension base="tns:Person">
+		<sequence>
+		    <element maxOccurs="1" minOccurs="1" name="customerNumber" 
+			     type="string"/>
+		    <element maxOccurs="1" minOccurs="1" name="supportLevel" 
+			     type="tns:SupportLevel"/>
+		</sequence>
+	    </extension>
+	</complexContent>
+    </complexType>
+    <simpleType name="SupportLevel">
+	<restriction base="string">
+	    <enumeration value="Silver"/>
+	    <enumeration value="Bronze"/>
+	    <enumeration value="Gold"/>
+	</restriction>
+    </simpleType>    
+</schema>

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/Invoice.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl Tue Jan  9 02:50:47 2007
@@ -0,0 +1,169 @@
+<?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 file template-->
+<!--(c) 2005, IONA Technologies, Inc.-->
+<definitions name="InvoiceServer.wsdl" 
+    targetNamespace="http://apache.org/InvoiceServer" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:inv="http://apache.org/Invoice" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://apache.org/InvoiceServer" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <types>
+        <schema targetNamespace="http://apache.org/InvoiceServer" 
+            xmlns="http://www.w3.org/2001/XMLSchema" 
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+            <import namespace="http://apache.org/Invoice" 
+                schemaLocation="Invoice.xsd"/>
+            <element name="sendInvoice">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="1" minOccurs="1" name="invoice" 
+                            type="inv:Invoice"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="sendInvoiceResponse">
+                <complexType>
+                    <sequence/>
+                </complexType>
+            </element>
+            <element name="getInvoicesForCustomer">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="1" minOccurs="1" name="firstName" 
+                            type="string"/>
+                        <element maxOccurs="1" minOccurs="1" name="lastName" 
+                            type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="getInvoicesForCustomerResponse">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="unbounded" minOccurs="0" name="return" 
+                            type="inv:Invoice"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="NoSuchCustomer">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="1" minOccurs="1" name="firstName" 
+                            type="string"/>
+                        <element maxOccurs="1" minOccurs="1" name="lastName" 
+                            type="string"/>
+                    </sequence>
+                </complexType>
+            </element>           
+            <element name="listCustomers">
+                <complexType>
+                    <sequence/>
+                </complexType>
+            </element>
+            <element name="listCustomersResponse">
+                <complexType>
+                    <sequence>
+                        <element maxOccurs="unbounded" minOccurs="0" name="return" 
+                            type="inv:Customer"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </types>
+    <message name="sendInvoice">
+        <part element="tns:sendInvoice" name="parameters"/>
+    </message>
+    <message name="sendInvoiceResponse">
+        <part element="tns:sendInvoiceResponse" name="parameters"/>
+    </message>
+    <message name="getInvoicesForCustomer">
+        <part element="tns:getInvoicesForCustomer" name="parameters"/>
+    </message>
+    <message name="getInvoicesForCustomerResponse">
+        <part element="tns:getInvoicesForCustomerResponse" name="parameters"/>
+    </message>
+    <message name="NoSuchCustomerFault">
+        <part element="tns:NoSuchCustomer" name="parameters"/>
+    </message>
+    <message name="listCustomers">
+        <part element="tns:listCustomers" name="parameters"/>
+    </message>
+    <message name="listCustomersResponse">
+        <part element="tns:listCustomersResponse" name="parameters"/>
+    </message>
+    <portType name="InvoicingI">
+        <operation name="sendInvoice">
+            <input message="tns:sendInvoice" name="sendInvoice"/>
+            <output message="tns:sendInvoiceResponse" name="sendInvoiceResponse"/>
+        </operation>
+        <operation name="getInvoicesForCustomer">
+            <input message="tns:getInvoicesForCustomer" name="getInvoicesForCustomer"/>
+            <output message="tns:getInvoicesForCustomerResponse" 
+                name="getInvoicesForCustomerResponse"/>
+            <fault message="tns:NoSuchCustomerFault" 
+                name="NoSuchCustomerFault"/> 
+        </operation>
+        <operation name="listCustomers">
+            <input message="tns:listCustomers" name="listCustomers"/>
+            <output message="tns:listCustomersResponse" name="listCustomers"/>
+        </operation>
+    </portType>
+    <binding name="InvoicingDocLiteralSOAPBinding" type="tns:InvoicingI">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="sendInvoice">
+            <soap:operation soapAction="" style="document"/>
+            <input name="sendInvoice">
+                <soap:body use="literal"/>
+            </input>
+            <output name="sendInvoiceResponse">
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="getInvoicesForCustomer">
+            <soap:operation soapAction="" style="document"/>
+            <input name="getInvoicesForCustomer">
+                <soap:body use="literal"/>
+            </input>
+            <output name="getInvoicesForCustomerResponse">
+                <soap:body use="literal"/>
+            </output>
+            
+            <fault name="NoSuchCustomerFault">
+                <soap:fault name="NoSuchCustomerFault" use="literal"/>
+            </fault>
+        </operation>
+        <operation name="listCustomers">
+            <soap:operation soapAction="" style="document"/>
+            <input name="listCustomers">
+                <soap:body use="literal"/>
+            </input>
+            <output name="listCustomers">
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="InvoicingService">
+        <port binding="tns:InvoicingDocLiteralSOAPBinding" name="SOAPOverHTTPEndpoint">
+            <soap:address location="http://localhost:9091/Invoicing"/>
+        </port>
+    </service>
+</definitions>

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl Tue Jan  9 02:50:47 2007
@@ -0,0 +1,169 @@
+<?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 file template-->
+<!--(c) 2005, IONA Technologies, Inc.-->
+<definitions name="InvoiceServer.wsdl" 
+	     targetNamespace="http://apache.org/InvoiceServer" 
+	     xmlns="http://schemas.xmlsoap.org/wsdl/" 
+	     xmlns:inv="http://apache.org/Invoice" 
+	     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+	     xmlns:tns="http://apache.org/InvoiceServer" 
+	     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+	     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <types>
+	<schema targetNamespace="http://apache.org/InvoiceServer" 
+		xmlns="http://www.w3.org/2001/XMLSchema" 
+		xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+	    <import namespace="http://apache.org/Invoice" 
+		    schemaLocation="Invoice.xsd"/>
+	    <element name="sendInvoice">
+		<complexType>
+		    <sequence>
+			<element maxOccurs="1" minOccurs="1" name="invoice" 
+				 type="inv:Invoice"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="sendInvoiceResponse">
+		<complexType>
+		    <sequence/>
+		</complexType>
+	    </element>
+	    <element name="getInvoicesForCustomer">
+		<complexType>
+		    <sequence>
+			<element maxOccurs="1" minOccurs="1" name="firstName" 
+				 type="string"/>
+			<element maxOccurs="1" minOccurs="1" name="lastName" 
+				 type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="getInvoicesForCustomerResponse">
+		<complexType>
+		    <sequence>
+			<element maxOccurs="unbounded" minOccurs="0" name="return" 
+				 type="inv:Invoice"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	    <element name="NoSuchCustomerFault">
+		<complexType>
+		    <sequence>
+			<element maxOccurs="1" minOccurs="1" name="firstName" 
+				 type="string"/>
+			<element maxOccurs="1" minOccurs="1" name="lastName" 
+				 type="string"/>
+		    </sequence>
+		</complexType>
+	    </element>           
+	    <element name="listCustomers">
+		<complexType>
+		    <sequence/>
+		</complexType>
+	    </element>
+	    <element name="listCustomersResponse">
+		<complexType>
+		    <sequence>
+			<element maxOccurs="unbounded" minOccurs="0" name="return" 
+				 type="inv:Customer"/>
+		    </sequence>
+		</complexType>
+	    </element>
+	</schema>
+    </types>
+    <message name="sendInvoice">
+	<part element="tns:sendInvoice" name="parameters"/>
+    </message>
+    <message name="sendInvoiceResponse">
+	<part element="tns:sendInvoiceResponse" name="parameters"/>
+    </message>
+    <message name="getInvoicesForCustomer">
+	<part element="tns:getInvoicesForCustomer" name="parameters"/>
+    </message>
+    <message name="getInvoicesForCustomerResponse">
+	<part element="tns:getInvoicesForCustomerResponse" name="parameters"/>
+    </message>
+    <message name="NoSuchCustomerFault">
+	<part element="tns:NoSuchCustomerFault" name="parameters"/>
+    </message>
+    <message name="listCustomers">
+	<part element="tns:listCustomers" name="parameters"/>
+    </message>
+    <message name="listCustomersResponse">
+	<part element="tns:listCustomersResponse" name="parameters"/>
+    </message>
+    <portType name="InvoiceServer">
+	<operation name="sendInvoice">
+	    <input message="tns:sendInvoice" name="sendInvoice"/>
+	    <output message="tns:sendInvoiceResponse" name="sendInvoiceResponse"/>
+	</operation>
+	<operation name="getInvoicesForCustomer">
+	    <input message="tns:getInvoicesForCustomer" name="getInvoicesForCustomer"/>
+	    <output message="tns:getInvoicesForCustomerResponse" 
+		    name="getInvoicesForCustomerResponse"/>
+	    <fault message="tns:NoSuchCustomerFault" 
+		   name="NoSuchCustomerFault"/> 
+	</operation>
+	<operation name="listCustomers">
+	    <input message="tns:listCustomers" name="listCustomers"/>
+	    <output message="tns:listCustomersResponse" name="listCustomers"/>
+	</operation>
+    </portType>
+    <binding name="InvoiceServerDocLiteralSOAPBinding" type="tns:InvoiceServer">
+	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+	<operation name="sendInvoice">
+	    <soap:operation soapAction="" style="document"/>
+	    <input name="sendInvoice">
+		<soap:body use="literal"/>
+	    </input>
+	    <output name="sendInvoiceResponse">
+		<soap:body use="literal"/>
+	    </output>
+	</operation>
+	<operation name="getInvoicesForCustomer">
+	    <soap:operation soapAction="" style="document"/>
+	    <input name="getInvoicesForCustomer">
+		<soap:body use="literal"/>
+	    </input>
+	    <output name="getInvoicesForCustomerResponse">
+		<soap:body use="literal"/>
+	    </output>
+	    
+	    <fault name="NoSuchCustomerFault">
+		<soap:fault name="NoSuchCustomerFault" use="literal"/>
+	    </fault>
+	</operation>
+	<operation name="listCustomers">
+	    <soap:operation soapAction="" style="document"/>
+	    <input name="listCustomers">
+		<soap:body use="literal"/>
+	    </input>
+	    <output name="listCustomers">
+		<soap:body use="literal"/>
+	    </output>
+	</operation>
+    </binding>
+    <service name="InvoiceService">
+	<port binding="tns:InvoiceServerDocLiteralSOAPBinding" name="SOAPOverHTTPPort">
+	    <soap:address location="http://localhost:9091/InvoiceServer"/>
+	</port>
+    </service>
+</definitions>

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/InvoiceServer.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl Tue Jan  9 02:50:47 2007
@@ -0,0 +1,94 @@
+<?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.
+-->
+<definitions
+    name="AddNumbers"
+    targetNamespace="http://www.apache.org/handlers"
+    xmlns:tns="http://www.apache.org/handlers"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:x1="http://www.apache.org/handlers/types">
+    <types>
+        <xsd:schema
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.apache.org/handlers/types"
+            elementFormDefault="qualified">
+
+            <complexType name="addNumbersResponse">
+                <sequence>
+                    <element name="return" type="xsd:int" />
+                </sequence>
+            </complexType>
+            <element name="addNumbersResponse" type="x1:addNumbersResponse"/>
+
+            <complexType name="addNumbers">
+                <sequence>
+                    <element name="arg0" type="xsd:int" />
+                    <element name="arg1" type="xsd:int" />
+                </sequence>
+            </complexType>
+            <element name="addNumbers" type="x1:addNumbers"/>
+
+            <element name="FaultDetail" type="x1:FaultDetail" />
+            <complexType name="FaultDetail">
+                <sequence>
+                    <element name="faultInfo" type="xsd:string" />
+                    <element name="message" type="xsd:string" />
+                </sequence>
+            </complexType>
+        </xsd:schema>
+    </types>
+    <message name="addNumbers">
+        <part name="parameters" element="x1:addNumbers" />
+    </message>
+    <message name="addNumbersResponse">
+        <part name="result" element="x1:addNumbersResponse" />
+    </message>
+    <message name="addNumbersFault">
+        <part name="AddNumbersFault" element="x1:FaultDetail" />
+    </message>
+    <portType name="AddNumbers">
+        <operation name="addNumbers">
+            <input message="tns:addNumbers" />
+            <output message="tns:addNumbersResponse" />
+            <fault name="addNumbersFault" message="tns:addNumbersFault"/>
+        </operation>
+    </portType>
+    <binding name="AddNumbersBinding" type="tns:AddNumbers">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+        <operation name="addNumbers">
+            <soap:operation soapAction="" />
+            <input>
+                <soap:body use="literal" />
+            </input>
+            <output>
+                <soap:body use="literal" />
+            </output>
+            <fault name="addNumbersFault">
+                <soap:fault name="addNumbersFault" use="literal" />
+            </fault>
+        </operation>
+    </binding>
+    <service name="AddNumbersService">
+        <port name="AddNumbersPort" binding="tns:AddNumbersBinding">
+            <soap:address location="http://localhost:9000/handlers/AddNumbersService/AddNumbersPort" />
+        </port>
+    </service>
+</definitions>

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/addNumbers.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml Tue Jan  9 02:50:47 2007
@@ -0,0 +1,27 @@
+<!--
+  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.
+-->
+<bindings
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    wsdlLocation="C:\CXF\trunk\test\wsdl\hello_world.wsdl"
+    xmlns="http://java.sun.com/xml/ns/jaxws">
+    <bindings node="wsdl:definitions">
+        <enableAsyncMapping>true</enableAsyncMapping>
+    </bindings>
+</bindings>
\ No newline at end of file

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml.tmpl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml.tmpl?view=auto&rev=494369
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml.tmpl (added)
+++ incubator/cxf/trunk/tools2/wsdlto/test/src/test/resources/wsdl2java_wsdl/async_binding.xml.tmpl Tue Jan  9 02:50:47 2007
@@ -0,0 +1,27 @@
+<!--
+  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.
+-->
+<bindings
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    wsdlLocation="@WSDL_LOCATION@/hello_world.wsdl"
+    xmlns="http://java.sun.com/xml/ns/jaxws">
+    <bindings node="wsdl:definitions">
+        <enableAsyncMapping>true</enableAsyncMapping>
+    </bindings>
+</bindings>



Mime
View raw message