cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r454143 [1/2] - in /incubator/cxf/trunk: ./ common/common/src/main/java/org/apache/cxf/helpers/ maven_repo/wsdl4j/ maven_repo/wsdl4j/wsdl4j/ maven_repo/wsdl4j/wsdl4j/1.6.1/ rt/core/src/main/java/org/apache/cxf/wsdl11/ systests/src/test/java...
Date Sun, 08 Oct 2006 13:53:29 GMT
Author: mmao
Date: Sun Oct  8 06:53:28 2006
New Revision: 454143

URL: http://svn.apache.org/viewvc?view=rev&rev=454143
Log:
Tools support soap12

* Upgrade the wsdl4j from 1.5.2 to 1.6.1
* Turn on the soap12 support.
* To reuse the code, we use the proxy mechanism to support soap12 in tools.
* Added Soap wsdl extensions model to work as a proxy to soap11 and soap12. in this way, we changed the least code.
* Remove elementFormDefault attribute from couple wsdl files, which are not valid wsdl attribute.
* Remove system.out.print from system tests.

Added:
    incubator/cxf/trunk/maven_repo/wsdl4j/
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml   (with props)
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml.sha1
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar   (with props)
    incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar.sha1
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java   (with props)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java   (with props)
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/doc_lit_bare.wsdl   (with props)
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
    incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
    incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
    incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/Messages.properties
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessor.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToProcessor.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/AbstractProcessor.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ServiceProcessor.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java Sun Oct  8 06:53:28 2006
@@ -22,12 +22,15 @@
 import java.io.File;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import javax.jws.WebParam;
 import javax.wsdl.Binding;
-import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
-import javax.wsdl.BindingOutput;
 import javax.wsdl.Definition;
 import javax.wsdl.Input;
 import javax.wsdl.Message;
@@ -35,10 +38,6 @@
 import javax.wsdl.Output;
 import javax.wsdl.Part;
 import javax.wsdl.PortType;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPOperation;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.ws.RequestWrapper;
@@ -165,16 +164,16 @@
         return partsList;
     }
 
-    public String getBindingStyle(Binding binding) {
-        Iterator ite = binding.getExtensibilityElements().iterator();
-        while (ite.hasNext()) {
-            Object obj = ite.next();
-            if (obj instanceof SOAPBinding) {
-                return ((SOAPBinding)obj).getStyle();
-            }
-        }
-        return "";
-    }
+//    public String getBindingStyle(Binding binding) {
+//        Iterator ite = binding.getExtensibilityElements().iterator();
+//        while (ite.hasNext()) {
+//            Object obj = ite.next();
+//            if (obj instanceof SOAPBinding) {
+//                return ((SOAPBinding)obj).getStyle();
+//            }
+//        }
+//        return "";
+//    }
 
     public Binding getBinding(BindingOperation bop, Definition def) {
         Iterator ite = def.getBindings().values().iterator();
@@ -190,81 +189,81 @@
         return null;
     }
 
-    public String getSOAPOperationStyle(BindingOperation bop) {
-        String style = "";
-        if (bop != null) {
-            Iterator ite = bop.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
-                if (obj instanceof SOAPOperation) {
-                    SOAPOperation soapOperation = (SOAPOperation)obj;
-                    style = soapOperation.getStyle();
-                    break;
-                }
-            }
-        }
-        return style;
-    }
-
-    public SOAPBody getBindingInputSOAPBody(BindingOperation bop) {
-        BindingInput bindingInput = bop.getBindingInput();
-        if (bindingInput != null) {
-            Iterator ite = bindingInput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
-                if (obj instanceof SOAPBody) {
-                    return (SOAPBody)obj;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public SOAPHeader getBindingInputSOAPHeader(BindingOperation bop) {
-        BindingInput bindingInput = bop.getBindingInput();
-        if (bindingInput != null) {
-            Iterator ite = bindingInput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
-                if (obj instanceof SOAPHeader) {
-                    return (SOAPHeader)obj;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public SOAPHeader getBindingOutputSOAPHeader(BindingOperation bop) {
-        BindingOutput bindingOutput = bop.getBindingOutput();
-        if (bindingOutput != null) {
-            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
-                if (obj instanceof SOAPHeader) {
-                    return (SOAPHeader)obj;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public SOAPBody getBindingOutputSOAPBody(BindingOperation bop) {
-        BindingOutput bindingOutput = bop.getBindingOutput();
-        if (bindingOutput != null) {
-            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
-            while (ite.hasNext()) {
-                Object obj = ite.next();
-                if (obj instanceof SOAPBody) {
-                    return (SOAPBody)obj;
-                }
-            }
-        }
-
-        return null;
-    }
+//    public String getSOAPOperationStyle(BindingOperation bop) {
+//        String style = "";
+//        if (bop != null) {
+//            Iterator ite = bop.getExtensibilityElements().iterator();
+//            while (ite.hasNext()) {
+//                Object obj = ite.next();
+//                if (obj instanceof SOAPOperation) {
+//                    SOAPOperation soapOperation = (SOAPOperation)obj;
+//                    style = soapOperation.getStyle();
+//                    break;
+//                }
+//            }
+//        }
+//        return style;
+//    }
+
+//    public SOAPBody getBindingInputSOAPBody(BindingOperation bop) {
+//        BindingInput bindingInput = bop.getBindingInput();
+//        if (bindingInput != null) {
+//            Iterator ite = bindingInput.getExtensibilityElements().iterator();
+//            while (ite.hasNext()) {
+//                Object obj = ite.next();
+//                if (obj instanceof SOAPBody) {
+//                    return (SOAPBody)obj;
+//                }
+//            }
+//        }
+//
+//        return null;
+//    }
+
+//    public SOAPHeader getBindingInputSOAPHeader(BindingOperation bop) {
+//        BindingInput bindingInput = bop.getBindingInput();
+//        if (bindingInput != null) {
+//            Iterator ite = bindingInput.getExtensibilityElements().iterator();
+//            while (ite.hasNext()) {
+//                Object obj = ite.next();
+//                if (obj instanceof SOAPHeader) {
+//                    return (SOAPHeader)obj;
+//                }
+//            }
+//        }
+//
+//        return null;
+//    }
+
+//    public SOAPHeader getBindingOutputSOAPHeader(BindingOperation bop) {
+//        BindingOutput bindingOutput = bop.getBindingOutput();
+//        if (bindingOutput != null) {
+//            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
+//            while (ite.hasNext()) {
+//                Object obj = ite.next();
+//                if (obj instanceof SOAPHeader) {
+//                    return (SOAPHeader)obj;
+//                }
+//            }
+//        }
+//
+//        return null;
+//    }
+
+//    public SOAPBody getBindingOutputSOAPBody(BindingOperation bop) {
+//        BindingOutput bindingOutput = bop.getBindingOutput();
+//        if (bindingOutput != null) {
+//            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
+//            while (ite.hasNext()) {
+//                Object obj = ite.next();
+//                if (obj instanceof SOAPBody) {
+//                    return (SOAPBody)obj;
+//                }
+//            }
+//        }
+//
+//        return null;
+//    }
 
     public Definition getDefinition(File wsdlFile) throws Exception {
         WSDLFactory wsdlFactory = WSDLFactory.newInstance();
@@ -273,72 +272,72 @@
         return reader.readWSDL(wsdlFile.toURL().toString());
     }
 
-    public boolean isMixedStyle(Binding binding) {
-        Iterator ite = binding.getExtensibilityElements().iterator();
-        String bindingStyle = "";
-        String previousOpStyle = "";
-        String style = "";
-        while (ite.hasNext()) {
-            Object obj = ite.next();
-            if (obj instanceof SOAPBinding) {
-                SOAPBinding soapBinding = (SOAPBinding)obj;
-                bindingStyle = soapBinding.getStyle();
-                if (bindingStyle == null) {
-                    bindingStyle = "";
-                }
-            }
-        }
-        Iterator ite2 = binding.getBindingOperations().iterator();
-        while (ite2.hasNext()) {
-            BindingOperation bop = (BindingOperation)ite2.next();
-            Iterator ite3 = bop.getExtensibilityElements().iterator();
-            while (ite3.hasNext()) {
-                Object obj = ite3.next();
-
-                if (obj instanceof SOAPOperation) {
-                    SOAPOperation soapOperation = (SOAPOperation)obj;
-                    style = soapOperation.getStyle();
-                    if (style == null) {
-                        style = "";
-                    }
-
-                    if ("".equals(bindingStyle) && "".equals(previousOpStyle) || "".equals(bindingStyle)
-                        && previousOpStyle.equalsIgnoreCase(style)) {
-                        previousOpStyle = style;
-
-                    } else if (!"".equals(bindingStyle) && "".equals(previousOpStyle)
-                               && bindingStyle.equalsIgnoreCase(style)
-                               || bindingStyle.equalsIgnoreCase(previousOpStyle)
-                               && bindingStyle.equalsIgnoreCase(style)) {
-                        previousOpStyle = style;
-                    } else if (!"".equals(bindingStyle) && "".equals(style) && "".equals(previousOpStyle)) {
-                        continue;
-                    } else {
-                        return true;
-                    }
-
-                }
-
-            }
-        }
-
-        return false;
-
-    }
-
-    public String getCanonicalBindingStyle(Binding binding) {
-        String bindingStyle = getBindingStyle(binding);
-        if (bindingStyle != null && !("".equals(bindingStyle))) {
-            return bindingStyle;
-        }
-        for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
-            BindingOperation bindingOp = (BindingOperation)ite2.next();
-            String bopStyle = getSOAPOperationStyle(bindingOp);
-            if (!"".equals(bopStyle)) {
-                return bopStyle;
-            }
-        }
-        return "";
-
-    }
+//    public boolean isMixedStyle(Binding binding) {
+//        Iterator ite = binding.getExtensibilityElements().iterator();
+//        String bindingStyle = "";
+//        String previousOpStyle = "";
+//        String style = "";
+//        while (ite.hasNext()) {
+//            Object obj = ite.next();
+//            if (obj instanceof SOAPBinding) {
+//                SOAPBinding soapBinding = (SOAPBinding)obj;
+//                bindingStyle = soapBinding.getStyle();
+//                if (bindingStyle == null) {
+//                    bindingStyle = "";
+//                }
+//            }
+//        }
+//        Iterator ite2 = binding.getBindingOperations().iterator();
+//        while (ite2.hasNext()) {
+//            BindingOperation bop = (BindingOperation)ite2.next();
+//            Iterator ite3 = bop.getExtensibilityElements().iterator();
+//            while (ite3.hasNext()) {
+//                Object obj = ite3.next();
+//
+//                if (obj instanceof SOAPOperation) {
+//                    SOAPOperation soapOperation = (SOAPOperation)obj;
+//                    style = soapOperation.getStyle();
+//                    if (style == null) {
+//                        style = "";
+//                    }
+//
+//                    if ("".equals(bindingStyle) && "".equals(previousOpStyle) || "".equals(bindingStyle)
+//                        && previousOpStyle.equalsIgnoreCase(style)) {
+//                        previousOpStyle = style;
+//
+//                    } else if (!"".equals(bindingStyle) && "".equals(previousOpStyle)
+//                               && bindingStyle.equalsIgnoreCase(style)
+//                               || bindingStyle.equalsIgnoreCase(previousOpStyle)
+//                               && bindingStyle.equalsIgnoreCase(style)) {
+//                        previousOpStyle = style;
+//                    } else if (!"".equals(bindingStyle) && "".equals(style) && "".equals(previousOpStyle)) {
+//                        continue;
+//                    } else {
+//                        return true;
+//                    }
+//
+//                }
+//
+//            }
+//        }
+//
+//        return false;
+//
+//    }
+//
+//    public String getCanonicalBindingStyle(Binding binding) {
+//        String bindingStyle = getBindingStyle(binding);
+//        if (bindingStyle != null && !("".equals(bindingStyle))) {
+//            return bindingStyle;
+//        }
+//        for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
+//            BindingOperation bindingOp = (BindingOperation)ite2.next();
+//            String bopStyle = getSOAPOperationStyle(bindingOp);
+//            if (!"".equals(bopStyle)) {
+//                return bopStyle;
+//            }
+//        }
+//        return "";
+//
+//    }
 }

Added: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml (added)
+++ incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml Sun Oct  8 06:53:28 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>wsdl4j</groupId>
+    <artifactId>wsdl4j</artifactId>
+    <version>1.6.1</version>
+    <packaging>jar</packaging>
+    <name>WSDL4J</name>
+    <url>http://sf.net/projects/wsdl4j</url>
+    <description>Java stub generator for WSDL</description>
+    <licenses>
+	<license>
+	    <name>Common Public License Version 1.0</name>
+	    <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+	    <distribution>repo</distribution>
+	</license>
+    </licenses>
+    <dependencies/>
+</project>
+

Propchange: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml.sha1
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml.sha1?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml.sha1 (added)
+++ incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/pom.xml.sha1 Sun Oct  8 06:53:28 2006
@@ -0,0 +1 @@
+4944f4536595a5f0b9c6a47499e749466418c41c
\ No newline at end of file

Added: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar?view=auto&rev=454143
==============================================================================
Binary file - no diff available.

Propchange: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar.sha1
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar.sha1?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar.sha1 (added)
+++ incubator/cxf/trunk/maven_repo/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar.sha1 Sun Oct  8 06:53:28 2006
@@ -0,0 +1 @@
+9e9cee064ec2c9c01e0cd6b8bffd1a7013d81f65
\ No newline at end of file

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Sun Oct  8 06:53:28 2006
@@ -153,7 +153,7 @@
         <jetty.version>5.1.9</jetty.version>
         <saaj.version>1.3</saaj.version>
         <spring.version>2.0-rc2</spring.version>
-        <wsdl4j.version>1.5.2</wsdl4j.version>
+        <wsdl4j.version>1.6.1</wsdl4j.version>
         <derby.version>10.1.1.0</derby.version>
 
 
@@ -508,7 +508,7 @@
             <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
-                <version>1.5.2</version>
+                <version>${wsdl4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Sun Oct  8 06:53:28 2006
@@ -141,8 +141,8 @@
         }
         WSDLReader reader = factory.newWSDLReader();
         reader.setFeature("javax.wsdl.verbose", false);
-        reader.setExtensionRegistry(registry);
-        Definition def = reader.readWSDL(null, el);
+        reader.setExtensionRegistry(registry);       
+        Definition def = reader.readWSDL("", el);
         synchronized (definitionsMap) {
             definitionsMap.put(el, def);
         }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedBusTest.java Sun Oct  8 06:53:28 2006
@@ -51,10 +51,6 @@
         InstrumentationManagerImpl imi = (InstrumentationManagerImpl)im;
         InstrumentationType i = imi.getInstrumentation();
         assertNotNull(i);
-        System.out.println("isEnabled: " + i.isEnabled());
-        System.out.println("isJMXEnabled: " + i.isJMXEnabled());
-        
-
 
         bus.shutdown(true);
     }

Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/doc_lit_bare.wsdl Sun Oct  8 06:53:28 2006
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_doc_lit_bare" xmlns:x1="http://apache.org/hello_world_doc_lit_bare/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_doc_lit_bare" name="DocLitBare" elementFormDefault="qualified">
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_doc_lit_bare" xmlns:x1="http://apache.org/hello_world_doc_lit_bare/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_doc_lit_bare" name="DocLitBare">
     <wsdl:types>
         <schema targetNamespace="http://apache.org/hello_world_doc_lit_bare/types" xmlns:tns="http://apache.org/hello_world_doc_lit_bare/types" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
             <complexType name="TradePriceData">

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java Sun Oct  8 06:53:28 2006
@@ -0,0 +1,44 @@
+/**
+ * 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.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+public class ExtensionInvocationHandler implements InvocationHandler {
+
+    private Object obj;
+    public ExtensionInvocationHandler(Object o) {
+        obj = o;
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        Class[] clzs = null;
+        if (args != null) {
+            clzs = new Class[args.length];
+            for (int i = 0; i < args.length; i++) {
+                clzs[i] = args[i].getClass();
+            }
+        }
+        
+        Method m = obj.getClass().getDeclaredMethod(method.getName(), clzs);
+        return m.invoke(obj, args);
+    }
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ExtensionInvocationHandler.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java Sun Oct  8 06:53:28 2006
@@ -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.
+ */
+
+package org.apache.cxf.tools.common.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+
+public interface SoapAddress extends SOAPAddress, SOAP12Address {
+
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapAddress.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java Sun Oct  8 06:53:28 2006
@@ -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.
+ */
+
+package org.apache.cxf.tools.common.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+
+public interface SoapBinding extends SOAPBinding, SOAP12Binding {
+    
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBinding.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java Sun Oct  8 06:53:28 2006
@@ -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.
+ */
+
+package org.apache.cxf.tools.common.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap12.SOAP12Body;
+
+public interface SoapBody extends SOAPBody, SOAP12Body {
+    
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapBody.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java Sun Oct  8 06:53:28 2006
@@ -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.
+ */
+
+package org.apache.cxf.tools.common.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPFault;
+import javax.wsdl.extensions.soap12.SOAP12Fault;
+
+public interface SoapFault extends SOAPFault, SOAP12Fault {
+
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapFault.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java Sun Oct  8 06:53:28 2006
@@ -0,0 +1,26 @@
+/**
+ * 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.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.extensions.soap12.SOAP12Header;
+
+public interface SoapHeader extends SOAPHeader, SOAP12Header {
+
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeader.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java Sun Oct  8 06:53:28 2006
@@ -0,0 +1,26 @@
+/**
+ * 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.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPHeaderFault;
+import javax.wsdl.extensions.soap12.SOAP12HeaderFault;
+
+public interface SoapHeaderFault extends SOAPHeaderFault, SOAP12HeaderFault {
+
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapHeaderFault.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java (added)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java Sun Oct  8 06:53:28 2006
@@ -0,0 +1,26 @@
+/**
+ * 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.extensions.soap;
+
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
+
+public interface SoapOperation extends SOAPOperation, SOAP12Operation {
+
+}

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/extensions/soap/SoapOperation.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/Messages.properties Sun Oct  8 06:53:28 2006
@@ -1,6 +1,6 @@
 PARAMETER_ALREADY_EXIST = Parameter : {0} already exist in the wsdl model
 CREATE_JAXBRICONTEXT_EXCEPTION = Fail to create jaxbRIContext
-FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition
+FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition in WSDLModel
 
 
 

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Sun Oct  8 06:53:28 2006
@@ -19,9 +19,35 @@
 
 package org.apache.cxf.tools.util;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
+import javax.wsdl.Binding;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPFault;
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.extensions.soap.SOAPOperation;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.wsdl.extensions.soap12.SOAP12Body;
+import javax.wsdl.extensions.soap12.SOAP12Fault;
+import javax.wsdl.extensions.soap12.SOAP12Header;
+import javax.wsdl.extensions.soap12.SOAP12Operation;
+
+import org.apache.cxf.tools.common.ExtensionInvocationHandler;
+import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
+import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
+import org.apache.cxf.tools.common.extensions.soap.SoapHeader;
+import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
 
 public final class SOAPBindingUtil {
     private static Map<String, String> bindingMap = new HashMap<String, String>();
@@ -40,5 +66,225 @@
 
     public static String getBindingAnnotation(String key) {
         return bindingMap.get(key.toUpperCase());
-    }  
+    }
+
+    public static <T> T getProxy(Class<T> cls, Object obj) {
+        InvocationHandler ih = new ExtensionInvocationHandler(obj);
+        Object proxy = Proxy.newProxyInstance(cls.getClassLoader(), new Class[] {cls}, ih);
+        return cls.cast(proxy);
+    }
+
+    public static String getBindingStyle(Binding binding) {
+        Iterator ite = binding.getExtensibilityElements().iterator();
+        while (ite.hasNext()) {
+            Object obj = ite.next();
+            if (isSOAPBinding(obj)) {
+                return getSoapBinding(obj).getStyle();
+            }
+        }
+        return "";
+    }
+
+    public static SoapOperation getSoapOperation(Object obj) {
+        if (isSOAPOperation(obj)) {
+            return getProxy(SoapOperation.class, obj);
+        }
+        return null;
+    }
+
+    public static String getSOAPOperationStyle(BindingOperation bop) {
+        String style = "";
+        if (bop != null) {
+            Iterator ite = bop.getExtensibilityElements().iterator();
+            while (ite.hasNext()) {
+                Object obj = ite.next();
+                if (isSOAPOperation(obj)) {
+                    style = getSoapOperation(obj).getStyle();
+                    break;
+                }
+            }
+        }
+        return style;
+    }
+
+    public static SoapBody getBindingInputSOAPBody(BindingOperation bop) {
+        BindingInput bindingInput = bop.getBindingInput();
+        if (bindingInput != null) {
+            Iterator ite = bindingInput.getExtensibilityElements().iterator();
+            while (ite.hasNext()) {
+                Object obj = ite.next();
+                if (isSOAPBody(obj)) {
+                    return getSoapBody(obj);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static SoapBody getBindingOutputSOAPBody(BindingOperation bop) {
+        BindingOutput bindingOutput = bop.getBindingOutput();
+        if (bindingOutput != null) {
+            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
+            while (ite.hasNext()) {
+                Object obj = ite.next();
+                if (isSOAPBody(obj)) {
+                    return getSoapBody(obj);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static SoapBody getSoapBody(Object obj) {
+        if (isSOAPBody(obj)) {
+            return getProxy(SoapBody.class, obj);
+        }
+        return null;
+    }
+
+    public static boolean isSOAPBody(Object obj) {
+        return obj instanceof SOAPBody || obj instanceof SOAP12Body;
+    }
+
+    public static boolean isSOAPHeader(Object obj) {
+        return obj instanceof SOAPHeader || obj instanceof SOAP12Header;
+    }
+
+    public static SoapHeader getSoapHeader(Object obj) {
+        if (isSOAPHeader(obj)) {
+            return getProxy(SoapHeader.class, obj);
+        }
+        return null;
+    }
+
+    public static SoapAddress getSoapAddress(Object obj) {
+        if (isSOAPAddress(obj)) {
+            return getProxy(SoapAddress.class, obj);
+        }
+        return null;
+    }
+
+    public static boolean isSOAPAddress(Object obj) {
+        return obj instanceof SOAPAddress || obj instanceof SOAP12Address;
+    }
+
+    public static SoapHeader getBindingInputSOAPHeader(BindingOperation bop) {
+        BindingInput bindingInput = bop.getBindingInput();
+        if (bindingInput != null) {
+            Iterator ite = bindingInput.getExtensibilityElements().iterator();
+            while (ite.hasNext()) {
+                Object obj = ite.next();
+                if (isSOAPHeader(obj)) {
+                    return getProxy(SoapHeader.class, obj);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static SoapHeader getBindingOutputSOAPHeader(BindingOperation bop) {
+        BindingOutput bindingOutput = bop.getBindingOutput();
+        if (bindingOutput != null) {
+            Iterator ite = bindingOutput.getExtensibilityElements().iterator();
+            while (ite.hasNext()) {
+                Object obj = ite.next();
+                if (isSOAPHeader(obj)) {
+                    return getProxy(SoapHeader.class, obj);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static SoapBinding getSoapBinding(Object obj) {
+        if (isSOAPBinding(obj)) {
+            return getProxy(SoapBinding.class, obj);
+        }
+        return null;
+    }
+
+    public static boolean isSOAPBinding(Object obj) {
+        return obj instanceof SOAPBinding || obj instanceof SOAP12Binding;
+    }
+
+    public static boolean isMixedStyle(Binding binding) {
+        Iterator ite = binding.getExtensibilityElements().iterator();
+        String bindingStyle = "";
+        String previousOpStyle = "";
+        String style = "";
+        while (ite.hasNext()) {
+            Object obj = ite.next();
+            if (isSOAPBinding(obj)) {
+                SoapBinding soapBinding = getSoapBinding(obj);
+                bindingStyle = soapBinding.getStyle();
+                if (bindingStyle == null) {
+                    bindingStyle = "";
+                }
+            }
+        }
+        Iterator ite2 = binding.getBindingOperations().iterator();
+        while (ite2.hasNext()) {
+            BindingOperation bop = (BindingOperation)ite2.next();
+            Iterator ite3 = bop.getExtensibilityElements().iterator();
+            while (ite3.hasNext()) {
+                Object obj = ite3.next();
+
+                if (isSOAPOperation(obj)) {
+                    SoapOperation soapOperation = getSoapOperation(obj);
+                    style = soapOperation.getStyle();
+                    if (style == null) {
+                        style = "";
+                    }
+
+                    if ("".equals(bindingStyle) && "".equals(previousOpStyle) || "".equals(bindingStyle)
+                        && previousOpStyle.equalsIgnoreCase(style)) {
+                        previousOpStyle = style;
+
+                    } else if (!"".equals(bindingStyle) && "".equals(previousOpStyle)
+                               && bindingStyle.equalsIgnoreCase(style)
+                               || bindingStyle.equalsIgnoreCase(previousOpStyle)
+                               && bindingStyle.equalsIgnoreCase(style)) {
+                        previousOpStyle = style;
+                    } else if (!"".equals(bindingStyle) && "".equals(style) && "".equals(previousOpStyle)) {
+                        continue;
+                    } else {
+                        return true;
+                    }
+
+                }
+
+            }
+        }
+
+        return false;
+
+    }
+
+    public static String getCanonicalBindingStyle(Binding binding) {
+        String bindingStyle = getBindingStyle(binding);
+        if (bindingStyle != null && !("".equals(bindingStyle))) {
+            return bindingStyle;
+        }
+        for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
+            BindingOperation bindingOp = (BindingOperation)ite2.next();
+            String bopStyle = getSOAPOperationStyle(bindingOp);
+            if (!"".equals(bopStyle)) {
+                return bopStyle;
+            }
+        }
+        return "";
+
+    }
+
+    public static boolean isSOAPOperation(Object obj) {
+        return obj instanceof SOAPOperation || obj instanceof SOAP12Operation;
+    }
+
+    public static boolean isSOAPFault(Object obj) {
+        return obj instanceof SOAPFault || obj instanceof SOAP12Fault;
+    }
 }

Modified: incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java Sun Oct  8 06:53:28 2006
@@ -124,7 +124,7 @@
             buildWSDLDefinition();
         } catch (WSDLException we) {
             org.apache.cxf.common.i18n.Message msg =
-                new org.apache.cxf.common.i18n.Message("FAIL_TO_CREATE_WSDL_DEFINITION", LOG);
+                new org.apache.cxf.common.i18n.Message("FAIL_TO_CREATE_WSDL_DEFINITION", LOG, wsdlURL);
             throw new ToolException(msg, we);
         }
 

Modified: incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties (original)
+++ incubator/cxf/trunk/tools/misctools/src/main/java/org/apache/cxf/tools/misc/processor/Messages.properties Sun Oct  8 06:53:28 2006
@@ -10,7 +10,7 @@
 FAIL_TO_COMPILE_GENERATE_CODES = Fail to compile generated code
 FAIL_TO_COPY_GENERATED_RESOURCE_FILE = Fail to copy generated resource file
 FAIL_TO_WRITE_FILE = Fail to write file {0}
-FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition
+FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition {0}
 FAIL_TO_INITIALIZE_VELOCITY_ENGINE = Fail to initialize velocity engine
 SERVICE_PORT_EXIST = Input service and port already exist in imported contract
 BINDING_NOT_EXIST = Input binding does not exist in imported contract

Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Sun Oct  8 06:53:28 2006
@@ -26,16 +26,16 @@
 import javax.wsdl.BindingFault;
 import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPFault;
-import javax.wsdl.extensions.soap.SOAPOperation;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.tools.common.ProcessorTestBase;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
+import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
 import org.apache.cxf.tools.misc.WSDLToSoap;
+import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 
 public class WSDLToSoapProcessorTest extends ProcessorTestBase {
@@ -68,8 +68,9 @@
             boolean found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPBinding 
-                    && ((SOAPBinding)obj).getStyle().equalsIgnoreCase("document")) {
+                SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
+                if (soapBinding != null 
+                    && soapBinding.getStyle().equalsIgnoreCase("document")) {
                     found = true;
                     break;
                 }
@@ -85,8 +86,9 @@
             found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPOperation
-                    && ((SOAPOperation)obj).getStyle().equalsIgnoreCase("document")) {
+                SoapOperation soapOperation = SOAPBindingUtil.getSoapOperation(obj);
+                if (soapOperation != null
+                    && soapOperation.getStyle().equalsIgnoreCase("document")) {
                     found = true;
                     break;
                 }
@@ -102,7 +104,7 @@
             found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPFault) {
+                if (SOAPBindingUtil.isSOAPFault(obj)) {
                     found = true;
                     break;
                 }
@@ -142,7 +144,8 @@
             boolean found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPBinding && ((SOAPBinding)obj).getStyle().equalsIgnoreCase("rpc")) {
+                SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
+                if (soapBinding != null && soapBinding.getStyle().equalsIgnoreCase("rpc")) {
                     found = true;
                     break;
 
@@ -159,7 +162,8 @@
             found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPOperation && ((SOAPOperation)obj).getStyle().equalsIgnoreCase("rpc")) {
+                SoapOperation soapOperation = SOAPBindingUtil.getSoapOperation(obj);
+                if (soapOperation != null && soapOperation.getStyle().equalsIgnoreCase("rpc")) {
                     found = true;
                     break;
                 }
@@ -172,7 +176,8 @@
             found = false;
             while (it.hasNext()) {
                 Object obj = it.next();
-                if (obj instanceof SOAPBody && ((SOAPBody)obj).getUse().equalsIgnoreCase("literal")) {
+                SoapBody soapBody = SOAPBindingUtil.getSoapBody(obj);
+                if (soapBody != null && soapBody.getUse().equalsIgnoreCase("literal")) {
                     found = true;
                     break;
                 }

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java Sun Oct  8 06:53:28 2006
@@ -30,7 +30,8 @@
 import javax.wsdl.extensions.mime.MIMEContent;
 import javax.wsdl.extensions.mime.MIMEMultipartRelated;
 import javax.wsdl.extensions.mime.MIMEPart;
-import javax.wsdl.extensions.soap.SOAPBody;
+
+import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 public class MIMEBindingValidator
     extends AbstractValidator {
@@ -71,7 +72,7 @@
             Iterator extns = mPart.getExtensibilityElements().iterator();
             while (extns.hasNext()) {
                 ExtensibilityElement extElement = (ExtensibilityElement)extns.next();
-                if (extElement instanceof SOAPBody) {
+                if (SOAPBindingUtil.isSOAPBody(extElement)) {
                     if (gotRootPart) {
                         addErrorMessage("Operation("
                                         + operationName

Modified: incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ incubator/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Sun Oct  8 06:53:28 2006
@@ -32,11 +32,12 @@
 import javax.wsdl.Operation;
 import javax.wsdl.Part;
 import javax.wsdl.PortType;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
 
 import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
+import org.apache.cxf.tools.common.extensions.soap.SoapHeader;
+import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 public class WSIBPValidator extends AbstractValidator {
     private List<String> operationMap = new ArrayList<String>();
@@ -76,19 +77,19 @@
                 }
                 BindingOperation bop = wsdlHelper.getBindingOperation(def, operation.getName());
                 Binding binding = wsdlHelper.getBinding(bop, def);
-                String bindingStyle = binding != null ? wsdlHelper.getBindingStyle(binding) : "";
+                String bindingStyle = binding != null ? SOAPBindingUtil.getBindingStyle(binding) : "";
 
-                String style = "".equals(wsdlHelper.getSOAPOperationStyle(bop))
-                    ? bindingStyle : wsdlHelper.getSOAPOperationStyle(bop);
+                String style = "".equals(SOAPBindingUtil.getSOAPOperationStyle(bop))
+                    ? bindingStyle : SOAPBindingUtil.getSOAPOperationStyle(bop);
 
                 if ("DOCUMENT".equalsIgnoreCase(style)) {
                     List<Part> partsList = wsdlHelper.getInMessageParts(operation);
                     int inmessagePartsCount = partsList.size();
-                    SOAPBody soapBody = wsdlHelper.getBindingInputSOAPBody(bop);
+                    SoapBody soapBody = SOAPBindingUtil.getBindingInputSOAPBody(bop);
                     if (soapBody != null) {
                         List parts = soapBody.getParts();
                         int boundPartSize = parts == null ? inmessagePartsCount : parts.size();
-                        SOAPHeader soapHeader = wsdlHelper.getBindingInputSOAPHeader(bop);
+                        SoapHeader soapHeader = SOAPBindingUtil.getBindingInputSOAPHeader(bop);
                         boundPartSize = soapHeader != null 
                                         && soapHeader.getMessage().equals(
                                                                           operation.getInput().getMessage()
@@ -123,11 +124,11 @@
                     }
 
                     int outmessagePartsCount = wsdlHelper.getOutMessageParts(operation).size();
-                    soapBody = wsdlHelper.getBindingOutputSOAPBody(bop);
+                    soapBody = SOAPBindingUtil.getBindingOutputSOAPBody(bop);
                     if (soapBody != null) {
                         List parts = soapBody.getParts();
                         int boundPartSize = parts == null ? outmessagePartsCount : parts.size();
-                        SOAPHeader soapHeader = wsdlHelper.getBindingOutputSOAPHeader(bop);
+                        SoapHeader soapHeader = SOAPBindingUtil.getBindingOutputSOAPHeader(bop);
                         boundPartSize = soapHeader != null 
                                         && soapHeader.getMessage().equals(
                                                                           operation.getOutput().getMessage()
@@ -170,7 +171,7 @@
         for (Iterator ite = def.getBindings().values().iterator(); ite.hasNext();) {
             Binding binding = (Binding)ite.next();
 
-            String style = wsdlHelper.getCanonicalBindingStyle(binding);
+            String style = SOAPBindingUtil.getCanonicalBindingStyle(binding);
 
             //
 
@@ -234,7 +235,7 @@
         while (ite.hasNext()) {
             Object obj = ite.next();
             Binding binding = (Binding)obj;
-            if (wsdlHelper.isMixedStyle(binding)) {
+            if (SOAPBindingUtil.isMixedStyle(binding)) {
                 addErrorMessage("Mixed style, invalid WSDL");
                 return false;
             }

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/Messages.properties?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/Messages.properties Sun Oct  8 06:53:28 2006
@@ -11,7 +11,7 @@
 FAIL_TO_COMPILE_GENERATE_CODES = Fail to compile generated code
 FAIL_TO_COPY_GENERATED_RESOURCE_FILE = Fail to copy generated resource file
 FAIL_TO_WRITE_FILE = Fail to write file {0}
-FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition
+FAIL_TO_CREATE_WSDL_DEFINITION = Fail to create wsdl definition {0}
 FAIL_TO_INITIALIZE_VELOCITY_ENGINE = Fail to initialize velocity engine
 SERVICE_PORT_EXIST = Input service and port already exist in imported contract
 BINDING_NOT_EXIST = Input binding does not exist in imported contract

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessor.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessor.java Sun Oct  8 06:53:28 2006
@@ -54,10 +54,6 @@
         init();
 
         //Generate type classes for specified databinding
-        if (isSOAP12Binding(wsdlDefinition)) {
-            Message msg = new Message("SOAP12_UNSUPPORTED", LOG);
-            throw new ToolException(msg);
-        }
         generateTypes();
 
         //Generate client, server and service stub codeS for specified profile
@@ -81,10 +77,6 @@
         validateWSDL(def);
         parseCustomization(def);
         env.put(ToolConstants.GENERATED_CLASS_COLLECTOR, classColletor);
-        if (isSOAP12Binding(def)) {
-            Message msg = new Message("SOAP12_UNSUPPORTED", LOG);
-            throw new ToolException(msg);
-        }
 
         //Generate client, server and service stub code for specified profile
         registerGenerators();
@@ -341,17 +333,5 @@
             Message msg = new Message("FAIL_TO_COPY_GENERATED_RESOURCE_FILE", LOG);
             throw new ToolException(msg, e);
         }
-    }
-
-    private boolean isSOAP12Binding(Definition def) {
-        String namespace = "";
-        for (Iterator ite = def.getNamespaces().values().iterator(); ite.hasNext();) {
-            namespace = (String)ite.next();
-            if (namespace != null
-                && namespace.toLowerCase().indexOf("http://schemas.xmlsoap.org/wsdl/soap12") >= 0) {
-                return true;
-            }
-        }
-        return false;
     }
 }

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToProcessor.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToProcessor.java Sun Oct  8 06:53:28 2006
@@ -51,7 +51,6 @@
 import com.sun.tools.xjc.model.Model;
 
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.helpers.WSDLHelper;
 import org.apache.cxf.tools.common.DataBindingGenerator;
 import org.apache.cxf.tools.common.FrontEndGenerator;
 import org.apache.cxf.tools.common.Processor;
@@ -61,6 +60,7 @@
 import org.apache.cxf.tools.common.extensions.jaxws.CustomizationParser;
 import org.apache.cxf.tools.util.ClassCollector;
 import org.apache.cxf.tools.util.FileWriterUtil;
+import org.apache.cxf.tools.util.SOAPBindingUtil;
 import org.apache.cxf.tools.util.WSDLExtensionRegister;
 import org.apache.cxf.tools.validator.internal.WSDL11Validator;
 import org.apache.cxf.tools.wsdl2java.databindings.jaxb.JAXBBindingGenerator;
@@ -152,7 +152,7 @@
         } catch (WSDLException we) {
             org.apache.cxf.common.i18n.Message msg =
                 new org.apache.cxf.common.i18n.Message("FAIL_TO_CREATE_WSDL_DEFINITION",
-                                                             LOG);
+                                                             LOG, wsdlURL);
             throw new ToolException(msg, we);
         }
 
@@ -421,24 +421,23 @@
     }
 
     private boolean isRPCEncoded(Definition def) {
-        WSDLHelper whelper = new WSDLHelper();
         Iterator ite1 = def.getBindings().values().iterator();
         while (ite1.hasNext()) {
             Binding binding = (Binding)ite1.next();
-            String bindingStyle = whelper.getBindingStyle(binding);
+            String bindingStyle = SOAPBindingUtil.getBindingStyle(binding);
 
             Iterator ite2 = binding.getBindingOperations().iterator();
             while (ite2.hasNext()) {
                 BindingOperation bop = (BindingOperation)ite2.next();
-                String bopStyle = whelper.getSOAPOperationStyle(bop);
+                String bopStyle = SOAPBindingUtil.getSOAPOperationStyle(bop);
 
                 String outputUse = "";
-                if (whelper.getBindingOutputSOAPBody(bop) != null) {
-                    outputUse = whelper.getBindingOutputSOAPBody(bop).getUse();
+                if (SOAPBindingUtil.getBindingOutputSOAPBody(bop) != null) {
+                    outputUse = SOAPBindingUtil.getBindingOutputSOAPBody(bop).getUse();
                 }
                 String inputUse = "";
-                if (whelper.getBindingInputSOAPBody(bop) != null) {
-                    inputUse = whelper.getBindingInputSOAPBody(bop).getUse();
+                if (SOAPBindingUtil.getBindingInputSOAPBody(bop) != null) {
+                    inputUse = SOAPBindingUtil.getBindingInputSOAPBody(bop).getUse();
                 }
                 if ((SOAPBinding.Style.RPC.name().equalsIgnoreCase(bindingStyle) || SOAPBinding.Style.RPC
                     .name().equalsIgnoreCase(bopStyle))

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/AbstractProcessor.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/AbstractProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/AbstractProcessor.java Sun Oct  8 06:53:28 2006
@@ -41,5 +41,4 @@
         dataBinder = (DataBindingGenerator)env.get(ToolConstants.BINDING_GENERATOR);
         
     }
-
 }

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ServiceProcessor.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ServiceProcessor.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/processor/internal/ServiceProcessor.java Sun Oct  8 06:53:28 2006
@@ -39,11 +39,7 @@
 import javax.wsdl.extensions.http.HTTPAddress;
 import javax.wsdl.extensions.http.HTTPBinding;
 import javax.wsdl.extensions.mime.MIMEMultipartRelated;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.wsdl.extensions.soap.SOAPHeader;
-import javax.wsdl.extensions.soap.SOAPOperation;
+
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.common.logging.LogUtils;
@@ -53,6 +49,11 @@
 import org.apache.cxf.tools.common.extensions.jaxws.CustomizationParser;
 import org.apache.cxf.tools.common.extensions.jaxws.JAXWSBinding;
 import org.apache.cxf.tools.common.extensions.jms.JMSAddress;
+import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
+import org.apache.cxf.tools.common.extensions.soap.SoapBinding;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
+import org.apache.cxf.tools.common.extensions.soap.SoapHeader;
+import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaInterface;
 import org.apache.cxf.tools.common.model.JavaMethod;
@@ -63,6 +64,7 @@
 import org.apache.cxf.tools.common.model.JavaType;
 import org.apache.cxf.tools.common.toolspec.parser.CommandLineParser;
 import org.apache.cxf.tools.util.ProcessorUtil;
+import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 public class ServiceProcessor extends AbstractProcessor {
 
@@ -176,7 +178,7 @@
         }
 
         if (isSoapBinding()) {
-            SOAPBinding spbd = (SOAPBinding)this.bindingObj;
+            SoapBinding spbd = SOAPBindingUtil.getProxy(SoapBinding.class, this.bindingObj);
             jport.setStyle(getSoapStyle(spbd.getStyle()));
             jport.setTransURI(spbd.getTransportURI());
         }
@@ -223,7 +225,7 @@
         // TODO: extend other bindings
         doCustomizeBinding(model, jf, binding);
         if (isSoapBinding()) {
-            SOAPBinding soapBinding = (SOAPBinding)bindingObj;
+            SoapBinding soapBinding = (SoapBinding)bindingObj;
             if (getSoapStyle(soapBinding.getStyle()) == null) {
                 jf.setSOAPStyle(javax.jws.soap.SOAPBinding.Style.DOCUMENT);
             } else {
@@ -308,12 +310,14 @@
         String use = null;
         while (inbindings != null && inbindings.hasNext()) {
             Object obj = inbindings.next();
-            if (obj instanceof SOAPBody) {
-                SOAPBody soapBody = (SOAPBody)obj;
+            
+            if (SOAPBindingUtil.isSOAPBody(obj)) {
+                SoapBody soapBody = SOAPBindingUtil.getSoapBody(obj);
                 use = soapBody.getUse();
-            }
-            if (obj instanceof SOAPHeader) {
-                SOAPHeader soapHeader = (SOAPHeader)obj;
+            }            
+            
+            if (SOAPBindingUtil.isSOAPHeader(obj)) {
+                SoapHeader soapHeader = SOAPBindingUtil.getSoapHeader(obj);
                 boolean found = false;
                 for (JavaParameter parameter : jm.getParameters()) {
                     if (soapHeader.getPart().equals(parameter.getPartName())) {
@@ -356,8 +360,9 @@
             Iterator outbindings = operation.getBindingOutput().getExtensibilityElements().iterator();
             while (outbindings.hasNext()) {
                 Object obj = outbindings.next();
-                if (obj instanceof SOAPHeader) {
-                    SOAPHeader soapHeader = (SOAPHeader)obj;
+                
+                if (SOAPBindingUtil.isSOAPHeader(obj)) {         
+                    SoapHeader soapHeader = SOAPBindingUtil.getSoapHeader(obj);
                     boolean found = false;
                     for (JavaParameter parameter : jm.getParameters()) {
                         if (soapHeader.getPart().equals(parameter.getPartName())) {
@@ -415,10 +420,10 @@
             Iterator ite = bop.getExtensibilityElements().iterator();
             while (ite.hasNext()) {
                 Object obj = ite.next();
-                if (obj instanceof SOAPOperation) {
-                    SOAPOperation soapOP = (SOAPOperation)obj;
+                
+                if (SOAPBindingUtil.isSOAPOperation(obj)) {
+                    SoapOperation soapOP = SOAPBindingUtil.getSoapOperation(obj);
                     soapOPProp.put(this.soapOPAction, soapOP.getSoapActionURI());
-
                     soapOPProp.put(this.soapOPStyle, soapOP.getStyle());
                 }
             }
@@ -431,8 +436,10 @@
         String address = null;
         while (it.hasNext()) {
             Object obj = it.next();
-            if (obj instanceof SOAPAddress) {
-                address = ((SOAPAddress)obj).getLocationURI();
+                        
+            if (SOAPBindingUtil.isSOAPAddress(obj)) {
+                SoapAddress soapAddress = SOAPBindingUtil.getSoapAddress(obj);
+                address = soapAddress.getLocationURI();
             }
             if (obj instanceof JMSAddress) {
                 address = ((JMSAddress)obj).getAddress();
@@ -450,8 +457,9 @@
         Iterator it = binding.getExtensibilityElements().iterator();
         while (it.hasNext()) {
             Object obj = it.next();
-            if (obj instanceof SOAPBinding) {
-                bindingObj = (SOAPBinding)obj;
+            
+            if (SOAPBindingUtil.isSOAPBinding(obj)) {
+                bindingObj = SOAPBindingUtil.getSoapBinding(obj);
                 return BindingType.SOAPBinding;
             }
             if (obj instanceof HTTPBinding) {
@@ -469,7 +477,7 @@
         String operationName = bop.getName();
         Message bodyMessage = null;
         QName headerMessage = null;
-        SOAPHeader header = null;
+        SoapHeader header = null;
         boolean containParts = false;
         boolean isSameMessage = false;
         boolean isNonWrappable = false;
@@ -481,11 +489,11 @@
             Iterator ite = bop.getBindingInput().getExtensibilityElements().iterator();
             while (ite.hasNext()) {
                 Object obj = ite.next();
-                if (obj instanceof SOAPBody) {
+                if (SOAPBindingUtil.isSOAPBody(obj)) {
                     bodyMessage = getMessage(operationName, true);
                 }
-                if (obj instanceof SOAPHeader) {
-                    header = (SOAPHeader)obj;
+                if (SOAPBindingUtil.isSOAPHeader(obj)) {
+                    header = SOAPBindingUtil.getSoapHeader(obj);
                     headerMessage = header.getMessage();
                     if (header.getPart().length() > 0) {
                         containParts = true;
@@ -513,11 +521,11 @@
             Iterator ite1 = bop.getBindingOutput().getExtensibilityElements().iterator();
             while (ite1.hasNext()) {
                 Object obj = ite1.next();
-                if (obj instanceof SOAPBody) {
+                if (SOAPBindingUtil.isSOAPBody(obj)) {
                     bodyMessage = getMessage(operationName, false);
                 }
-                if (obj instanceof SOAPHeader) {
-                    header = (SOAPHeader)obj;
+                if (SOAPBindingUtil.isSOAPHeader(obj)) {
+                    header = SOAPBindingUtil.getSoapHeader(obj);
                     headerMessage = header.getMessage();
                     if (header.getPart().length() > 0) {
                         containParts = true;
@@ -654,8 +662,8 @@
         Iterator it = bop.getExtensibilityElements().iterator();
         while (it.hasNext()) {
             Object obj = it.next();
-            if (obj instanceof SOAPHeader) {
-                String outPartName = ((SOAPHeader)obj).getPart();
+            if (SOAPBindingUtil.isSOAPHeader(obj)) {
+                String outPartName = (SOAPBindingUtil.getSoapHeader(obj)).getPart();
                 if (inPartName.equals(outPartName)) {
                     return true;
                 }

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java?view=diff&rev=454143&r1=454142&r2=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java Sun Oct  8 06:53:28 2006
@@ -86,6 +86,26 @@
         assertTrue("Should generate 1 file", files != null && files.length == 1);
 
     }
+    
+    public void testGenDocLitBare() throws Exception {
+
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/doc_lit_bare.wsdl"));
+        processor.setEnvironment(env);
+        processor.process();
+        File file = new File(output.getCanonicalPath() + "/org/apache/hello_world_doc_lit_bare/");
+        File[] files = file.listFiles(new java.io.FileFilter() {
+            public boolean accept(File pathname) {
+                if (pathname.getName().endsWith(".java")) {
+                    return true;
+                }
+                return false;
+
+            }
+        });
+        assertTrue("Should generate 2 files", files != null && files.length == 2);
+
+    }
+    
 
     private String getLocation(String wsdlFile) {
         return WSDLToJavaClientServerTest.class.getResource(wsdlFile).getFile();

Added: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/doc_lit_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/doc_lit_bare.wsdl?view=auto&rev=454143
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/doc_lit_bare.wsdl (added)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/doc_lit_bare.wsdl Sun Oct  8 06:53:28 2006
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_doc_lit_bare" xmlns:x1="http://apache.org/hello_world_doc_lit_bare/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_doc_lit_bare" name="DocLitBare">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/hello_world_doc_lit_bare/types" xmlns:tns="http://apache.org/hello_world_doc_lit_bare/types" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+            <complexType name="TradePriceData">
+                <sequence>
+                    <element name="tickerSymbol" type="xsd:string"/>
+                    <element name="tickerPrice" type="xsd:float"/>
+                </sequence>
+            </complexType>
+            <element name="in" type="tns:TradePriceData"/>
+            <element name="inout" type="tns:TradePriceData"/>
+            <element name="stringRespType" type="xsd:string"/>
+        </schema>
+    </wsdl:types>
+    <message name="PutLastTradedPriceInput">
+        <part name="body" element="x1:in"/>
+    </message>
+    <message name="PutLastTradedPriceOutput"/>
+
+    <message name="SayHiInput">
+        <part name="body" element="x1:inout"/>
+    </message>
+    <message name="SayHiOutput">
+        <part name="body" element="x1:inout"/>
+    </message>
+    
+    <message name="bareNoParamRequest"/>
+    
+    <message name="bareNoParamResponse">
+        <part element="x1:stringRespType" name="theResponse"/>
+    </message>
+
+    <portType name="PutLastTradedPricePortType">
+
+        <operation name="SayHi">
+            <input message="tns:SayHiInput"/>
+            <output message="tns:SayHiOutput"/>
+        </operation>
+    
+        <operation name="PutLastTradedPrice">
+            <input message="tns:PutLastTradedPriceInput"/>
+            <output message="tns:PutLastTradedPriceOutput"/>
+        </operation>
+    
+        <operation name="bareNoParam">
+            <input message="tns:bareNoParamRequest"/>
+            <output message="tns:bareNoParamResponse"/>
+        </operation>
+        
+    </portType>
+    
+    <binding name="PutLastTradedPriceSoapBinding" type="tns:PutLastTradedPricePortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <operation name="SayHi">
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        
+        <operation name="PutLastTradedPrice">
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        
+        <operation name="bareNoParam">
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>        
+    </binding>
+    <wsdl:service name="SOAPService">
+        <wsdl:port name="SoapPort" binding="tns:PutLastTradedPriceSoapBinding">
+            <soap:address location="http://localhost:9107/SOAPDocLitBareService/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>



Mime
View raw message