Author: jkaputin
Date: Sat Feb 10 15:06:14 2007
New Revision: 505785
URL: http://svn.apache.org/viewvc?view=rev&rev=505785
Log:
WODEN-146 Implement spec issue CR143 to rename the
http transfer coding properties to http content encoding.
Modified:
incubator/woden/branches/M7/src/org/apache/woden/ant/CmHttpWriter.java
incubator/woden/branches/M7/src/org/apache/woden/ant/CmSoapWriter.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingFaultExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensions.java
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensions.java
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl
Modified: incubator/woden/branches/M7/src/org/apache/woden/ant/CmHttpWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/ant/CmHttpWriter.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
--- incubator/woden/branches/M7/src/org/apache/woden/ant/CmHttpWriter.java
(original)
+++ incubator/woden/branches/M7/src/org/apache/woden/ant/CmHttpWriter.java Sat
Feb 10 15:06:14 2007
@@ -60,8 +60,8 @@
out.write(PREFIX + ":httpMethodDefault", http.getHttpMethodDefault());
out.write(PREFIX + ":httpQueryParameterSeparatorDefault", http
.getHttpQueryParameterSeparatorDefault());
- out.write(PREFIX + ":httpTransferCodingDefault", http
- .getHttpTransferCodingDefault());
+ out.write(PREFIX + ":httpContentEncodingDefault", http
+ .getHttpContentEncodingDefault());
out.endElement();
}
@@ -75,8 +75,8 @@
write(PREFIX + ":httpErrorStatusCode", http
.getHttpErrorStatusCode());
write(PREFIX + ":httpHeaders", http.getHttpHeaders());
- out.write(PREFIX + ":httpTransferCoding", http
- .getHttpTransferCoding());
+ out.write(PREFIX + ":httpContentEncoding", http
+ .getHttpContentEncoding());
out.endElement();
}
@@ -101,8 +101,8 @@
.getHttpOutputSerialization());
out.write(PREFIX + ":httpQueryParameterSeparator", http
.getHttpQueryParameterSeparator());
- out.write(PREFIX + ":httpTransferCodingDefault", http
- .getHttpTransferCodingDefault());
+ out.write(PREFIX + ":httpContentEncodingDefault", http
+ .getHttpContentEncodingDefault());
out.endElement();
@@ -117,7 +117,7 @@
out.beginElement(PREFIX + ":httpBindingMessageReferenceExtension");
write(PREFIX + ":httpHeaders", http.getHttpHeaders());
- out.write(PREFIX + ":httpTransferCoding",
http.getHttpTransferCoding());
+ out.write(PREFIX + ":httpContentEncoding",
http.getHttpContentEncoding());
out.endElement();
Modified: incubator/woden/branches/M7/src/org/apache/woden/ant/CmSoapWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/ant/CmSoapWriter.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
--- incubator/woden/branches/M7/src/org/apache/woden/ant/CmSoapWriter.java
(original)
+++ incubator/woden/branches/M7/src/org/apache/woden/ant/CmSoapWriter.java Sat
Feb 10 15:06:14 2007
@@ -69,7 +69,7 @@
out.beginElement(PREFIX + ":soapBindingExtension");
out.write(CmHttpWriter.PREFIX + ":httpCookies", soap.isHttpCookies());
- out.write(CmHttpWriter.PREFIX + ":httpTransferCodingDefault",
soap.getHttpTransferCodingDefault());
+ out.write(CmHttpWriter.PREFIX + ":httpContentEncodingDefault",
soap.getHttpContentEncodingDefault());
out.write(CmHttpWriter.PREFIX + ":httpQueryParameterSeparatorDefault",
soap.getHttpQueryParameterSeparatorDefault());
write(PREFIX + ":soapMepDefault", soap.getSoapMepDefault());
write(PREFIX + ":soapModules", soap.getSoapModules());
@@ -87,7 +87,7 @@
out.beginElement(PREFIX + ":soapBindingFaultExtension");
cmhttp.write(CmHttpWriter.PREFIX + ":httpHeaders",
soap.getHttpHeaders());
- out.write(CmHttpWriter.PREFIX + ":httpTransferCoding",
soap.getHttpTransferCoding());
+ out.write(CmHttpWriter.PREFIX + ":httpContentEncoding",
soap.getHttpContentEncoding());
write(PREFIX + ":soapFaultCode", soap.getSoapFaultCode());
write(PREFIX + ":soapFaultSubcodes", soap.getSoapFaultSubcodes());
write(PREFIX + ":soapHeaders", soap.getSoapHeaders());
@@ -105,7 +105,7 @@
out.beginElement(PREFIX + ":soapBindingOperationExtension");
write(CmHttpWriter.PREFIX + ":httpLocation", soap.getHttpLocation());
- out.write(CmHttpWriter.PREFIX + ":httpTransferCodingDefault",
soap.getHttpTransferCodingDefault());
+ out.write(CmHttpWriter.PREFIX + ":httpContentEncodingDefault",
soap.getHttpContentEncodingDefault());
out.write(CmHttpWriter.PREFIX + ":httpQueryParameterSeparator",
soap.getHttpQueryParameterSeparator());
write(PREFIX + ":soapAction", soap.getSoapAction());
write(PREFIX + ":soapMep", soap.getSoapMep());
@@ -123,7 +123,7 @@
out.beginElement(PREFIX + ":soapBindingMessageReferenceExtension");
cmhttp.write(CmHttpWriter.PREFIX + ":httpHeaders",
soap.getHttpHeaders());
- out.write(CmHttpWriter.PREFIX + ":httpTransferCoding",
soap.getHttpTransferCoding());
+ out.write(CmHttpWriter.PREFIX + ":httpContentEncoding",
soap.getHttpContentEncoding());
write(PREFIX + ":soapHeaders", soap.getSoapHeaders());
write(PREFIX + ":soapModules", soap.getSoapModules());
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
Sat Feb 10 15:06:14 2007
@@ -225,14 +225,14 @@
HTTPConstants.Q_ATTR_COOKIES,
BooleanAttrImpl.class);
registerExtAttributeType(BindingElement.class,
- HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT,
+ HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT,
StringAttrImpl.class);
registerExtAttributeType(BindingFaultElement.class,
HTTPConstants.Q_ATTR_CODE,
IntOrTokenAnyAttrImpl.class);
registerExtAttributeType(BindingFaultElement.class,
- HTTPConstants.Q_ATTR_TRANSFER_CODING,
StringAttrImpl.class);
+ HTTPConstants.Q_ATTR_CONTENT_ENCODING,
StringAttrImpl.class);
registerExtAttributeType(BindingOperationElement.class,
HTTPConstants.Q_ATTR_LOCATION,
StringAttrImpl.class);
@@ -257,11 +257,11 @@
StringAttrImpl.class);
registerExtAttributeType(BindingOperationElement.class,
- HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT,
+ HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT,
StringAttrImpl.class);
registerExtAttributeType(BindingMessageReferenceElement.class,
- HTTPConstants.Q_ATTR_TRANSFER_CODING,
StringAttrImpl.class);
+ HTTPConstants.Q_ATTR_CONTENT_ENCODING,
StringAttrImpl.class);
registerExtAttributeType(EndpointElement.class,
HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME,
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -65,13 +65,13 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions#getHttpTransferCodingDefault()
+ * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions#getHttpContentEncodingDefault()
*/
- public String getHttpTransferCodingDefault()
+ public String getHttpContentEncodingDefault()
{
- StringAttr tcDef = (StringAttr) ((WSDLElement)fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
- return tcDef != null ? tcDef.getString() : null;
+ StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+ return ceDef != null ? ceDef.getString() : null;
}
}
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingFaultExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingFaultExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingFaultExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingFaultExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -71,34 +71,18 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions#getHttpTransferCoding()
+ * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingFaultExtensions#getHttpContentEncoding()
*
*/
- public String getHttpTransferCoding()
+ public String getHttpContentEncoding()
{
- StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
- .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
- if(tfrCoding != null) {
- return tfrCoding.getString();
+ String ce = null;
+ StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
+ if(contEncoding != null) {
+ ce = contEncoding.getString();
}
-
- return null; //TODO remove if default changed as below.
-
- /* TODO Per ws-desc post 26May06, seeking clarification of defaults
- * for {http transfer coding}, as Part 2 section 6.8.2 currently says
- * the default is BindingOperation {http transfer coding default}.
- * If Part 2 spec is modified to explicitly default this to Binding
- * {http transfer coding default} then uncomment the following code.
- *
- * //if transfer coding is null, return the transfer coding default in
Binding
- * Binding binding = (Binding) ((BindingFault)fParent).getParent();
- * HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)
- *
binding.getComponentExtensionsForNamespace(HTTPConstants.NS_URI_HTTP);
- *
- * //Binding has REQUIRED HTTP extension properties so
HTTPBindingExtensions must be
- * //present (i.e. no need to check for null httpBindExts).
- * return httpBindExts.getHttpTransferCodingDefault();
- */
+ return ce;
}
/* (non-Javadoc)
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -17,11 +17,8 @@
package org.apache.woden.internal.wsdl20.extensions.http;
import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl;
-import org.apache.woden.wsdl20.BindingMessageReference;
-import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.extensions.ExtensionElement;
import
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions;
-import org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions;
import org.apache.woden.wsdl20.extensions.http.HTTPHeader;
import org.apache.woden.wsdl20.xml.WSDLElement;
import org.apache.woden.xml.StringAttr;
@@ -38,15 +35,15 @@
{
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions#getHttpTransferCoding()
+ * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingMessageReferenceExtensions#getHttpContentEncoding()
*
*/
- public String getHttpTransferCoding()
+ public String getHttpContentEncoding()
{
- StringAttr tfrCoding = (StringAttr) ((WSDLElement)fParent)
- .getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING);
+ StringAttr contentEncoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
- return (tfrCoding != null ? tfrCoding.getString() : null);
+ return (contentEncoding != null ? contentEncoding.getString() : null);
}
/* (non-Javadoc)
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPBindingOperationExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -211,12 +211,12 @@
/*
* (non-Javadoc)
*
- * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions#getHttpTransferCodingDefault()
+ * @see
org.apache.woden.wsdl20.extensions.http.HTTPBindingOperationExtensions#getHttpContentEncodingDefault()
*/
- public String getHttpTransferCodingDefault() {
- StringAttr tfrCodingDef = (StringAttr) ((WSDLElement) fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_TRANSFER_CODING_DEFAULT);
- return tfrCodingDef != null ? tfrCodingDef.getString() : null;
+ public String getHttpContentEncodingDefault() {
+ StringAttr contEncodingDef = (StringAttr) ((WSDLElement)
fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+ return contEncodingDef != null ? contEncodingDef.getString() :
null;
}
/*
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
Sat Feb 10 15:06:14 2007
@@ -48,8 +48,8 @@
public static final String ATTR_OUTPUT_SERIALIZATION =
"outputSerialization";
public static final String ATTR_QUERY_PARAMETER_SEPARATOR =
"queryParameterSeparator";
public static final String ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT =
"queryParameterSeparatorDefault";
- public static final String ATTR_TRANSFER_CODING = "transferCoding";
- public static final String ATTR_TRANSFER_CODING_DEFAULT =
"transferCodingDefault";
+ public static final String ATTR_CONTENT_ENCODING = "contentEncoding";
+ public static final String ATTR_CONTENT_ENCODING_DEFAULT =
"contentEncodingDefault";
// Prefixes
public static final String PFX_WHTTP = "whttp";
@@ -100,11 +100,11 @@
public static final QName Q_ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT =
new QName(NS_STRING_HTTP, ATTR_QUERY_PARAMETER_SEPARATOR_DEFAULT,
PFX_WHTTP);
- public static final QName Q_ATTR_TRANSFER_CODING =
- new QName(NS_STRING_HTTP, ATTR_TRANSFER_CODING, PFX_WHTTP);
+ public static final QName Q_ATTR_CONTENT_ENCODING =
+ new QName(NS_STRING_HTTP, ATTR_CONTENT_ENCODING, PFX_WHTTP);
- public static final QName Q_ATTR_TRANSFER_CODING_DEFAULT =
- new QName(NS_STRING_HTTP, ATTR_TRANSFER_CODING_DEFAULT, PFX_WHTTP);
+ public static final QName Q_ATTR_CONTENT_ENCODING_DEFAULT =
+ new QName(NS_STRING_HTTP, ATTR_CONTENT_ENCODING_DEFAULT, PFX_WHTTP);
//{http method} constants
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -128,9 +128,9 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpTransferCodingDefault()
+ * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingExtensions#getHttpContentEncodingDefault()
*/
- public String getHttpTransferCodingDefault()
+ public String getHttpContentEncodingDefault()
{
URI protocol = getSoapUnderlyingProtocol();
if(protocol == null) {
@@ -140,9 +140,9 @@
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;
+ StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+ return ceDef != null ? ceDef.getString() : null;
}
else
{
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -140,10 +140,10 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpTransferCoding()
+ * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultExtensions#getHttpContentEncoding()
*
*/
- public String getHttpTransferCoding()
+ public String getHttpContentEncoding()
{
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
@@ -157,9 +157,9 @@
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;
+ StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
+ return contEncoding != null ? contEncoding.getString() : null;
}
else
{
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -69,10 +69,10 @@
}
/* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpTransferCoding()
+ * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions#getHttpContentEncoding()
*
*/
- public String getHttpTransferCoding()
+ public String getHttpContentEncoding()
{
BindingOperation bindingOp = (BindingOperation)
((NestedComponent)fParent).getParent();
Binding binding = (Binding) bindingOp.getParent();
@@ -87,9 +87,9 @@
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;
+ StringAttr contEncoding = (StringAttr) ((WSDLElement)fParent)
+ .getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING);
+ return contEncoding != null ? contEncoding.getString() : null;
}
else
{
Modified:
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingOperationExtensionsImpl.java
Sat Feb 10 15:06:14 2007
@@ -136,9 +136,9 @@
/*
* (non-Javadoc)
*
- * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpTransferCodingDefault()
+ * @see
org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions#getHttpContentEncodingDefault()
*/
- public String getHttpTransferCodingDefault() {
+ public String getHttpContentEncodingDefault() {
Binding binding = (Binding) ((NestedComponent)fParent).getParent();
SOAPBindingExtensions soapBindExt = (SOAPBindingExtensions)binding
@@ -152,9 +152,9 @@
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;
+ StringAttr ceDef = (StringAttr) ((WSDLElement)fParent)
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_CONTENT_ENCODING_DEFAULT);
+ return ceDef != null ? ceDef.getString() : null;
}
else
{
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensions.java
Sat Feb 10 15:06:14 2007
@@ -28,7 +28,7 @@
* <li>{http method default}</li>
* <li>{http query parameter separator default}</li>
* <li>{http cookies}</li>
- * <li>{http transfer coding default}</li>
+ * <li>{http content encoding default}</li>
* </ul>
*
* @author John Kaputin ([EMAIL PROTECTED])
@@ -41,6 +41,6 @@
public Boolean isHttpCookies(); //TODO consider whether this convention is
ok
- public String getHttpTransferCodingDefault();
+ public String getHttpContentEncodingDefault();
}
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensions.java
Sat Feb 10 15:06:14 2007
@@ -26,7 +26,7 @@
* These include:
* <ul>
* <li>{http error status code}</li>
- * <li>{http transfer coding}</li>
+ * <li>{http content encoding}</li>
* <li>{http headers}</li>
* </ul>
*
@@ -36,7 +36,7 @@
{
public HTTPErrorStatusCode getHttpErrorStatusCode();
- public String getHttpTransferCoding();
+ public String getHttpContentEncoding();
public HTTPHeader[] getHttpHeaders();
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensions.java
Sat Feb 10 15:06:14 2007
@@ -25,7 +25,7 @@
* <p>
* These include:
* <ul>
- * <li>{http transfer coding}</li>
+ * <li>{http content encoding}</li>
* <li>{http headers}</li>
* </ul>
*
@@ -34,9 +34,9 @@
public interface HTTPBindingMessageReferenceExtensions extends
ComponentExtensions
{
/**
- * @return String the {http transfer coding} property, represented by the
whttp:transferCoding extension attribute
+ * @return String the {http content encoding} property, represented by the
whttp:contentEncoding extension attribute
*/
- public String getHttpTransferCoding();
+ public String getHttpContentEncoding();
/**
* @return HTTPHeader[] the {http headers} property, represented by an
array of
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensions.java
Sat Feb 10 15:06:14 2007
@@ -16,8 +16,6 @@
*/
package org.apache.woden.wsdl20.extensions.http;
-import java.net.URI;
-
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
/**
@@ -34,7 +32,7 @@
* <li>{http output serialization}</li>
* <li>{http fault serialization}</li>
* <li>{http query parameter separator}</li>
- * <li>{http transfer coding default}</li>
+ * <li>{http content encoding default}</li>
* </ul>
*
* @author John Kaputin ([EMAIL PROTECTED])
@@ -79,8 +77,8 @@
public String getHttpQueryParameterSeparator();
/**
- * @return String the {http transfer coding default}, represented by the
whttp:transferCodingDefault extension attribute
+ * @return String the {http content encoding default}, represented by the
whttp:contentEncodingDefault extension attribute
*/
- public String getHttpTransferCodingDefault();
+ public String getHttpContentEncodingDefault();
}
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensions.java
Sat Feb 10 15:06:14 2007
@@ -32,8 +32,18 @@
* <li>{soap mep default}</li>
* <li>{soap modules}</li>
* </ul>
+ * It also defines the properties from the HTTP extensions that
+ * are present in the SOAP Binding extensions when the underlying
+ * protocol is HTTP.
+ * <p>
+ * These include:
+ * <ul>
+ * <li>{http query parameter separator default}</li>
+ * <li>{http cookies}</li>
+ * <li>{http content encoding default}</li>
+ * </ul>
*
- * @author [EMAIL PROTECTED]
+ * @author John Kaputin ([EMAIL PROTECTED])
*/
public interface SOAPBindingExtensions extends ComponentExtensions
{
@@ -65,11 +75,11 @@
/**
* If the SOAP version is "1.1" or "1.2" and the underlying protocol is
HTTP, returns the
- * {http transfer coding default} extension property represented by the
- * whttp:transferCodingDefault extension attribute , otherwise null.
+ * {http content encoding default} extension property represented by the
+ * whttp:contentEncodingDefault extension attribute , otherwise null.
*
- * @return String the {http transfer coding default} extension property
+ * @return String the {http content encoding default} extension property
*/
- public String getHttpTransferCodingDefault();
+ public String getHttpContentEncodingDefault();
}
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensions.java
Sat Feb 10 15:06:14 2007
@@ -31,8 +31,17 @@
* <li>{soap modules}</li>
* <li>{soap headers}</li>
* </ul>
+ * It also defines the properties from the HTTP extensions that
+ * are present in the SOAP BindingFault extensions when the underlying
+ * protocol of the SOAP Binding is HTTP.
+ * <p>
+ * These include:
+ * <ul>
+ * <li>{http content encoding}</li>
+ * <li>{http headers}</li>
+ * </ul>
*
- * @author [EMAIL PROTECTED]
+ * @author John Kaputin ([EMAIL PROTECTED])
*/
public interface SOAPBindingFaultExtensions extends ComponentExtensions
{
@@ -43,8 +52,8 @@
public SOAPFaultCode getSoapFaultCode();
/**
- * Returns an object representing the {soap fault subcodes} property,
which contains
- * a List of xs:QName or the xs:token "#any".
+ * Returns an object representing the {soap fault subcodes} property,
+ * which contains a List of xs:QName or the xs:token "#any".
*/
public SOAPFaultSubcodes getSoapFaultSubcodes();
@@ -52,7 +61,7 @@
public SOAPHeaderBlock[] getSoapHeaders();
- public String getHttpTransferCoding();
+ public String getHttpContentEncoding();
public HTTPHeader[] getHttpHeaders();
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensions.java
Sat Feb 10 15:06:14 2007
@@ -29,8 +29,17 @@
* <li>{soap modules}</li>
* <li>{soap headers}</li>
* </ul>
+ * It also defines the properties from the HTTP extensions that
+ * are present in the SOAP BindingMessageReference extensions when the
underlying
+ * protocol of the SOAP Binding is HTTP.
+ * <p>
+ * These include:
+ * <ul>
+ * <li>{http content encoding}</li>
+ * <li>{http headers}</li>
+ * </ul>
*
- * @author [EMAIL PROTECTED]
+ * @author John Kaputin ([EMAIL PROTECTED])
*/
public interface SOAPBindingMessageReferenceExtensions extends
ComponentExtensions
{
@@ -39,9 +48,9 @@
public SOAPHeaderBlock[] getSoapHeaders();
/**
- * @return String the {http transfer coding} property, represented by the
whttp:transferCoding extension attribute
+ * @return String the {http content encoding} property, represented by the
whttp:contentEncoding extension attribute
*/
- public String getHttpTransferCoding();
+ public String getHttpContentEncoding();
/**
* @return HTTPHeader[] the {http headers} property, represented by an
array of
Modified:
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensions.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensions.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensions.java
(original)
+++
incubator/woden/branches/M7/src/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensions.java
Sat Feb 10 15:06:14 2007
@@ -32,8 +32,18 @@
* <li>{soap action}</li>
* <li>{soap modules}</li>
* </ul>
+ * It also defines the properties from the HTTP extensions that
+ * are present in the SOAP BindingOperation extensions when the underlying
+ * protocol of the SOAP Binding is HTTP.
+ * <p>
+ * These include:
+ * <ul>
+ * <li>{http location}</li>
+ * <li>{http query parameter separator}</li>
+ * <li>{http content encoding default}</li>
+ * </ul>
*
- * @author [EMAIL PROTECTED]
+ * @author John Kaputin ([EMAIL PROTECTED])
*/
public interface SOAPBindingOperationExtensions extends ComponentExtensions
{
@@ -72,11 +82,11 @@
/**
* If the SOAP version is "1.1" or "1.2" and the underlying protocol is
HTTP, returns the
- * {http transfer coding default} extension property represented by the
- * whttp:transferCodingDefault extension attribute , otherwise null.
+ * {http content encoding default} extension property represented by the
+ * whttp:contentEncodingDefault extension attribute , otherwise null.
*
- * @return String the {http transfer coding default} extension property
+ * @return String the {http content encoding default} extension property
*/
- public String getHttpTransferCodingDefault();
+ public String getHttpContentEncodingDefault();
}
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
Sat Feb 10 15:06:14 2007
@@ -133,18 +133,18 @@
}
/**
- * Test that the value for the {http transfer coding default} property
returned by the
- * <code>getTransferCodingDefault</code> method matches the expected value
parsed
+ * Test that the value for the {http content encoding default} property
returned by the
+ * <code>getContentEncodingDefault</code> method matches the expected
value parsed
* from the WSDL.
*/
- public void testGetHttpTransferCodingDefault()
+ public void testGetHttpContentEncodingDefault()
{
Binding binding1 = fBindings[0];
HTTPBindingExtensions httpBindExts = (HTTPBindingExtensions)binding1
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
- String actual = httpBindExts.getHttpTransferCodingDefault();
- assertEquals("Unexpected value for http transfer coding default.",
+ String actual = httpBindExts.getHttpContentEncodingDefault();
+ assertEquals("Unexpected value for http content encoding default.",
"chunked",
actual);
}
@@ -164,8 +164,8 @@
* Test that the OPTIONAL property {http method default} defaults to null
* when the whttp:methodDefault attribute is omitted from the WSDL.
* <p>
- * Test that the OPTIONAL property {transfer coding default} defaults to
null
- * when the whttp:transferCodingDefault attribute is omitted from the WSDL.
+ * Test that the OPTIONAL property {http content encoding default}
defaults to null
+ * when the whttp:contentEncodingDefault attribute is omitted from the
WSDL.
*/
public void testHttpPropertyDefaults()
{
@@ -187,8 +187,8 @@
assertNull("The {http method default} property should default to null",
httpBindExts.getHttpMethodDefault());
- assertNull("The {http transfer coding default} property should default
to null",
- httpBindExts.getHttpTransferCodingDefault());
+ assertNull("The {http content encoding default} property should
default to null",
+ httpBindExts.getHttpContentEncodingDefault());
}
}
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
Sat Feb 10 15:06:14 2007
@@ -115,7 +115,7 @@
HTTPBindingFaultExtensions httpBindFaultExts =
(HTTPBindingFaultExtensions)bindFault
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
- String actual = httpBindFaultExts.getHttpTransferCoding();
+ String actual = httpBindFaultExts.getHttpContentEncoding();
assertNotNull("The value for http transfer coding was null", actual);
assertEquals("Unexpected value for http transfer coding.",
"compress;chunked",
@@ -174,7 +174,7 @@
//TODO replace the following assertNull with the code above, once it's
confirmed.
assertNull("The {http transfer coding} is not null as expected.",
- httpBindFaultExts.getHttpTransferCoding());
+ httpBindFaultExts.getHttpContentEncoding());
}
/**
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
Sat Feb 10 15:06:14 2007
@@ -74,16 +74,16 @@
}
/**
- * Testcases for the {http transfer coding} property returned
- * by the <code>getHttpTransferCoding</code> method.
+ * Testcases for the {http content encoding} property returned
+ * by the <code>getHttpContentEncoding</code> method.
* <p>
- * 1. Test that the method returns "compress" if the whttp:transferCoding
+ * 1. Test that the method returns "compress" if the whttp:contentEncoding
* attribute parsed from the WSDL contains "compress".
* <p>
- * 2. Test that the method returns null if the whttp:transferCoding
+ * 2. Test that the method returns null if the whttp:contentEncoding
* attribute is absent in the WSDL.
*/
- public void testGetHttpTransferCoding() {
+ public void testGetHttpContentEncoding() {
BindingMessageReference[] bindMsgRefs =
fBindOpers[0].getBindingMessageReferences();
assertEquals("The first BindingOperation should contain 2
BindingMessageReference components.", 2, bindMsgRefs.length);
@@ -95,8 +95,8 @@
.getComponentExtensionsForNamespace(
ComponentExtensions.URI_NS_HTTP);
- String actual = httpBindMsgRefExts.getHttpTransferCoding();
- assertEquals("Unexpected value for http transfer coding.",
+ String actual = httpBindMsgRefExts.getHttpContentEncoding();
+ assertEquals("Unexpected value for http content encoding.",
"compress",
actual);
@@ -107,8 +107,8 @@
.getComponentExtensionsForNamespace(
ComponentExtensions.URI_NS_HTTP);
- String actual2 = httpBindMsgRefExts2.getHttpTransferCoding();
- assertNull("Null was expected for http transfer coding.",
+ String actual2 = httpBindMsgRefExts2.getHttpContentEncoding();
+ assertNull("Null was expected for http content encoding.",
actual2);
}
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
Sat Feb 10 15:06:14 2007
@@ -418,16 +418,16 @@
}
/**
- * Testcases for the {http transfer coding default} property returned
- * by the <code>getHttpTransferCodingDefault</code> method.
+ * Testcases for the {http content encoding default} property returned
+ * by the <code>getHttpContentEncodingDefault</code> method.
* <p>
- * 1. Test that the method returns "chunked" if the
whttp:transferCodingDefault
+ * 1. Test that the method returns "chunked" if the
whttp:contentEncodingDefault
* attribute parsed from the WSDL contains "chunked".
* <p>
* 2. Test that it defaults to null when the attribute is omitted
* from the WSDL.
*/
- public void testGetHttpTransferCodingDefault() {
+ public void testGetHttpContentEncodingDefault() {
//1. test that the property is parsed correctly from the WSDL
BindingOperation oper = fBindOpers[0];
@@ -436,8 +436,8 @@
.getComponentExtensionsForNamespace(
ComponentExtensions.URI_NS_HTTP);
- String actual = httpBindOperExts.getHttpTransferCodingDefault();
- assertEquals("Unexpected value for http transfer coding default.",
+ String actual = httpBindOperExts.getHttpContentEncodingDefault();
+ assertEquals("Unexpected value for http content encoding default.",
"chunked",
actual);
@@ -448,8 +448,8 @@
.getComponentExtensionsForNamespace(
ComponentExtensions.URI_NS_HTTP);
- String actual2 = httpBindOperExts2.getHttpTransferCodingDefault();
- assertNull("Http transfer coding default did not default to null.",
+ String actual2 = httpBindOperExts2.getHttpContentEncodingDefault();
+ assertNull("Http content encoding default did not default to null.",
actual2);
}
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl
Sat Feb 10 15:06:14 2007
@@ -43,12 +43,12 @@
whttp:methodDefault="POST"
whttp:queryParameterSeparatorDefault="$"
whttp:cookies="true"
- whttp:transferCodingDefault="chunked">
+ whttp:contentEncodingDefault="chunked">
<documentation>
{http method default} should be POST if whttp:methodDefault is
"POST"
{http query parameter separator default} should be "$" if
whttp:queryParameterSeparatorDefault is "$"
{http cookies} should be true if whttp:cookies is "true"
- {http transfer coding default} should be "chunked" if
whttp:transferCodingDefault is "chunked"
+ {http content encoding default} should be "chunked" if
whttp:contentEncodingDefault is "chunked"
</documentation>
</binding>
@@ -59,7 +59,7 @@
{http method default} is OPTIONAL so should be null if
whttp:methodDefault omitted
{http query parameter separator default} is REQUIRED and should
default to ampersand if whttp:queryParameterSeparatorDefault omitted
{http cookies} is REQUIRED and should default to false if
whttp:cookies omitted
- {http transfer coding default} is OPTIONAL so should be null if
whttp:transferCodingDefault is omitted
+ {http content encoding default} is OPTIONAL so should be null if
whttp:contentEncodingDefault is omitted
</documentation>
</binding>
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl
Sat Feb 10 15:06:14 2007
@@ -38,19 +38,19 @@
<binding name="binding1"
interface="tns:interface1"
type="http://www.w3.org/2006/01/wsdl/http";
- whttp:transferCodingDefault="chunked">
+ whttp:contentEncodingDefault="chunked">
<documentation>
{http method default} should be POST if whttp:methodDefault is
"POST"
{http query parameter separator default} should be "$" if
whttp:queryParameterSeparatorDefault is "$"
{http cookies} should be true if whttp:cookies is "true"
- {http transfer coding default} should be "chunked" if
whttp:transferCodingDefault is "chunked"
+ {http content encoding default} should be "chunked" if
whttp:contentEncodingDefault is "chunked"
</documentation>
<fault ref="tns:fault1"
whttp:code="123"
- whttp:transferCoding="compress;chunked" >
+ whttp:contentEncoding="compress;chunked" >
<documentation>
{http error status code} should be 123 if whttp:code is "123"
- {http transfer coding} should be "compress;chunked" if
whttp:transferCoding is "compress;chunked"
+ {http content encoding} should be "compress;chunked" if
whttp:contentEncoding is "compress;chunked"
</documentation>
</fault>
<fault ref="tns:fault2"
@@ -62,7 +62,7 @@
<fault ref="tns:fault3">
<documentation>
{http error status code} is REQUIRED and should default to
#any if whttp:code is omitted
- {http transfer coding} is OPTIONAL so should be null if
whttp:transferCoding is omitted
+ {http content encoding} is OPTIONAL so should be null if
whttp:contentEncoding is omitted
</documentation>
</fault>
<fault ref="tns:fault4">
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl
Sat Feb 10 15:06:14 2007
@@ -44,12 +44,12 @@
type="http://www.w3.org/2006/01/wsdl/http";>
<operation ref="tns:operation1"
- whttp:transferCodingDefault="chunked" >
+ whttp:contentEncodingDefault="chunked" >
<input messageLabel="IN"
- whttp:transferCoding="compress">
+ whttp:contentEncoding="compress">
<documentation>
- {http transfer coding} should be "compress"
+ {http content encoding} should be "compress"
{http headers} should contain 2 HTTPHeader components
</documentation>
<whttp:header name="Destination" type="xs:string"
required="true" />
@@ -68,16 +68,13 @@
</operation>
<operation ref="tns:operation2"
- whttp:transferCodingDefault="chunked" >
+ whttp:contentEncodingDefault="chunked" >
<input messageLabel="IN">
<documentation>
- According to the spec Part 2 sect 6.8.2
- {http transfer coding} should default to {http transfer
coding default}
- in binding operation, which in this testcase is "chunked".
- However, the spec also defines {http transfer coding} as
OPTIONAL, so for
- this test case there are no HTTP extensions to the input
message so there
- will be no extension properties, default or otherwise!
+ The {http content encoding} property is OPTIONAL, so for
+ this test case there are no HTTP extensions to the input
message
+ so there will be no HTTP extension properties.
Test that HTTPBindingMessageReferenceExtensions does NOT
exist
for the BindingMessageReference representing this input
message.
</documentation>
Modified:
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl?view=diff&rev=505785&r1=505784&r2=505785
==============================================================================
---
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl
(original)
+++
incubator/woden/branches/M7/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl
Sat Feb 10 15:06:14 2007
@@ -58,7 +58,7 @@
whttp:outputSerialization="text/plain"
whttp:faultSerialization="text/html"
whttp:queryParameterSeparator="%"
- whttp:transferCodingDefault="chunked" >
+ whttp:contentEncodingDefault="chunked" >
<documentation>
Test that the specified attribute values appear in the
component model.
{http location} should be http://ws.apache.woden/location
@@ -68,7 +68,7 @@
{http output serialization} should be text/plain
{http fault serialization} should be text/html
{http query parameter separator} should be %
- {http transfer coding default} should be chunked
+ {http content encoding default} should be chunked
</documentation>
</operation>
@@ -82,7 +82,7 @@
{http output serialization} should default to application/xml
{http fault serialization} should default to application/xml
{http query parameter separator} should default to null
- {http transfer coding default} should default to null
+ {http content encoding default} should default to null
</documentation>
</operation>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
