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/02/07 07:41:51 UTC
svn commit: r504449 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
kernel/src/org/apache/axis2/description/
Author: keithc
Date: Tue Feb 6 22:41:50 2007
New Revision: 504449
URL: http://svn.apache.org/viewvc?view=rev&rev=504449
Log:
Moving style property from axisOperation to axisBindingOperation, because it is a binding specefic property
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/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.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=504449&r1=504448&r2=504449
==============================================================================
--- 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 Tue Feb 6 22:41:50 2007
@@ -1875,7 +1875,8 @@
addAttribute(doc, "name", JavaUtils.xmlNameToJava(localPart), methodElement);
addAttribute(doc, "namespace", axisOperation.getName().getNamespaceURI(), methodElement);
- addAttribute(doc, "style", axisOperation.getStyle(), methodElement);
+ addAttribute(doc, "style", (String) getBindingPropertyFromOperation(
+ WSDLConstants.WSDL_1_1_STYLE, axisOperation.getName()), methodElement);
addAttribute(doc, "http_location", (String) getBindingPropertyFromOperation(
WSDL2Constants.ATTR_WHTTP_LOCATION, axisOperation.getName()), methodElement);
addAttribute(doc, "dbsupportname",
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=504449&r1=504448&r2=504449
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Tue Feb 6 22:41:50 2007
@@ -85,7 +85,7 @@
}
public Object getKey() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=504449&r1=504448&r2=504449
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Tue Feb 6 22:41:50 2007
@@ -150,8 +150,6 @@
private static final String JAVAX_WSDL_VERBOSE_MODE_KEY = "javax.wsdl.verbose";
- private static final String JAVAX_WSDL_IMPORT_DOCUMENTS_MODE_KEY = "javax.wsdl.importDocuments";
-
/**
* constructor taking in the service name and the port name
*
@@ -407,10 +405,6 @@
AxisMessage axisMessage;
AxisMessage axisFaultMessage;
- // FIXME
- axisOperation.setStyle(null);
-
-
Input wsdl4jInput = wsdl4jOperation.getInput();
if (wsdl4jInput != null) {
@@ -525,12 +519,6 @@
copyExtensibleElements(wsdl4jBindingOperation.getExtensibilityElements(),
wsdl4jDefinition, axisBindingOperation, BINDING_OPERATION);
- // set the style
- if (axisOperation.getStyle() == null) {
- axisOperation
- .setStyle((String) axisBinding.getProperty(WSDLConstants.WSDL_1_1_STYLE));
- }
-
BindingInput wsdl4jBindingInput = wsdl4jBindingOperation.getBindingInput();
if (wsdl4jBindingInput != null &&
@@ -539,7 +527,6 @@
AxisMessage axisInMessage =
axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- // FIXME refactor this
AddQNameReference(axisInMessage, wsdl4jBindingOperation.getOperation(),
wsdl4jBindingInput, wrappableOperations.contains(
wsdl4jBindingOperation.getOperation()));
@@ -560,7 +547,6 @@
AxisMessage axisOutMessage =
axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- // FIXME
AddQNameReference(axisOutMessage, wsdl4jBindingOperation.getOperation(),
wsdl4jBindingOutput, wrappableOperations.contains(
wsdl4jBindingOperation.getOperation()));
@@ -592,7 +578,6 @@
axisBindingOperation.addFault(axisBindingFaultMessage);
axisBinding.addChild(axisBindingOperation.getName(), axisBindingOperation);
- // FIXME
AddQNameReference(faultMessage, wsdl4jFault.getMessage());
}
}
@@ -815,12 +800,6 @@
// this style is either rpc or doc
String style = getSOAPStyle(wsdl4jBindingOperation);
- if (style != null) {
- operation.setStyle(style);
- } else if (this.style != null) {
- operation.setStyle(this.style);
- }
-
copyExtensibleElements(wsdl4jBindingOperation
.getExtensibilityElements(), dif, operation,
BINDING_OPERATION);
@@ -2120,8 +2099,7 @@
String style = soapOperation.getStyle();
if (style != null) {
- // FIXME
- axisBindingOperation.getAxisOperation().setStyle(soapOperation.getStyle());
+ axisBindingOperation.setProperty(WSDLConstants.WSDL_1_1_STYLE, style);
}
String soapActionURI = soapOperation.getSoapActionURI();
@@ -2138,8 +2116,7 @@
String style = soapOperation.getStyle();
if (style != null) {
- // FIXME
- axisBindingOperation.getAxisOperation().setStyle(style);
+ axisBindingOperation.setProperty(WSDLConstants.WSDL_1_1_STYLE, style);
}
String soapAction = soapOperation.getSoapActionURI();
@@ -2245,7 +2222,6 @@
String style = soapBinding.getStyle();
if (style != null) {
- // FIXME do something meaningful ..
axisBinding.setProperty(WSDLConstants.WSDL_1_1_STYLE, style);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java?view=diff&rev=504449&r1=504448&r2=504449
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java Tue Feb 6 22:41:50 2007
@@ -1,5 +1,7 @@
package org.apache.axis2.description;
+import org.apache.axis2.wsdl.WSDLConstants;
+
import java.util.HashMap;
import java.util.Map;
/*
@@ -33,6 +35,7 @@
defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE, org.apache.axis2.Constants.Configuration.HTTP_METHOD_GET);
defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE, org.apache.axis2.Constants.Configuration.HTTP_METHOD_POST);
defaultValuesMap.put(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR, ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR_DEFAULT);
+ defaultValuesMap.put(WSDLConstants.WSDL_1_1_STYLE,WSDLConstants.STYLE_DOC);
}
public static String getDefaultValue(String name) {
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=504449&r1=504448&r2=504449
==============================================================================
--- 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 Feb 6 22:41:50 2007
@@ -794,7 +794,6 @@
// assuming the style of the operations of WSDL 2.0 is always document, for the time being :)
axisOperation.setMessageExchangePattern(operation.getMessageExchangePattern().toString());
- axisOperation.setStyle("document");
// The following can be used to capture the wsdlx:safe attribute
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org