You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ke...@apache.org on 2007/05/29 15:06:37 UTC
svn commit: r542503 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description:
AxisBindingMessage.java AxisOperation.java WSDL20ToAxisServiceBuilder.java
WSDL2Constants.java
Author: keithc
Date: Tue May 29 06:06:36 2007
New Revision: 542503
URL: http://svn.apache.org/viewvc?view=rev&rev=542503
Log:
Adding wsdl2.0 style addribute to axisOperation via a Parameter (WSDL2Constants.OPERATION_STYLE). Serializing it in ?wsdl2
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.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/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=542503&r1=542502&r2=542503
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Tue May 29 06:06:36 2007
@@ -152,8 +152,6 @@
// Fault specific properties
SOAPFaultCode faultCode = (SOAPFaultCode) this.options
.get(WSDL2Constants.ATTR_WSOAP_CODE);
- property = (String) this.options
- .get(WSDL2Constants.ATTR_WSOAP_SUBCODES);
if (faultCode != null && faultCode.getQName() != null) {
bindingMessageElement.addAttribute(omFactory.createOMAttribute(
WSDL2Constants.ATTRIBUTE_CODE, wsoap, faultCode.getQName().getLocalPart()));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=542503&r1=542502&r2=542503
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Tue May 29 06:06:36 2007
@@ -46,6 +46,7 @@
import java.util.Iterator;
import java.util.Set;
import java.util.Map;
+import java.net.URI;
public abstract class AxisOperation extends AxisDescription
implements WSDLConstants {
@@ -650,6 +651,16 @@
axisOperationElement.addAttribute(omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_NAME,
null,
this.getName().getLocalPart()));
+ URI [] opStyle = (URI[]) this.getParameterValue(WSDL2Constants.OPERATION_STYLE);
+ if (opStyle != null && opStyle.length > 0) {
+ String style = opStyle[0].toString();
+ for (int i = 1; i < opStyle.length; i++) {
+ URI uri = opStyle[i];
+ style = style + " " + uri;
+ }
+ axisOperationElement.addAttribute(
+ omFactory.createOMAttribute(WSDL2Constants.ATTRIBUTE_STYLE, null, style));
+ }
axisOperationElement.addAttribute(omFactory.createOMAttribute(
WSDL2Constants.ATTRIBUTE_NAME_PATTERN, null, this.getMessageExchangePattern()));
Parameter param = this.getParameter(WSDL2Constants.ATTR_WSDLX_SAFE);
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=542503&r1=542502&r2=542503
==============================================================================
--- 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 Tue May 29 06:06:36 2007
@@ -865,7 +865,13 @@
axisOperation.setName(opName);
}
-
+ URI[] operationStyle = operation.getStyle();
+ if (operationStyle != null && operationStyle.length > 0) {
+ Parameter opStyleParameter = new Parameter();
+ opStyleParameter.setName(WSDL2Constants.OPERATION_STYLE);
+ opStyleParameter.setValue(operationStyle);
+ axisOperation.addParameter(opStyleParameter);
+ }
addDocumentation(axisOperation, operation.toElement());
// assuming the style of the operations of WSDL 2.0 is always document, for the time being :)
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=542503&r1=542502&r2=542503
==============================================================================
--- 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 Tue May 29 06:06:36 2007
@@ -71,6 +71,8 @@
String ATTRIBUTE_ADDRESS = "address";
String ATTRIBUTE_AUTHENTICATION_TYPE = "authenticationType";
String ATTRIBUTE_AUTHENTICATION_REALM = "authenticationRealm";
+ String ATTRIBUTE_STYLE = "style";
+ String OPERATION_STYLE = "operationStyle";
String IN_PUT_LOCAL_NAME = "input";
String OUT_PUT_LOCAL_NAME = "output";
String OUT_FAULT_LOCAL_NAME = "outfault";
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org