Author: jkaputin
Date: Fri Nov 17 01:47:16 2006
New Revision: 476091
URL: http://svn.apache.org/viewvc?view=rev&rev=476091
Log:
WODEN-89 For HTTP ext properties that appear for
SOAP/HTTP bindings, check for different http protocol
URLs depending on whether the soap version is
1.1 or 1.2.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -87,11 +87,19 @@
public Boolean isHttpCookies()
{
URI protocol = getSoapUnderlyingProtocol();
- if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ 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 {
+ }
+ else
+ {
return null;
}
}
@@ -102,12 +110,19 @@
public String getHttpTransferCodingDefault()
{
URI protocol = getSoapUnderlyingProtocol();
+ if(protocol == null) {
+ return null;
+ }
- if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ if( ("1.2".equals(getSoapVersion()) &&
protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+ ("1.1".equals(getSoapVersion()) &&
protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ {
StringAttr tcDef = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
return tcDef != null ? tcDef.getString() : null;
- } else {
+ }
+ else
+ {
return null;
}
}
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -147,13 +147,21 @@
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(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ if( ("1.2".equals(version) &&
protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+ ("1.1".equals(version) &&
protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ {
StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
return tfrCoding != null ? tfrCoding.getString() : null;
- } else {
+ }
+ else
+ {
return null;
}
}
@@ -166,16 +174,24 @@
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(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ 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 {
+ }
+ else
+ {
return null;
}
}
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -77,13 +77,21 @@
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(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ if( ("1.2".equals(version) &&
protocol.toString().equals(SOAPConstants.URI_SOAP12_HTTP)) ||
+ ("1.1".equals(version) &&
protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
+ {
StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
return tfrCoding != null ? tfrCoding.getString() : null;
- } else {
+ }
+ else
+ {
return null;
}
}
@@ -97,16 +105,24 @@
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(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ 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 {
+ }
+ else
+ {
return null;
}
}
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -79,16 +79,25 @@
* @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpLocation()
*/
public URI 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 &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ 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)) )
+ {
URIAttr httpLoc = (URIAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_LOCATION);
return httpLoc != null ? httpLoc.getURI() : null;
- } else {
+ }
+ else
+ {
return null;
}
}
@@ -99,16 +108,25 @@
* @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpTransferCodingDefault()
*/
public String getHttpTransferCodingDefault() {
+
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 &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ 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 tfrCodingDef = (StringAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
return tfrCodingDef != null ? tfrCodingDef.getString() : null;
- } else {
+ }
+ else
+ {
return null;
}
}
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -27,8 +27,10 @@
"http://www.w3.org/2006/01/wsdl/soap";;
// Protocol URIs.
- public static final String PROTOCOL_URI_HTTP =
+ 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";
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?view=diff&rev=476091&r1=476090&r2=476091
==============================================================================
---
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
Fri Nov 17 01:47:16 2006
@@ -15,9 +15,16 @@
*/
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;
@@ -41,10 +48,31 @@
*/
public HTTPAuthenticationScheme getHttpAuthenicationScheme() {
- HTTPAuthenticationSchemeAttr scheme =
(HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
+ 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_TYPE);
-
- return scheme != null ? scheme.getScheme() : null;
+ return scheme != null ? scheme.getScheme() : null;
+ }
+ else
+ {
+ return null;
+ }
}
/*
@@ -54,10 +82,31 @@
*/
public String getHttpAuthenticationRealm() {
- StringAttr realm = (StringAttr) ((WSDLElement) fParent)
+ 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;
+ return realm != null ? realm.getString() : null;
+ }
+ else
+ {
+ return null;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
