You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ke...@apache.org on 2007/02/13 05:46:43 UTC
svn commit: r506854 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
kernel/src/org/apache/axis2/description/
Author: keithc
Date: Mon Feb 12 20:46:43 2007
New Revision: 506854
URL: http://svn.apache.org/viewvc?view=rev&rev=506854
Log:
Renaming WSDL20 property TRANSFER_CODING to CONTENT_ENCODING due to change in WSDL20 spec
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=506854&r1=506853&r2=506854
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Mon Feb 12 20:46:43 2007
@@ -1960,7 +1960,7 @@
methodElement.appendChild(generateOptionParamComponent(doc,
"org.apache.axis2.Constants.Configuration.CONTENT_TYPE",
"\"" +
- "org.apache.axis2.transport.http.HTTPConstants.MEDIA_TYPE_X_WWW_FORM" +
+ org.apache.axis2.transport.http.HTTPConstants.MEDIA_TYPE_X_WWW_FORM +
"\""));
} else if (bindingType != null && bindingType.equals(WSDL2Constants.URI_WSDL2_HTTP)) {
@@ -2041,7 +2041,7 @@
Document doc) {
// Add a optionParam element which holds the value of transferCoding
String transferCoding =
- (String) getBindingPropertyFromMessage(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ (String) getBindingPropertyFromMessage(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
axisOperation.getName(),
WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
if (!"".equals(transferCoding)) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=506854&r1=506853&r2=506854
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Mon Feb 12 20:46:43 2007
@@ -16,6 +16,7 @@
import org.apache.woden.internal.DOMWSDLFactory;
import org.apache.woden.internal.wsdl20.extensions.InterfaceOperationExtensionsImpl;
import org.apache.woden.internal.wsdl20.extensions.http.HTTPBindingExtensionsImpl;
+import org.apache.woden.internal.wsdl20.extensions.http.HTTPHeaderImpl;
import org.apache.woden.internal.wsdl20.extensions.soap.SOAPBindingExtensionsImpl;
import org.apache.woden.schema.Schema;
import org.apache.woden.wsdl20.Binding;
@@ -432,7 +433,7 @@
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_MEP,
soapMepDefault.toString());
}
- axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
soapBindingExtensions.getHttpContentEncodingDefault());
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
createSoapModules(soapBindingExtensions.getSoapModules()));
@@ -461,7 +462,7 @@
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
createHttpHeaders(soapBindingFaultExtensions.getHttpHeaders()));
- axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
soapBindingFaultExtensions.getHttpContentEncoding());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WSOAP_CODE,
soapBindingFaultExtensions.getSoapFaultCode());
@@ -524,7 +525,7 @@
}
httpLocationTable.put(httpLocationString, axisOperation);
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
soapBindingOperationExtensions.getHttpContentEncodingDefault());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
soapBindingOperationExtensions.getHttpQueryParameterSeparator());
@@ -558,7 +559,7 @@
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
createHttpHeaders(soapBindingMessageReferenceExtensions.getHttpHeaders()));
- axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
soapBindingMessageReferenceExtensions.getHttpContentEncoding());
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WSOAP_HEADER,
createSoapHeaders(soapBindingMessageReferenceExtensions.getSoapHeaders()));
@@ -617,9 +618,12 @@
throw new AxisFault("HTTP Binding Extention not found");
}
- axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_METHOD, httpBindingExtensions.getHttpMethodDefault());
- axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR, httpBindingExtensions.getHttpQueryParameterSeparatorDefault());
- axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING, httpBindingExtensions.getHttpContentEncodingDefault());
+ axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_METHOD,
+ httpBindingExtensions.getHttpMethodDefault());
+ axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
+ httpBindingExtensions.getHttpQueryParameterSeparatorDefault());
+ axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
+ httpBindingExtensions.getHttpContentEncodingDefault());
// Capture all the fault specific properties
@@ -645,9 +649,8 @@
httpBindingFaultExtensions.getHttpErrorStatusCode().getCode());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
createHttpHeaders(httpBindingFaultExtensions.getHttpHeaders()));
- axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
httpBindingFaultExtensions.getHttpContentEncoding());
-
axisBinding.addFault(axisBindingFault);
}
@@ -702,7 +705,7 @@
httpBindingOperationExtensions.getHttpOutputSerialization());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
httpBindingOperationExtensions.getHttpQueryParameterSeparator());
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
httpBindingOperationExtensions.getHttpContentEncodingDefault());
BindingMessageReference[] bindingMessageReferences =
@@ -733,9 +736,8 @@
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
createHttpHeaders(httpBindingMessageReferenceExtensions.getHttpHeaders()));
- axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_TRANSFER_CODING,
+ axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
httpBindingMessageReferenceExtensions.getHttpContentEncoding());
-
axisBindingOperation.addChild(axisMessage.getDirection(), axisBindingMessage);
}
@@ -957,16 +959,12 @@
ArrayList httpHeaderMessages = new ArrayList();
for (int i = 0; i < httpHeaders.length; i++) {
- HTTPHeader httpHeader = httpHeaders[i];
- TypeDefinition typeDefinition = httpHeader.getTypeDefinition();
-
- if (typeDefinition != null) {
- HTTPHeaderMessage httpHeaderMessage = new HTTPHeaderMessage();
- httpHeaderMessage.setqName(typeDefinition.getName());
+ HTTPHeaderImpl httpHeader = (HTTPHeaderImpl)httpHeaders[i];
+ HTTPHeaderMessage httpHeaderMessage = new HTTPHeaderMessage();
+ httpHeaderMessage.setqName(httpHeader.getTypeName());
httpHeaderMessage.setName(httpHeader.getName());
httpHeaderMessage.setRequired(httpHeader.isRequired().booleanValue());
httpHeaderMessages.add(httpHeaderMessage);
- }
}
return httpHeaderMessages;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java?view=diff&rev=506854&r1=506853&r2=506854
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java Mon Feb 12 20:46:43 2007
@@ -65,7 +65,7 @@
String ATTR_WSOAP_ACTION = "wsoap:action";
String ATTR_WSOAP_ADDRESS = "wsoap:address";
- String ATTR_WHTTP_TRANSFER_CODING = "whttp:transferCoding";
+ String ATTR_WHTTP_CONTENT_ENCODING = "whttp:contentEncoding";
String ATTR_WHTTP_LOCATION = "whttp:location";
String ATTR_WHTTP_HEADER = "whttp:header";
String ATTR_WHTTP_METHOD = "whttp:method";
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org