You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2007/08/23 13:01:35 UTC

svn commit: r568932 [21/36] - in /incubator/woden/trunk/java/src/org/apache/woden: ./ ant/ internal/ internal/resolver/ internal/schema/ internal/util/ internal/util/dom/ internal/util/om/ internal/wsdl20/ internal/wsdl20/extensions/ internal/wsdl20/ex...

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,153 +1,153 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import java.net.URI;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.xml.BooleanAttr;
-import org.apache.woden.xml.StringAttr;
-import org.apache.woden.xml.URIAttr;
-
-/**
- * This class defines the properties from the SOAP namespace
- * added to the WSDL <code>Binding</code> component as part 
- * of the SOAP binding extension defined by the WSDL 2.0 spec. 
- * 
- * @author jkaputin@apache.org
- */
-public class SOAPBindingExtensionsImpl extends ComponentExtensionsImpl
-                                       implements SOAPBindingExtensions 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapVersion()
-     */
-    public String getSoapVersion() 
-    {
-        StringAttr version = 
-            (StringAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_VERSION);
-        return version != null ? version.getString() : "1.2";
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapUnderlyingProtocol()
-     */
-    public URI getSoapUnderlyingProtocol() 
-    {
-        URIAttr protocol = 
-            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_PROTOCOL);
-        return protocol != null ? protocol.getURI() : null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapMepDefault()
-     */
-    public URI getSoapMepDefault() 
-    {
-        URIAttr mepDefault = 
-            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_MEPDEFAULT);
-        return mepDefault != null ? mepDefault.getURI() : null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapModules()
-     */
-    public SOAPModule[] getSoapModules() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
-        int len = extEls.length;
-        SOAPModule[] soapMods = new SOAPModule[len];
-        System.arraycopy(extEls, 0, soapMods, 0, len);
-        return soapMods;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpQueryParameterSeparatorDefault()
-     */
-    public String getHttpQueryParameterSeparatorDefault() 
-    {
-        URI protocol = getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr qpsDef = (StringAttr) ((WSDLElement)fParent)
-                .getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT);
-            return qpsDef != null ? qpsDef.getString() : HTTPConstants.QUERY_SEP_AMPERSAND;
-        } 
-        else
-        {
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#isHttpCookies()
-     */
-    public Boolean isHttpCookies() 
-    {
-        URI protocol = getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            BooleanAttr cookiesUsed = (BooleanAttr) ((WSDLElement)fParent)
-                .getExtensionAttribute(HTTPConstants.Q_ATTR_COOKIES);
-            return cookiesUsed != null ? cookiesUsed.getBoolean() : new Boolean(false); //defaults to false if omitted
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpContentEncodingDefault()
-     */
-    public String getHttpContentEncodingDefault() 
-    {
-        URI protocol = getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
-                .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
-            return ceDef != null ? ceDef.getString() : null;
-        } 
-        else
-        {
-            return null;
-        }
-    }
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import java.net.URI;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.BooleanAttr;
+import org.apache.woden.xml.StringAttr;
+import org.apache.woden.xml.URIAttr;
+
+/**
+ * This class defines the properties from the SOAP namespace
+ * added to the WSDL <code>Binding</code> component as part 
+ * of the SOAP binding extension defined by the WSDL 2.0 spec. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class SOAPBindingExtensionsImpl extends ComponentExtensionsImpl
+                                       implements SOAPBindingExtensions 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapVersion()
+     */
+    public String getSoapVersion() 
+    {
+        StringAttr version = 
+            (StringAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_VERSION);
+        return version != null ? version.getString() : "1.2";
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapUnderlyingProtocol()
+     */
+    public URI getSoapUnderlyingProtocol() 
+    {
+        URIAttr protocol = 
+            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_PROTOCOL);
+        return protocol != null ? protocol.getURI() : null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapMepDefault()
+     */
+    public URI getSoapMepDefault() 
+    {
+        URIAttr mepDefault = 
+            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_MEPDEFAULT);
+        return mepDefault != null ? mepDefault.getURI() : null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getSoapModules()
+     */
+    public SOAPModule[] getSoapModules() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
+        int len = extEls.length;
+        SOAPModule[] soapMods = new SOAPModule[len];
+        System.arraycopy(extEls, 0, soapMods, 0, len);
+        return soapMods;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpQueryParameterSeparatorDefault()
+     */
+    public String getHttpQueryParameterSeparatorDefault() 
+    {
+        URI protocol = getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr qpsDef = (StringAttr) ((WSDLElement)fParent)
+                .getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT);
+            return qpsDef != null ? qpsDef.getString() : HTTPConstants.QUERY_SEP_AMPERSAND;
+        } 
+        else
+        {
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#isHttpCookies()
+     */
+    public Boolean isHttpCookies() 
+    {
+        URI protocol = getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            BooleanAttr cookiesUsed = (BooleanAttr) ((WSDLElement)fParent)
+                .getExtensionAttribute(HTTPConstants.Q_ATTR_COOKIES);
+            return cookiesUsed != null ? cookiesUsed.getBoolean() : new Boolean(false); //defaults to false if omitted
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpContentEncodingDefault()
+     */
+    public String getHttpContentEncodingDefault() 
+    {
+        URI protocol = getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(getSoapVersion()) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
+                .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+            return ceDef != null ? ceDef.getString() : null;
+        } 
+        else
+        {
+            return null;
+        }
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,200 +1,200 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import java.net.URI;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
-import org.apache.woden.internal.xml.QNameListOrTokenAnyAttrImpl;
-import org.apache.woden.internal.xml.QNameOrTokenAnyAttrImpl;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.NestedComponent;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPFaultCode;
-import org.apache.woden.wsdl20.extensions.soap.SOAPFaultSubcodes;
-import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.xml.StringAttr;
-
-/**
- * This class defines the properties from the SOAP namespace
- * added to the WSDL <code>BindingFault</code> component as part 
- * of the SOAP binding extension defined by the WSDL 2.0 spec. 
- * 
- * @author John Kaputin (jkaputin@apache.org)
- */
-public class SOAPBindingFaultExtensionsImpl extends ComponentExtensionsImpl
-                                            implements SOAPBindingFaultExtensions 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapFaultCode()
-     */
-    public SOAPFaultCode getSoapFaultCode() 
-    {
-        /* QNameOrTokenAnyAttrImpl is the class registered for this extension attribute. Use this type 
-         * here, rather than the QNameOrTokenAttr interface, to guarantee that if the code contains an 
-         * xs:token it is of type #any.
-         */
-        QNameOrTokenAnyAttrImpl code = 
-            (QNameOrTokenAnyAttrImpl)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_CODE);
-        
-        if(code == null)
-        {
-            //defaults to xs:token #any if the attribute is omitted from the WSDL.
-            return SOAPFaultCode.ANY;
-        }
-
-        if(code.isToken()) {
-            return SOAPFaultCode.ANY;
-        }
-        
-        if(code.isQName())
-        {
-            return new SOAPFaultCode(code.getQName());
-        }
-        else
-        {
-            //the wsoap:code attribute contains an invalid value (i.e. not an xs:QName or the xs:token #any)
-            //TODO confirm if this should be represented in the Component model as a null
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapFaultSubcodes()
-     */
-    public SOAPFaultSubcodes getSoapFaultSubcodes() 
-    {
-        /* QNameListOrTokenAnyAttrImpl is the class registered for this extension attribute. Use this type 
-         * here, rather than the QNameListOrTokenAttr interface, to gaurantee that if the code contains an 
-         * xs:token it is of type #any.
-         */
-        QNameListOrTokenAnyAttrImpl subcodes = 
-            (QNameListOrTokenAnyAttrImpl)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_SUBCODES);
-        
-        if(subcodes == null)
-        {
-            //defaults to xs:token #any if the attribute is omitted from the WSDL.
-            return SOAPFaultSubcodes.ANY;
-        }
-
-        if(subcodes.isToken()) {
-            return SOAPFaultSubcodes.ANY;
-        }
-        
-        if(subcodes.isQNameList())
-        {
-            return new SOAPFaultSubcodes(subcodes.getQNames());
-        }
-        else
-        {
-            //the wsoap:subcodes attribute contains an invalid value (i.e. not a list of xs:QName or the xs:token #any)
-            //TODO confirm if this should be represented in the Component model as a null
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapModules()
-     */
-    public SOAPModule[] getSoapModules() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
-        int len = extEls.length;
-        SOAPModule[] soapMods = new SOAPModule[len];
-        System.arraycopy(extEls, 0, soapMods, 0, len);
-        return soapMods;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapHeaders()
-     */
-    public SOAPHeaderBlock[] getSoapHeaders() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_HEADER);
-        int len = extEls.length;
-        SOAPHeaderBlock[] soapHeaders = new SOAPHeaderBlock[len];
-        System.arraycopy(extEls, 0, soapHeaders, 0, len);
-        return soapHeaders;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpContentEncoding()
-     * 
-     */
-    public String getHttpContentEncoding() 
-    {
-        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
-               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
-            return contEncoding != null ? contEncoding.getString() : null;
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpHeaders()
-     */
-    public HTTPHeader[] getHttpHeaders() 
-    {
-        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return new HTTPHeader[0];
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            ExtensionElement[] extEls = ((WSDLElement)fParent)
-                .getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
-            int len = extEls.length;
-            HTTPHeader[] httpHeaders = new HTTPHeader[len];
-            System.arraycopy(extEls, 0, httpHeaders, 0, len);
-            return httpHeaders;
-        } 
-        else 
-        {
-            return new HTTPHeader[0];
-        }
-    }
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import java.net.URI;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.internal.xml.QNameListOrTokenAnyAttrImpl;
+import org.apache.woden.internal.xml.QNameOrTokenAnyAttrImpl;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.NestedComponent;
+import org.apache.woden.wsdl20.extensions.ComponentExtensions;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPFaultCode;
+import org.apache.woden.wsdl20.extensions.soap.SOAPFaultSubcodes;
+import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
+import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.StringAttr;
+
+/**
+ * This class defines the properties from the SOAP namespace
+ * added to the WSDL <code>BindingFault</code> component as part 
+ * of the SOAP binding extension defined by the WSDL 2.0 spec. 
+ * 
+ * @author John Kaputin (jkaputin@apache.org)
+ */
+public class SOAPBindingFaultExtensionsImpl extends ComponentExtensionsImpl
+                                            implements SOAPBindingFaultExtensions 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapFaultCode()
+     */
+    public SOAPFaultCode getSoapFaultCode() 
+    {
+        /* QNameOrTokenAnyAttrImpl is the class registered for this extension attribute. Use this type 
+         * here, rather than the QNameOrTokenAttr interface, to guarantee that if the code contains an 
+         * xs:token it is of type #any.
+         */
+        QNameOrTokenAnyAttrImpl code = 
+            (QNameOrTokenAnyAttrImpl)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_CODE);
+        
+        if(code == null)
+        {
+            //defaults to xs:token #any if the attribute is omitted from the WSDL.
+            return SOAPFaultCode.ANY;
+        }
+
+        if(code.isToken()) {
+            return SOAPFaultCode.ANY;
+        }
+        
+        if(code.isQName())
+        {
+            return new SOAPFaultCode(code.getQName());
+        }
+        else
+        {
+            //the wsoap:code attribute contains an invalid value (i.e. not an xs:QName or the xs:token #any)
+            //TODO confirm if this should be represented in the Component model as a null
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapFaultSubcodes()
+     */
+    public SOAPFaultSubcodes getSoapFaultSubcodes() 
+    {
+        /* QNameListOrTokenAnyAttrImpl is the class registered for this extension attribute. Use this type 
+         * here, rather than the QNameListOrTokenAttr interface, to gaurantee that if the code contains an 
+         * xs:token it is of type #any.
+         */
+        QNameListOrTokenAnyAttrImpl subcodes = 
+            (QNameListOrTokenAnyAttrImpl)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_SUBCODES);
+        
+        if(subcodes == null)
+        {
+            //defaults to xs:token #any if the attribute is omitted from the WSDL.
+            return SOAPFaultSubcodes.ANY;
+        }
+
+        if(subcodes.isToken()) {
+            return SOAPFaultSubcodes.ANY;
+        }
+        
+        if(subcodes.isQNameList())
+        {
+            return new SOAPFaultSubcodes(subcodes.getQNames());
+        }
+        else
+        {
+            //the wsoap:subcodes attribute contains an invalid value (i.e. not a list of xs:QName or the xs:token #any)
+            //TODO confirm if this should be represented in the Component model as a null
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapModules()
+     */
+    public SOAPModule[] getSoapModules() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
+        int len = extEls.length;
+        SOAPModule[] soapMods = new SOAPModule[len];
+        System.arraycopy(extEls, 0, soapMods, 0, len);
+        return soapMods;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getSoapHeaders()
+     */
+    public SOAPHeaderBlock[] getSoapHeaders() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_HEADER);
+        int len = extEls.length;
+        SOAPHeaderBlock[] soapHeaders = new SOAPHeaderBlock[len];
+        System.arraycopy(extEls, 0, soapHeaders, 0, len);
+        return soapHeaders;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpContentEncoding()
+     * 
+     */
+    public String getHttpContentEncoding() 
+    {
+        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
+               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
+            return contEncoding != null ? contEncoding.getString() : null;
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpHeaders()
+     */
+    public HTTPHeader[] getHttpHeaders() 
+    {
+        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return new HTTPHeader[0];
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            ExtensionElement[] extEls = ((WSDLElement)fParent)
+                .getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
+            int len = extEls.length;
+            HTTPHeader[] httpHeaders = new HTTPHeader[len];
+            System.arraycopy(extEls, 0, httpHeaders, 0, len);
+            return httpHeaders;
+        } 
+        else 
+        {
+            return new HTTPHeader[0];
+        }
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,47 +1,47 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
-
-/**
- * This class defines the properties from the SOAP namespace
- * added to the WSDL <code>BindingFaultReference</code> component as part 
- * of the SOAP binding extension defined by the WSDL 2.0 spec. 
- * 
- * @author jkaputin@apache.org
- */
-public class SOAPBindingFaultReferenceExtensionsImpl extends ComponentExtensionsImpl 
-                                                     implements SOAPBindingFaultReferenceExtensions 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions#getSoapModules()
-     */
-    public SOAPModule[] getSoapModules() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
-        int len = extEls.length;
-        SOAPModule[] soapMods = new SOAPModule[len];
-        System.arraycopy(extEls, 0, soapMods, 0, len);
-        return soapMods;
-    }
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+
+/**
+ * This class defines the properties from the SOAP namespace
+ * added to the WSDL <code>BindingFaultReference</code> component as part 
+ * of the SOAP binding extension defined by the WSDL 2.0 spec. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class SOAPBindingFaultReferenceExtensionsImpl extends ComponentExtensionsImpl 
+                                                     implements SOAPBindingFaultReferenceExtensions 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions#getSoapModules()
+     */
+    public SOAPModule[] getSoapModules() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
+        int len = extEls.length;
+        SOAPModule[] soapMods = new SOAPModule[len];
+        System.arraycopy(extEls, 0, soapMods, 0, len);
+        return soapMods;
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,131 +1,131 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import java.net.URI;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.BindingOperation;
-import org.apache.woden.wsdl20.NestedComponent;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.xml.StringAttr;
-
-/**
- * This class defines the properties from the SOAP namespace
- * added to the WSDL <code>BindingMessageReference</code> component as part 
- * of the SOAP binding extension defined by the WSDL 2.0 spec. 
- * 
- * @author jkaputin@apache.org
- */
-public class SOAPBindingMessageReferenceExtensionsImpl extends ComponentExtensionsImpl 
-                                                       implements SOAPBindingMessageReferenceExtensions 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getSoapModules()
-     */
-    public SOAPModule[] getSoapModules() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
-        int len = extEls.length;
-        SOAPModule[] soapMods = new SOAPModule[len];
-        System.arraycopy(extEls, 0, soapMods, 0, len);
-        return soapMods;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getSoapHeaders()
-     */
-    public SOAPHeaderBlock[] getSoapHeaders() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_HEADER);
-        int len = extEls.length;
-        SOAPHeaderBlock[] soapHeaders = new SOAPHeaderBlock[len];
-        System.arraycopy(extEls, 0, soapHeaders, 0, len);
-        return soapHeaders;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpContentEncoding()
-     * 
-     */
-    public String getHttpContentEncoding() 
-    {
-        BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
-        Binding binding = (Binding) bindingOp.getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
-               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
-            return contEncoding != null ? contEncoding.getString() : null;
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpHeaders()
-     */
-    public HTTPHeader[] getHttpHeaders() 
-    {
-        BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
-        Binding binding = (Binding) bindingOp.getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return new HTTPHeader[0];
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            ExtensionElement[] extEls = ((WSDLElement)fParent)
-                .getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
-            int len = extEls.length;
-            HTTPHeader[] httpHeaders = new HTTPHeader[len];
-            System.arraycopy(extEls, 0, httpHeaders, 0, len);
-            return httpHeaders;
-        } 
-        else 
-        {
-            return new HTTPHeader[0];
-        }
-    }
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import java.net.URI;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.BindingOperation;
+import org.apache.woden.wsdl20.NestedComponent;
+import org.apache.woden.wsdl20.extensions.ComponentExtensions;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlock;
+import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.StringAttr;
+
+/**
+ * This class defines the properties from the SOAP namespace
+ * added to the WSDL <code>BindingMessageReference</code> component as part 
+ * of the SOAP binding extension defined by the WSDL 2.0 spec. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class SOAPBindingMessageReferenceExtensionsImpl extends ComponentExtensionsImpl 
+                                                       implements SOAPBindingMessageReferenceExtensions 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getSoapModules()
+     */
+    public SOAPModule[] getSoapModules() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
+        int len = extEls.length;
+        SOAPModule[] soapMods = new SOAPModule[len];
+        System.arraycopy(extEls, 0, soapMods, 0, len);
+        return soapMods;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getSoapHeaders()
+     */
+    public SOAPHeaderBlock[] getSoapHeaders() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_HEADER);
+        int len = extEls.length;
+        SOAPHeaderBlock[] soapHeaders = new SOAPHeaderBlock[len];
+        System.arraycopy(extEls, 0, soapHeaders, 0, len);
+        return soapHeaders;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpContentEncoding()
+     * 
+     */
+    public String getHttpContentEncoding() 
+    {
+        BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
+        Binding binding = (Binding) bindingOp.getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
+               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
+            return contEncoding != null ? contEncoding.getString() : null;
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpHeaders()
+     */
+    public HTTPHeader[] getHttpHeaders() 
+    {
+        BindingOperation bindingOp = (BindingOperation) ((NestedComponent)fParent).getParent();
+        Binding binding = (Binding) bindingOp.getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return new HTTPHeader[0];
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            ExtensionElement[] extEls = ((WSDLElement)fParent)
+                .getExtensionElementsOfType(HTTPConstants.Q_ELEM_HTTP_HEADER);
+            int len = extEls.length;
+            HTTPHeader[] httpHeaders = new HTTPHeader[len];
+            System.arraycopy(extEls, 0, httpHeaders, 0, len);
+            return httpHeaders;
+        } 
+        else 
+        {
+            return new HTTPHeader[0];
+        }
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,165 +1,165 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import java.net.URI;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.NestedComponent;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.http.HTTPLocation;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.xml.StringAttr;
-import org.apache.woden.xml.URIAttr;
-
-/**
- * This class defines the properties from the SOAP namespace
- * added to the WSDL <code>BindingOperation</code> component as part 
- * of the SOAP binding extension defined by the WSDL 2.0 spec. 
- * 
- * @author jkaputin@apache.org
- */
-public class SOAPBindingOperationExtensionsImpl extends ComponentExtensionsImpl
-                                                implements SOAPBindingOperationExtensions 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapMep()
-     */
-    public URI getSoapMep() 
-    {
-        URIAttr mep = 
-            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_MEP);
-        return mep != null ? mep.getURI() : null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapAction()
-     */
-    public URI getSoapAction() 
-    {
-        URIAttr action = 
-            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_ACTION);
-        return action != null ? action.getURI() : null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapModules()
-     */
-    public SOAPModule[] getSoapModules() 
-    {
-        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
-        int len = extEls.length;
-        SOAPModule[] soapMods = new SOAPModule[len];
-        System.arraycopy(extEls, 0, soapMods, 0, len);
-        return soapMods;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpLocation()
-     */
-    public HTTPLocation getHttpLocation() {
-        
-        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr httpLoc = (StringAttr) ((WSDLElement)fParent)
-                .getExtensionAttribute(HTTPConstants.Q_ATTR_LOCATION);
-            return httpLoc != null ? new HTTPLocation(httpLoc.getString()) : null;
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpQueryParameterSeparator()
-     */
-    public String getHttpQueryParameterSeparator() {
-        
-        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr separator = (StringAttr) ((WSDLElement) fParent)
-                .getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR);
-            return separator != null ? separator.getString() : null;
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpContentEncodingDefault()
-     */
-    public String getHttpContentEncodingDefault() {
-        
-        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-            StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
-               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
-            return ceDef != null ? ceDef.getString() : null;
-        } 
-        else 
-        {
-            return null;
-        }
-    }
-    
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import java.net.URI;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.NestedComponent;
+import org.apache.woden.wsdl20.extensions.ComponentExtensions;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.http.HTTPLocation;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.StringAttr;
+import org.apache.woden.xml.URIAttr;
+
+/**
+ * This class defines the properties from the SOAP namespace
+ * added to the WSDL <code>BindingOperation</code> component as part 
+ * of the SOAP binding extension defined by the WSDL 2.0 spec. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class SOAPBindingOperationExtensionsImpl extends ComponentExtensionsImpl
+                                                implements SOAPBindingOperationExtensions 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapMep()
+     */
+    public URI getSoapMep() 
+    {
+        URIAttr mep = 
+            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_MEP);
+        return mep != null ? mep.getURI() : null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapAction()
+     */
+    public URI getSoapAction() 
+    {
+        URIAttr action = 
+            (URIAttr)fParentElement.getExtensionAttribute(SOAPConstants.Q_ATTR_SOAP_ACTION);
+        return action != null ? action.getURI() : null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getSoapModules()
+     */
+    public SOAPModule[] getSoapModules() 
+    {
+        ExtensionElement[] extEls = fParentElement.getExtensionElementsOfType(SOAPConstants.Q_ELEM_SOAP_MODULE);
+        int len = extEls.length;
+        SOAPModule[] soapMods = new SOAPModule[len];
+        System.arraycopy(extEls, 0, soapMods, 0, len);
+        return soapMods;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpLocation()
+     */
+    public HTTPLocation getHttpLocation() {
+        
+        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr httpLoc = (StringAttr) ((WSDLElement)fParent)
+                .getExtensionAttribute(HTTPConstants.Q_ATTR_LOCATION);
+            return httpLoc != null ? new HTTPLocation(httpLoc.getString()) : null;
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpQueryParameterSeparator()
+     */
+    public String getHttpQueryParameterSeparator() {
+        
+        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr separator = (StringAttr) ((WSDLElement) fParent)
+                .getExtensionAttribute(HTTPConstants.Q_ATTR_QUERY_PARAMETER_SEPARATOR);
+            return separator != null ? separator.getString() : null;
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpContentEncodingDefault()
+     */
+    public String getHttpContentEncodingDefault() {
+        
+        Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+            StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
+               .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+            return ceDef != null ? ceDef.getString() : null;
+        } 
+        else 
+        {
+            return null;
+        }
+    }
+    
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java Thu Aug 23 04:01:23 2007
@@ -1,84 +1,84 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import javax.xml.namespace.QName;
-
-/**
- * @author jkaputin@apache.org
- */
-public class SOAPConstants 
-{
-    // Namespace URIs.
-    public static final String NS_URI_SOAP =
-        "http://www.w3.org/ns/wsdl/soap";
-    
-    // Protocol URIs.
-    public static final String URI_SOAP12_HTTP =
-        "http://www.w3.org/2003/05/soap/bindings/HTTP/";
-    public static final String URI_SOAP11_HTTP =
-        "http://www.w3.org/2006/01/soap11/bindings/HTTP/";
-
-    // Element names.
-    public static final String ELEM_MODULE = "module";
-    public static final String ELEM_HEADER = "header";
-
-    // Attribute names.
-    public static final String ATTR_VERSION = "version";
-    public static final String ATTR_PROTOCOL = "protocol";
-    public static final String ATTR_MEPDEFAULT = "mepDefault";
-    public static final String ATTR_CODE = "code";
-    public static final String ATTR_SUBCODES = "subcodes";
-    public static final String ATTR_MEP = "mep";
-    public static final String ATTR_ACTION = "action";
-    public static final String ATTR_MUSTUNDERSTAND = "mustUnderstand";
-    
-    // Prefixes
-    public static final String PFX_WSOAP = "wsoap";
-
-    // Qualified element names.
-    
-    public static final QName Q_ELEM_SOAP_MODULE =
-      new QName(NS_URI_SOAP, ELEM_MODULE, PFX_WSOAP);
-    
-    public static final QName Q_ELEM_SOAP_HEADER =
-        new QName(NS_URI_SOAP, ELEM_HEADER, PFX_WSOAP);
-
-    // Qualified attribute names.
-    
-    public static final QName Q_ATTR_SOAP_VERSION =
-      new QName(NS_URI_SOAP, ATTR_VERSION, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_PROTOCOL =
-        new QName(NS_URI_SOAP, ATTR_PROTOCOL, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_MEPDEFAULT =
-        new QName(NS_URI_SOAP, ATTR_MEPDEFAULT, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_CODE =
-        new QName(NS_URI_SOAP, ATTR_CODE, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_SUBCODES =
-        new QName(NS_URI_SOAP, ATTR_SUBCODES, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_MEP =
-        new QName(NS_URI_SOAP, ATTR_MEP, PFX_WSOAP);
-    
-    public static final QName Q_ATTR_SOAP_ACTION =
-        new QName(NS_URI_SOAP, ATTR_ACTION, PFX_WSOAP);
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author jkaputin@apache.org
+ */
+public class SOAPConstants 
+{
+    // Namespace URIs.
+    public static final String NS_URI_SOAP =
+        "http://www.w3.org/ns/wsdl/soap";
+    
+    // Protocol URIs.
+    public static final String URI_SOAP12_HTTP =
+        "http://www.w3.org/2003/05/soap/bindings/HTTP/";
+    public static final String URI_SOAP11_HTTP =
+        "http://www.w3.org/2006/01/soap11/bindings/HTTP/";
+
+    // Element names.
+    public static final String ELEM_MODULE = "module";
+    public static final String ELEM_HEADER = "header";
+
+    // Attribute names.
+    public static final String ATTR_VERSION = "version";
+    public static final String ATTR_PROTOCOL = "protocol";
+    public static final String ATTR_MEPDEFAULT = "mepDefault";
+    public static final String ATTR_CODE = "code";
+    public static final String ATTR_SUBCODES = "subcodes";
+    public static final String ATTR_MEP = "mep";
+    public static final String ATTR_ACTION = "action";
+    public static final String ATTR_MUSTUNDERSTAND = "mustUnderstand";
+    
+    // Prefixes
+    public static final String PFX_WSOAP = "wsoap";
+
+    // Qualified element names.
+    
+    public static final QName Q_ELEM_SOAP_MODULE =
+      new QName(NS_URI_SOAP, ELEM_MODULE, PFX_WSOAP);
+    
+    public static final QName Q_ELEM_SOAP_HEADER =
+        new QName(NS_URI_SOAP, ELEM_HEADER, PFX_WSOAP);
+
+    // Qualified attribute names.
+    
+    public static final QName Q_ATTR_SOAP_VERSION =
+      new QName(NS_URI_SOAP, ATTR_VERSION, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_PROTOCOL =
+        new QName(NS_URI_SOAP, ATTR_PROTOCOL, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_MEPDEFAULT =
+        new QName(NS_URI_SOAP, ATTR_MEPDEFAULT, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_CODE =
+        new QName(NS_URI_SOAP, ATTR_CODE, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_SUBCODES =
+        new QName(NS_URI_SOAP, ATTR_SUBCODES, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_MEP =
+        new QName(NS_URI_SOAP, ATTR_MEP, PFX_WSOAP);
+    
+    public static final QName Q_ATTR_SOAP_ACTION =
+        new QName(NS_URI_SOAP, ATTR_ACTION, PFX_WSOAP);
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java Thu Aug 23 04:01:23 2007
@@ -1,113 +1,113 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import java.net.URI;
-
-import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.Endpoint;
-import org.apache.woden.wsdl20.NestedComponent;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
-import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
-import org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
-import org.apache.woden.xml.StringAttr;
-
-/**
- * This interface represents the properties from the HTTP namespace added to the
- * WSDL 2.0 <code>Endpoint</code> component when the binding type is SOAP and the
- * underlying protocol is HTTP.
- * 
- * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
- * 
- */
-public class SOAPEndpointExtensionsImpl extends ComponentExtensionsImpl
-		implements SOAPEndpointExtensions {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions#getHttpAuthenticationScheme()
-	 */
-	public HTTPAuthenticationScheme getHttpAuthenticationScheme() {
-
-        Endpoint endpoint = (Endpoint) fParent;
-        Binding binding = endpoint.getBinding();
-        if(binding == null) {
-            return null; //the wsdl is invalid
-        }
-        
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-        
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-		    HTTPAuthenticationSchemeAttr scheme = (HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
-				.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME);
-		    return scheme != null ? scheme.getScheme() : null;
-        }
-        else
-        {
-            return null;
-        }
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions#getHttpAuthenticationRealm()
-	 */
-	public String getHttpAuthenticationRealm() {
-
-        Endpoint endpoint = (Endpoint) fParent;
-        Binding binding = endpoint.getBinding();
-        if(binding == null) {
-            return null; //the wsdl is invalid
-        }
-        
-        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
-            .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
-        String version = soapBindExt.getSoapVersion();
-        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
-        if(protocol == null) {
-            return null;
-        }
-     
-        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
-            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
-        {
-		    StringAttr realm = (StringAttr) ((WSDLElement) fParent)
-				.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_REALM);
-		    return realm != null ? realm.getString() : null;
-        }
-        else
-        {
-            return null;
-        }
-	}
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import java.net.URI;
+
+import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPConstants;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.Endpoint;
+import org.apache.woden.wsdl20.NestedComponent;
+import org.apache.woden.wsdl20.extensions.ComponentExtensions;
+import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
+import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
+import org.apache.woden.xml.StringAttr;
+
+/**
+ * This interface represents the properties from the HTTP namespace added to the
+ * WSDL 2.0 <code>Endpoint</code> component when the binding type is SOAP and the
+ * underlying protocol is HTTP.
+ * 
+ * @author Arthur Ryman (ryman@ca.ibm.com, arthur.ryman@gmail.com)
+ * 
+ */
+public class SOAPEndpointExtensionsImpl extends ComponentExtensionsImpl
+		implements SOAPEndpointExtensions {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions#getHttpAuthenticationScheme()
+	 */
+	public HTTPAuthenticationScheme getHttpAuthenticationScheme() {
+
+        Endpoint endpoint = (Endpoint) fParent;
+        Binding binding = endpoint.getBinding();
+        if(binding == null) {
+            return null; //the wsdl is invalid
+        }
+        
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+           .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+        
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+		    HTTPAuthenticationSchemeAttr scheme = (HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
+				.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME);
+		    return scheme != null ? scheme.getScheme() : null;
+        }
+        else
+        {
+            return null;
+        }
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions#getHttpAuthenticationRealm()
+	 */
+	public String getHttpAuthenticationRealm() {
+
+        Endpoint endpoint = (Endpoint) fParent;
+        Binding binding = endpoint.getBinding();
+        if(binding == null) {
+            return null; //the wsdl is invalid
+        }
+        
+        SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+            .getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+        String version = soapBindExt.getSoapVersion();
+        URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+        if(protocol == null) {
+            return null;
+        }
+     
+        if( ("1.2".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+            ("1.1".equals(version) && protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+        {
+		    StringAttr realm = (StringAttr) ((WSDLElement) fParent)
+				.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_REALM);
+		    return realm != null ? realm.getString() : null;
+        }
+        else
+        {
+            return null;
+        }
+	}
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java Thu Aug 23 04:01:23 2007
@@ -1,119 +1,119 @@
-/**
+/**
  * 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.woden.internal.wsdl20.extensions.soap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.woden.ErrorReporter;
-import org.apache.woden.WSDLException;
-import org.apache.woden.XMLElement;
-import org.apache.woden.internal.ErrorLocatorImpl;
-import org.apache.woden.internal.wsdl20.Constants;
-import org.apache.woden.wsdl20.extensions.ExtensionDeserializer;
-import org.apache.woden.wsdl20.extensions.ExtensionElement;
-import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
-import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlockElement;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
-import org.apache.woden.wsdl20.xml.DocumentableElement;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-
-/**
- * Deserializes the &lt;wsoap:header&gt; extension element into a SOAPHeaderBlockElement.
- * 
- * @author jkaputin@apache.org
- *
- */
-public class SOAPHeaderBlockDeserializer implements ExtensionDeserializer 
-{
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.extensions.ExtensionDeserializer#unmarshall(java.lang.Class, java.lang.Object, javax.xml.namespace.QName, org.w3c.dom.Element, org.apache.woden.wsdl20.xml.DescriptionElement, org.apache.woden.wsdl20.extensions.ExtensionRegistry)
-     */
-    public ExtensionElement unmarshall(Class parentType, 
-                                       Object parent,
-                                       QName extType, 
-                                       XMLElement extEl,
-                                       DescriptionElement desc,
-                                       ExtensionRegistry extReg) 
-                                       throws WSDLException 
-    {
-        SOAPHeaderBlockElement soapHdr = 
-            (SOAPHeaderBlockElement) extReg.createExtElement(parentType, extType);
-        
-        soapHdr.setExtensionType(extType);
-        soapHdr.setParentElement((WSDLElement)parent);
-        
-        String elemDeclQN = extEl.getAttributeValue(Constants.ATTR_ELEMENT);
-        if(elemDeclQN != null)
-        {
-            try {
-                QName qname = extEl.getQName(elemDeclQN);
-                soapHdr.setElementName(qname);
-            } catch (WSDLException e) {
-                extReg.getErrorReporter().reportError( 
-                        new ErrorLocatorImpl(),  //TODO line&col nos.
-                        "WSDL505",
-                        new Object[] {elemDeclQN, extEl.getLocalName()}, 
-                        ErrorReporter.SEVERITY_ERROR);
-            }
-        }
-        
-        //This property defaults to 'false' if it is omitted.
-        String mustUnderstand = extEl.getAttributeValue(SOAPConstants.ATTR_MUSTUNDERSTAND);
-        soapHdr.setMustUnderstand(new Boolean(mustUnderstand));
-
-        //This property defaults to 'false' if it is omitted.
-        String required = extEl.getAttributeValue(Constants.ATTR_REQUIRED);
-        soapHdr.setRequired(new Boolean(required));
-
-        ((SOAPHeaderBlockImpl)soapHdr).setTypes(desc.getTypesElement());
-        
-        //TODO parseExtensionAttributes(el, SOAPHeaderBlockElement.class, soapHdr, desc);
-        
-        XMLElement tempEl = extEl.getFirstChildElement();
-
-        while (tempEl != null)
-        {
-        	if (Constants.Q_ELEM_DOCUMENTATION.equals(tempEl.getQName()))
-            {
-                soapHdr.addDocumentationElement(parseDocumentation(tempEl, desc));
-            }
-            else
-            {
-                //TODO parse ext elements
-            }
-            tempEl = tempEl.getNextSiblingElement();
-        }
-        
-        return soapHdr;
-    }
-
-    private DocumentationElement parseDocumentation(XMLElement docEl,
-                                                    DocumentableElement parent) 
-                                                    throws WSDLException
-    {
-        DocumentationElement documentation = parent.addDocumentationElement();
-        documentation.setContent(docEl);
-        
-        //TODO parseExtensionAttributes(docEl, DocumentationElement.class, documentation, desc);
-        //TODO parseExtensionElements(...)
-        
-        return documentation;
-    }
-
-}
+ * 
+ *     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.woden.internal.wsdl20.extensions.soap;
+
+import javax.xml.namespace.QName;
+
+import org.apache.woden.ErrorReporter;
+import org.apache.woden.WSDLException;
+import org.apache.woden.XMLElement;
+import org.apache.woden.internal.ErrorLocatorImpl;
+import org.apache.woden.internal.wsdl20.Constants;
+import org.apache.woden.wsdl20.extensions.ExtensionDeserializer;
+import org.apache.woden.wsdl20.extensions.ExtensionElement;
+import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
+import org.apache.woden.wsdl20.extensions.soap.SOAPHeaderBlockElement;
+import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.xml.DocumentableElement;
+import org.apache.woden.wsdl20.xml.DocumentationElement;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+
+/**
+ * Deserializes the &lt;wsoap:header&gt; extension element into a SOAPHeaderBlockElement.
+ * 
+ * @author jkaputin@apache.org
+ *
+ */
+public class SOAPHeaderBlockDeserializer implements ExtensionDeserializer 
+{
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.extensions.ExtensionDeserializer#unmarshall(java.lang.Class, java.lang.Object, javax.xml.namespace.QName, org.w3c.dom.Element, org.apache.woden.wsdl20.xml.DescriptionElement, org.apache.woden.wsdl20.extensions.ExtensionRegistry)
+     */
+    public ExtensionElement unmarshall(Class parentType, 
+                                       Object parent,
+                                       QName extType, 
+                                       XMLElement extEl,
+                                       DescriptionElement desc,
+                                       ExtensionRegistry extReg) 
+                                       throws WSDLException 
+    {
+        SOAPHeaderBlockElement soapHdr = 
+            (SOAPHeaderBlockElement) extReg.createExtElement(parentType, extType);
+        
+        soapHdr.setExtensionType(extType);
+        soapHdr.setParentElement((WSDLElement)parent);
+        
+        String elemDeclQN = extEl.getAttributeValue(Constants.ATTR_ELEMENT);
+        if(elemDeclQN != null)
+        {
+            try {
+                QName qname = extEl.getQName(elemDeclQN);
+                soapHdr.setElementName(qname);
+            } catch (WSDLException e) {
+                extReg.getErrorReporter().reportError( 
+                        new ErrorLocatorImpl(),  //TODO line&col nos.
+                        "WSDL505",
+                        new Object[] {elemDeclQN, extEl.getLocalName()}, 
+                        ErrorReporter.SEVERITY_ERROR);
+            }
+        }
+        
+        //This property defaults to 'false' if it is omitted.
+        String mustUnderstand = extEl.getAttributeValue(SOAPConstants.ATTR_MUSTUNDERSTAND);
+        soapHdr.setMustUnderstand(new Boolean(mustUnderstand));
+
+        //This property defaults to 'false' if it is omitted.
+        String required = extEl.getAttributeValue(Constants.ATTR_REQUIRED);
+        soapHdr.setRequired(new Boolean(required));
+
+        ((SOAPHeaderBlockImpl)soapHdr).setTypes(desc.getTypesElement());
+        
+        //TODO parseExtensionAttributes(el, SOAPHeaderBlockElement.class, soapHdr, desc);
+        
+        XMLElement tempEl = extEl.getFirstChildElement();
+
+        while (tempEl != null)
+        {
+        	if (Constants.Q_ELEM_DOCUMENTATION.equals(tempEl.getQName()))
+            {
+                soapHdr.addDocumentationElement(parseDocumentation(tempEl, desc));
+            }
+            else
+            {
+                //TODO parse ext elements
+            }
+            tempEl = tempEl.getNextSiblingElement();
+        }
+        
+        return soapHdr;
+    }
+
+    private DocumentationElement parseDocumentation(XMLElement docEl,
+                                                    DocumentableElement parent) 
+                                                    throws WSDLException
+    {
+        DocumentationElement documentation = parent.addDocumentationElement();
+        documentation.setContent(docEl);
+        
+        //TODO parseExtensionAttributes(docEl, DocumentationElement.class, documentation, desc);
+        //TODO parseExtensionElements(...)
+        
+        return documentation;
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org