Author: jkaputin
Date: Wed Nov 15 18:05:22 2006
New Revision: 475525
URL: http://svn.apache.org/viewvc?view=rev&rev=475525
Log:
WODEN-89 implemented method for getting http
extension properties for SOAP/HTTP binding.
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
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=475525&r1=475524&r2=475525
==============================================================================
---
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
Wed Nov 15 18:05:22 2006
@@ -19,6 +19,7 @@
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.extensions.ExtensionElement;
import org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions;
import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
@@ -85,9 +86,14 @@
*/
public Boolean isHttpCookies()
{
- BooleanAttr cookiesUsed = (BooleanAttr) ((WSDLElement)fParent)
- .getExtensionAttribute(HTTPConstants.Q_ATTR_COOKIES);
- return cookiesUsed != null ? cookiesUsed.getBoolean() : new
Boolean(false); //defaults to false if omitted
+ URI protocol = getSoapUnderlyingProtocol();
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_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)
@@ -95,9 +101,15 @@
*/
public String getHttpTransferCodingDefault()
{
- StringAttr tcDef = (StringAttr) ((WSDLElement)fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
- return tcDef != null ? tcDef.getString() : null;
+ URI protocol = getSoapUnderlyingProtocol();
+
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ StringAttr tcDef = (StringAttr) ((WSDLElement)fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
+ return tcDef != null ? tcDef.getString() : null;
+ } 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=475525&r1=475524&r2=475525
==============================================================================
---
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
Wed Nov 15 18:05:22 2006
@@ -15,12 +15,18 @@
*/
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;
@@ -138,13 +144,18 @@
*/
public String getHttpTransferCoding()
{
- StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
- .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
- if(tfrCoding != null) {
- return tfrCoding.getString();
- }
+ Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
- return null;
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
+ return tfrCoding != null ? tfrCoding.getString() : null;
+ } else {
+ return null;
+ }
}
/* (non-Javadoc)
@@ -152,12 +163,21 @@
*/
public HTTPHeader[] getHttpHeaders()
{
- 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;
+ Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_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 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=475525&r1=475524&r2=475525
==============================================================================
---
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
Wed Nov 15 18:05:22 2006
@@ -15,10 +15,17 @@
*/
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;
@@ -66,10 +73,19 @@
*/
public String getHttpTransferCoding()
{
- StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
- .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
+ BindingOperation bindingOp = (BindingOperation)
((NestedComponent)fParent).getParent();
+ Binding binding = (Binding) bindingOp.getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
- return (tfrCoding != null ? tfrCoding.getString() : null);
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
+ return tfrCoding != null ? tfrCoding.getString() : null;
+ } else {
+ return null;
+ }
}
/* (non-Javadoc)
@@ -77,12 +93,22 @@
*/
public HTTPHeader[] getHttpHeaders()
{
- 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;
+ BindingOperation bindingOp = (BindingOperation)
((NestedComponent)fParent).getParent();
+ Binding binding = (Binding) bindingOp.getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_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 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=475525&r1=475524&r2=475525
==============================================================================
---
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
Wed Nov 15 18:05:22 2006
@@ -19,7 +19,11 @@
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.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;
@@ -75,9 +79,18 @@
* @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpLocation()
*/
public URI getHttpLocation() {
- URIAttr httpLoc = (URIAttr) ((WSDLElement) fParent)
+ Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ URIAttr httpLoc = (URIAttr) ((WSDLElement)fParent)
.getExtensionAttribute(HTTPConstants.Q_ATTR_LOCATION);
- return httpLoc != null ? httpLoc.getURI() : null;
+ return httpLoc != null ? httpLoc.getURI() : null;
+ } else {
+ return null;
+ }
}
/*
@@ -86,9 +99,18 @@
* @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpTransferCodingDefault()
*/
public String getHttpTransferCodingDefault() {
- StringAttr tfrCodingDef = (StringAttr) ((WSDLElement) fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
- return tfrCodingDef != null ? tfrCodingDef.getString() : null;
+ Binding binding = (Binding) ((NestedComponent)fParent).getParent();
+ SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+
+ URI protocol = soapBindExt.getSoapUnderlyingProtocol();
+ if(protocol != null &&
protocol.toString().equals(SOAPConstants.PROTOCOL_URI_HTTP)) {
+ StringAttr tfrCodingDef = (StringAttr) ((WSDLElement)fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
+ return tfrCodingDef != null ? tfrCodingDef.getString() : null;
+ } else {
+ return null;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
