cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r560076 - in /incubator/cxf/trunk/tools/wsdlto: core/src/main/java/org/apache/cxf/tools/wsdlto/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/...
Date Fri, 27 Jul 2007 03:04:04 GMT
Author: mmao
Date: Thu Jul 26 20:04:03 2007
New Revision: 560076

URL: http://svn.apache.org/viewvc?view=rev&rev=560076
Log:
CXF-853 Package renaming


Added:
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/
      - copied from r560050, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBinding.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingDeserializer.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingParser.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingSerializer.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSClass.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSClass.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSParameter.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSParameter.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
      - copied unchanged from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/
      - copied from r560050, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParserTest.java
      - copied, changed from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParserTest.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/expected/
      - copied from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/expected/
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/resources/
      - copied from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/
Removed:
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/
Modified:
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapper.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
    incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
    incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Thu Jul 26 20:04:03 2007
@@ -140,8 +140,6 @@
                 builder.setContext(context);
                 builder.setBus(getBus());
 
-                // TODO: Modify builder api, let customized definition make
-                // sense.
                 builder.build(URIParserUtil.getAbsoluteURI(wsdlURL));
                 builder.customize();
                 Definition definition = builder.getWSDLModel();
@@ -268,14 +266,14 @@
                         return qn;
                     }
                 }
-            }            
+            }
         }
-        
+
         if (qname == null) {
             Message msg = new Message("SERVICE_NOT_FOUND", LOG, new Object[] {serviceName});
             throw new ToolException(msg);
         }
-        
+
         return qname;
     }
 

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomNodeSelector.java Thu Jul 26 20:04:03 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Thu Jul 26 20:04:03 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBinding.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBinding.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBinding.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBinding.java Thu Jul 26 20:04:03 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.io.Serializable;
 
@@ -45,7 +45,7 @@
     private String methodName;
 
     private JAXWSParameter jaxwsPara;
-    
+
     private JAXWSClass jaxwsClass;
 
     public void setDocumentBaseURI(String baseURI) {
@@ -119,7 +119,7 @@
     public JAXWSParameter getJaxwsPara() {
         return jaxwsPara;
     }
-    
+
     public void setJaxwsClass(JAXWSClass clz) {
         this.jaxwsClass = clz;
     }
@@ -127,7 +127,7 @@
     public JAXWSClass getJaxwsClass() {
         return this.jaxwsClass;
     }
-    
+
 
     public void setMethodName(String name) {
         methodName = name;

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingDeserializer.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingDeserializer.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingDeserializer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingDeserializer.java Thu Jul 26 20:04:03 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.io.*;
 
@@ -30,9 +30,9 @@
 import org.w3c.dom.*;
 
 public class JAXWSBindingDeserializer implements ExtensionDeserializer, Serializable {
-    
+
     public JAXWSBindingDeserializer() {
-        
+
     }
 
     public ExtensibilityElement unmarshall(Class parentType,
@@ -48,7 +48,7 @@
 
         JAXWSBindingParser parser = new JAXWSBindingParser(extReg);
         parser.parseElement(jaxwsBinding, el);
-        
+
         return jaxwsBinding;
     }
 }

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingParser.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingParser.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingParser.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java Thu Jul 26 20:04:03 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.util.Iterator;
 import java.util.logging.Logger;
@@ -57,7 +57,7 @@
         jaxwsBinding.setDocumentBaseURI(namespace);
 
         parseElement(jaxwsBinding, element);
-        
+
         return jaxwsBinding;
     }
 
@@ -74,7 +74,7 @@
             if (isPackageElement(element)) {
                 jaxwsBinding.setPackage(getPackageName(element));
             }
-            
+
             if (isWrapperStyle(element)) {
                 jaxwsBinding.setEnableWrapperStyle(getNodeValue(element));
             }
@@ -91,11 +91,11 @@
                 if (isMIMEElement(child)) {
                     jaxwsBinding.setEnableMime(getNodeValue(child));
                 }
-                
+
                 if (isWrapperStyle(child)) {
                     jaxwsBinding.setEnableWrapperStyle(getNodeValue(child));
                 }
-                
+
                 if (isPackageElement(child)) {
                     jaxwsBinding.setPackage(getPackageName(child));
                 }
@@ -103,7 +103,7 @@
                 if (isJAXWSMethodElement(child)) {
                     jaxwsBinding.setMethodName(getMethodName(child));
                 }
-                
+
                 if (isJAXWSParameterElement(child)) {
                     Element childElement = (Element)child;
                     String partPath = "//" +  childElement.getAttribute("part");
@@ -116,25 +116,25 @@
                             messageName =  messageEle.getAttribute("name");
                         }
                     }
-                    
+
                     String name = childElement.getAttribute("name");
                     String elementName = childElement.getAttribute("childElementName");
                     JAXWSParameter jpara = new JAXWSParameter(messageName, elementName, name);
                     jaxwsBinding.setJaxwsPara(jpara);
                 }
-                
+
                 if (isJAXWSClass(child)) {
                     Element childElement = (Element)child;
                     String clzName = childElement.getAttribute("name");
                     String javadoc = "";
                     Node docChild = DOMUtils.getChild(child, Element.ELEMENT_NODE);
-                    
+
                     if (docChild != null && this.isJAXWSClassDoc(docChild)) {
                         javadoc  = DOMUtils.getContent(docChild);
                     }
 
                     JAXWSClass jaxwsClass = new JAXWSClass(clzName, javadoc);
-                    jaxwsBinding.setJaxwsClass(jaxwsClass);                    
+                    jaxwsBinding.setJaxwsClass(jaxwsClass);
                 }
             }
         }
@@ -165,17 +165,17 @@
                && "parameter".equals(node.getLocalName());
 
     }
-    
+
     private boolean isJAXWSClass(Node node) {
         return (ToolConstants.NS_JAXWS_BINDINGS.equals(node.getNamespaceURI()))
                && "class".equals(node.getLocalName());
     }
-    
+
     private boolean isJAXWSClassDoc(Node node) {
         return (ToolConstants.NS_JAXWS_BINDINGS.equals(node.getNamespaceURI()))
                && "javadoc".equals(node.getLocalName());
     }
-    
+
 
     private String getPackageName(Node node) {
         Element ele = (Element)node;
@@ -186,7 +186,7 @@
         return "enableAsyncMapping".equals(node.getLocalName())
                && ToolConstants.NS_JAXWS_BINDINGS.equals(node.getNamespaceURI());
     }
-    
+
     private Boolean isWrapperStyle(Node node) {
         return "enableWrapperStyle".equals(node.getLocalName())
                && ToolConstants.NS_JAXWS_BINDINGS.equals(node.getNamespaceURI());

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingSerializer.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingSerializer.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSBindingSerializer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java Thu Jul 26 20:04:03 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.io.*;
 

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSClass.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSClass.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSClass.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSClass.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSClass.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSClass.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSClass.java Thu Jul 26 20:04:03 2007
@@ -16,33 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 public class JAXWSClass {
     private String className;
     private String comments;
-    
+
     public JAXWSClass(String clzName , String comment) {
         className = clzName;
         comments  = comment;
     }
-    
+
     public void setClassName(String clzName) {
         this.className = clzName;
     }
-    
+
     public String getClassName() {
         return className;
     }
-    
+
     public void setComments(String comment) {
         comments = comment;
     }
-    
+
     public String getComments() {
         return comments;
     }
-    
-    
+
+
 
 }

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSParameter.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSParameter.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSParameter.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSParameter.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSParameter.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/JAXWSParameter.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSParameter.java Thu Jul 26 20:04:03 2007
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 public class JAXWSParameter {
     private String name;
     private String eleName;
     private String messageName;
-    
+
     public JAXWSParameter(String msgName , String elementName, String name) {
         this.messageName = msgName;
         this.eleName = elementName;
@@ -44,15 +44,15 @@
     public String getElementName() {
         return eleName;
     }
-    
+
     public String getMessageName() {
         return this.messageName;
     }
-    
+
     public void setMessageName(String msgName) {
         this.messageName = msgName;
     }
-    
-    
+
+
 
 }

Modified: incubator/cxf/trunk/tools/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/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/FaultProcessor.java Thu Jul 26 20:04:03 2007
@@ -35,7 +35,7 @@
 import org.apache.cxf.tools.common.model.JavaModel;
 import org.apache.cxf.tools.util.ClassCollector;
 import org.apache.cxf.tools.util.NameUtil;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 
 public class FaultProcessor extends AbstractProcessor {
     private ClassCollector  collector;
@@ -74,8 +74,8 @@
         if (namespace.equals(method.getInterface().getNamespace())) {
             packageName = method.getInterface().getPackageName();
         }
-        
-        
+
+
         JAXWSBinding jaxwsBinding = faultMessage.getExtensor(JAXWSBinding.class);
         if (jaxwsBinding != null) {
             if (jaxwsBinding.getPackage() != null) {
@@ -122,7 +122,7 @@
             }
 
             String fType = ProcessorUtil.getType(part, context, false);
-            
+
             //REVISIT - custom JAXB package names
             String fPackageName = method.getInterface().getPackageName();
 

Modified: incubator/cxf/trunk/tools/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/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java Thu Jul 26 20:04:03 2007
@@ -36,7 +36,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.customization.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;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.WebResultAnnotator;
@@ -97,20 +97,20 @@
         method.annotate(new SoapBindingAnnotator());
 
         JAXWSBinding opBinding = (JAXWSBinding)operation.getExtensor(JAXWSBinding.class);
-        
+
         boolean enableAsync = false;
-        if (globalBinding != null && globalBinding.isEnableAsyncMapping() 
+        if (globalBinding != null && globalBinding.isEnableAsyncMapping()
             || opBinding != null && opBinding.isEnableAsyncMapping()) {
             enableAsync = true;
         }
-        
-               
-        if (!method.isOneWay() 
+
+
+        if (!method.isOneWay()
             && enableAsync && !isAddedAsyMethod(method)) {
             addAsyncMethod(method);
         }
-        
-        if (globalBinding != null && globalBinding.isEnableMime() 
+
+        if (globalBinding != null && globalBinding.isEnableMime()
             || opBinding != null && opBinding.isEnableMime()) {
             method.setMimeEnable(true);
         }
@@ -250,5 +250,5 @@
         }
         return counter > 1 ? true : false;
     }
-    
+
 }

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java Thu Jul 26 20:04:03 2007
@@ -37,7 +37,7 @@
 import org.apache.cxf.tools.common.model.JavaInterface;
 import org.apache.cxf.tools.common.model.JavaModel;
 import org.apache.cxf.tools.util.ClassCollector;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper.InterfaceMapper;
 
 public class PortTypeProcessor extends AbstractProcessor {
@@ -46,25 +46,25 @@
     public PortTypeProcessor(ToolContext c) {
         super(c);
     }
-    
+
     public void processClassNames(ServiceInfo serviceInfo) throws ToolException {
         InterfaceInfo interfaceInfo = serviceInfo.getInterface();
         if (interfaceInfo == null) {
             return;
         }
-        
+
         JavaInterface intf = new InterfaceMapper(context).map(interfaceInfo);
 
         JAXWSBinding jaxwsBinding = serviceInfo.getDescription().getExtensor(JAXWSBinding.class);
         JAXWSBinding infBinding = interfaceInfo.getExtensor(JAXWSBinding.class);
-        if (infBinding != null && infBinding.getPackage() != null) { 
+        if (infBinding != null && infBinding.getPackage() != null) {
             intf.setPackageName(infBinding.getPackage());
         } else if (jaxwsBinding != null && jaxwsBinding.getPackage() != null) {
-            intf.setPackageName(jaxwsBinding.getPackage());            
+            intf.setPackageName(jaxwsBinding.getPackage());
         }
-        
+
         String name = intf.getName();
-        if (infBinding != null 
+        if (infBinding != null
             && infBinding.getJaxwsClass() != null
             && infBinding.getJaxwsClass().getClassName() != null) {
             name = infBinding.getJaxwsClass().getClassName();
@@ -72,56 +72,56 @@
         intf.setName(name);
 
         ClassCollector collector = context.get(ClassCollector.class);
-        collector.addSeiClassName(intf.getPackageName(), 
+        collector.addSeiClassName(intf.getPackageName(),
                                   intf.getName(),
                                   intf.getPackageName() + "." + intf.getName());
     }
-    
+
     public void process(ServiceInfo serviceInfo) throws ToolException {
         operationMap.clear();
         JavaModel jmodel = context.get(JavaModel.class);
 
 
         InterfaceInfo interfaceInfo = serviceInfo.getInterface();
-        
+
         if (interfaceInfo == null) {
             return;
         }
- 
+
         JavaInterface intf = new InterfaceMapper(context).map(interfaceInfo);
         intf.setJavaModel(jmodel);
 
         JAXWSBinding jaxwsBinding = serviceInfo.getDescription().getExtensor(JAXWSBinding.class);
         JAXWSBinding infBinding = interfaceInfo.getExtensor(JAXWSBinding.class);
-        if (infBinding != null && infBinding.getPackage() != null) { 
+        if (infBinding != null && infBinding.getPackage() != null) {
             intf.setPackageName(infBinding.getPackage());
         } else if (jaxwsBinding != null && jaxwsBinding.getPackage() != null) {
-            intf.setPackageName(jaxwsBinding.getPackage());            
+            intf.setPackageName(jaxwsBinding.getPackage());
         }
-        
+
         String name = intf.getName();
-        if (infBinding != null 
+        if (infBinding != null
             && infBinding.getJaxwsClass() != null
             && infBinding.getJaxwsClass().getClassName() != null) {
             name = infBinding.getJaxwsClass().getClassName();
         }
         intf.setName(name);
-        
+
         Element handler = (Element)context.get(ToolConstants.HANDLER_CHAIN);
         intf.setHandlerChains(handler);
-        
-        
+
+
         Collection<OperationInfo> operations = interfaceInfo.getOperations();
-       
+
         for (OperationInfo operation : operations) {
             if (isOverloading(operation.getName())) {
-                LOG.log(Level.WARNING, "SKIP_OVERLOADED_OPERATION", operation.getName()); 
+                LOG.log(Level.WARNING, "SKIP_OVERLOADED_OPERATION", operation.getName());
                 continue;
             }
             OperationProcessor operationProcessor = new OperationProcessor(context);
             operationProcessor.process(intf, operation);
         }
-        
+
         jmodel.setLocation(intf.getLocation());
         jmodel.addInterface(intf.getName(), intf);
     }
@@ -135,5 +135,5 @@
         return false;
     }
 
-   
+
 }

Modified: incubator/cxf/trunk/tools/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/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java Thu Jul 26 20:04:03 2007
@@ -63,7 +63,7 @@
 import org.apache.cxf.tools.util.ClassCollector;
 import org.apache.cxf.tools.util.NameUtil;
 import org.apache.cxf.tools.util.SOAPBindingUtil;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 
 public class ServiceProcessor extends AbstractProcessor {
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapper.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapper.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapper.java Thu Jul 26 20:04:03 2007
@@ -23,11 +23,11 @@
 
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.tools.common.model.JavaMethod;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
 
 public final class MethodMapper {
-    
+
     public JavaMethod map(OperationInfo operation) {
         JavaMethod method = new JavaMethod();
         // set default Document Bare style
@@ -37,7 +37,7 @@
 
         method.setName(ProcessorUtil.mangleNameToVariableName(operationName));
         method.setOperationName(operationName);
-        
+
         JAXWSBinding opBinding = operation.getExtensor(JAXWSBinding.class);
         if (opBinding != null
             && opBinding.getMethodName() != null) {
@@ -50,7 +50,7 @@
         } else {
             method.setStyle(OperationType.REQUEST_RESPONSE);
         }
-        
+
         method.setWrapperStyle(operation.isUnwrappedCapable());
 
         return method;

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java Thu Jul 26 20:04:03 2007
@@ -54,10 +54,10 @@
 import org.apache.cxf.tools.util.SOAPBindingUtil;
 import org.apache.cxf.tools.validator.internal.WSDL11Validator;
 import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.CustomizationParser;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingDeserializer;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingSerializer;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.CustomizationParser;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer;
 import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
 
 public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder<Definition> {

Copied: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParserTest.java (from r560075, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParserTest.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParserTest.java?view=diff&rev=560076&p1=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParserTest.java&r1=560075&p2=incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParserTest.java&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParserTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParserTest.java Thu Jul 26 20:04:03 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion;
+package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Thu Jul 26 20:04:03 2007
@@ -29,7 +29,7 @@
 
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties Thu Jul 26 20:04:03 2007
@@ -35,3 +35,4 @@
 FAIL_TO_CREATE_SCHEMA_EXTENSION = Failed to create schema extension
 FOUND_NO_WSDL_PLUGIN = Could not find wsdl plugin <{0}> for wsdl extension point {1}
 FOUND_WSDL_PLUGINS = Found wsdl plugins {0}
+BINDING_ALREADY_EXIST = Input binding already exist in imported contract

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java Thu Jul 26 20:04:03 2007
@@ -46,16 +46,16 @@
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.cxf.tools.common.dom.ExtendedDocumentBuilder;
 import org.apache.cxf.tools.util.FileWriterUtil;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingDeserializer;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBindingSerializer;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer;
 import org.apache.cxf.wsdl.WSDLConstants;
 
 public class XSDToWSDLProcessor implements Processor {
     private static final Logger LOG = LogUtils.getL7dLogger(XSDToWSDLProcessor.class);
     private static final String XSD_FILE_NAME_EXT = ".xsd";
     private static final String WSDL_FILE_NAME_EXT = ".wsdl";
-    
+
     private Definition wsdlDefinition;
     private ExtensionRegistry registry;
     private WSDLFactory wsdlFactory;
@@ -162,7 +162,7 @@
         registry.registerDeserializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingDeserializer());
         registry.mapExtensionTypes(clz, ToolConstants.JAXWS_BINDINGS, JAXWSBinding.class);
     }
-    
+
     private Writer getOutputWriter() throws ToolException {
         Writer writer = null;
         String newName = null;

Modified: incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=560076&r1=560075&r2=560076
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Thu Jul 26 20:04:03 2007
@@ -81,7 +81,7 @@
             while (it.hasNext()) {
                 Object obj = it.next();
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
-                if (soapBinding != null 
+                if (soapBinding != null
                     && soapBinding.getStyle().equalsIgnoreCase("document")) {
                     found = true;
                     break;
@@ -208,19 +208,19 @@
 
     @Test
     public void testNewSoap12Binding() throws Exception {
-        String[] args = new String[] {"-i", "Greeter", 
-                                      "-soap12",                                      
+        String[] args = new String[] {"-i", "Greeter",
+                                      "-soap12",
                                       "-b", "Greeter_SOAP12Binding",
-                                      "-d", output.getCanonicalPath(), 
+                                      "-d", output.getCanonicalPath(),
                                       "-o", "hello_world_soap12_newbinding.wsdl",
                                       getLocation("/misctools_wsdl/hello_world_soap12_nobinding.wsdl")};
         WSDLToSoap.main(args);
 
         File outputFile = new File(output, "hello_world_soap12_newbinding.wsdl");
-        
+
         assertTrue("New wsdl file is not generated", outputFile.exists());
         assertTrue("Generated file is empty!", outputFile.length() > 0);
-        
+
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
         processor.setEnvironment(env);
         try {
@@ -235,7 +235,7 @@
             Iterator it = binding.getExtensibilityElements().iterator();
 
             while (it.hasNext()) {
-                Object obj = it.next();                
+                Object obj = it.next();
                 assertTrue(SOAPBindingUtil.isSOAPBinding(obj));
                 assertTrue(obj instanceof SOAP12Binding);
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
@@ -244,7 +244,7 @@
                 assertTrue(WSDLConstants.SOAP12_HTTP_TRANSPORT.
                            equalsIgnoreCase(soapBinding.getTransportURI()));
             }
-            
+
             BindingOperation bo = binding.getBindingOperation("sayHi", null, null);
             if (bo == null) {
                 fail("Element <wsdl:operation name=\"sayHi\"> Missed!");
@@ -272,21 +272,21 @@
         } catch (ToolException e) {
             fail("Exception Encountered when parsing wsdl, error: " + e.getMessage());
         }
-    }    
-    
+    }
+
     @Test
     public void testAddSoap12Binding() throws Exception {
-        String[] args = new String[] {"-i", "Greeter", 
+        String[] args = new String[] {"-i", "Greeter",
                                       "-soap12",
                                       "-b", "Greeter_SOAP12Binding",
-                                      "-d", output.getCanonicalPath(), 
+                                      "-d", output.getCanonicalPath(),
                                       "-o", "hello_world_soap12_newbinding.wsdl",
                                       getLocation("/misctools_wsdl/hello_world_soap12.wsdl")};
         WSDLToSoap.main(args);
 
         File outputFile = new File(output, "hello_world_soap12_newbinding.wsdl");
         assertTrue("New wsdl file is not generated", outputFile.exists());
-        
+
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
         processor.setEnvironment(env);
         try {
@@ -301,15 +301,15 @@
             Iterator it = binding.getExtensibilityElements().iterator();
 
             while (it.hasNext()) {
-                Object obj = it.next();                
+                Object obj = it.next();
                 assertTrue(SOAPBindingUtil.isSOAPBinding(obj));
                 assertTrue(obj instanceof SOAP12Binding);
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
                 assertNotNull(soapBinding);
                 assertTrue("document".equalsIgnoreCase(soapBinding.getStyle()));
-    
+
             }
-            
+
             BindingOperation bo = binding.getBindingOperation("sayHi", null, null);
             if (bo == null) {
                 fail("Element <wsdl:operation name=\"sayHi\"> Missed!");
@@ -357,7 +357,7 @@
         } catch (ToolException e) {
             fail("Exception Encountered when parsing wsdl, error: " + e.getMessage());
         }
-    }    
+    }
 
     @Test
     public void testPartValidation() throws Exception {
@@ -374,10 +374,10 @@
             processor.process();
             fail("Do not catch expected tool exception for Part Reference illegal!");
         } catch (Exception e) {
-            
+
             if (!(e instanceof ToolException && e.toString()
                 .indexOf("does not use type reference (does not conform to RPC style)") >= 0)) {
-                
+
                 fail("Do not catch tool exception for Part Reference illegal, "
                      + "catch other unexpected exception: " + e.getMessage());
             }
@@ -386,24 +386,24 @@
 
     @Test
     public void testWithoutBinding() throws Exception {
-        String[] args = new String[] {"-i", "Greeter",                                    
+        String[] args = new String[] {"-i", "Greeter",
                                       "-b", "Greeter_SOAPBinding",
-                                      "-d", output.getCanonicalPath(), 
+                                      "-d", output.getCanonicalPath(),
                                       "-o", "hello_world_soap_newbinding.wsdl",
                                       getLocation("/misctools_wsdl/hello_world_nobinding.wsdl")};
         WSDLToSoap.main(args);
-        
+
         File outputFile = new File(output, "hello_world_soap_newbinding.wsdl");
-        
+
         assertTrue("New wsdl file is not generated", outputFile.exists());
         assertTrue("Generated file is empty!", outputFile.length() > 0);
-        
+
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
         processor.setEnvironment(env);
         try {
             processor.parseWSDL(outputFile.getAbsolutePath());
             Binding binding = processor.getWSDLDefinition()
-                .getBinding(new QName(processor.getWSDLDefinition().getTargetNamespace(), 
+                .getBinding(new QName(processor.getWSDLDefinition().getTargetNamespace(),
                                       "Greeter_SOAPBinding"));
             if (binding == null) {
                 fail("Element wsdl:binding Greeter_SOAPBinding_NewBinding Missed!");
@@ -411,7 +411,7 @@
             Iterator it = binding.getExtensibilityElements().iterator();
 
             while (it.hasNext()) {
-                Object obj = it.next();                
+                Object obj = it.next();
                 assertTrue(SOAPBindingUtil.isSOAPBinding(obj));
                 assertTrue(obj instanceof SOAPBinding);
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
@@ -420,7 +420,7 @@
                 assertTrue(WSDLConstants.NS_SOAP11_HTTP_BINDING.
                            equalsIgnoreCase(soapBinding.getTransportURI()));
             }
-            
+
             BindingOperation bo = binding.getBindingOperation("sayHi", null, null);
             if (bo == null) {
                 fail("Element <wsdl:operation name=\"sayHi\"> Missed!");
@@ -447,7 +447,7 @@
             }
         } catch (ToolException e) {
             fail("Exception Encountered when parsing wsdl, error: " + e.getMessage());
-        }        
+        }
     }
 
     @Test



Mime
View raw message