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 ch...@apache.org on 2005/06/29 10:22:04 UTC
svn commit: r202334 - in
/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl:
builder/wsdl4j/WSDLPump.java codegen/emitter/MultiLanguageClientEmitter.java
codegen/extension/AxisBindingBuilder.java
template/java/MessageReceiverTemplate.xsl
Author: chathura
Date: Wed Jun 29 01:22:03 2005
New Revision: 202334
URL: http://svn.apache.org/viewcvs?rev=202334&view=rev
Log:
SOAPAction added to the xml that is used to do the XSLT
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDLPump.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDLPump.java?rev=202334&r1=202333&r2=202334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDLPump.java Wed Jun 29 01:22:03 2005
@@ -295,7 +295,6 @@
/////////////////////////////////////////////////////////////////////////////
//////////////////////////// Internal Component Copying ///////////////////
- //TODO Faults
public void populateOperations(WSDLOperation wsdlOperation,
Operation wsdl4jOperation, String nameSpaceOfTheOperation) {
//Copy Name Attrebute
@@ -472,7 +471,6 @@
WSDLBindingMessageReference wsdlInputBinding =
this.wsdlComponenetFactory.createWSDLBindingMessageReference();
wsdlInputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
- //TODO Faults
this.copyExtensibleElements(wsdl4jInputBinding.getExtensibilityElements(),
wsdlInputBinding);
wsdlBindingOperation.setInput(wsdlInputBinding);
@@ -483,9 +481,8 @@
if(null != wsdl4jOutputBinding){
WSDLBindingMessageReference wsdlOutputBinding = this.wsdlComponenetFactory
.createWSDLBindingMessageReference();
-
wsdlOutputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
- //TODO Faults
+
this.copyExtensibleElements(wsdl4jOutputBinding.getExtensibilityElements(),
wsdlOutputBinding);
wsdlBindingOperation.setOutput(wsdlOutputBinding);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=202334&r1=202333&r2=202334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Wed Jun 29 01:22:03 2005
@@ -16,19 +16,20 @@
import org.apache.axis.wsdl.codegen.writer.BeanWriter;
import org.apache.axis.wsdl.codegen.writer.CallbackHandlerWriter;
import org.apache.axis.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis.wsdl.codegen.writer.DatabindingSupportClassWriter;
import org.apache.axis.wsdl.codegen.writer.InterfaceImplementationWriter;
import org.apache.axis.wsdl.codegen.writer.InterfaceWriter;
+import org.apache.axis.wsdl.codegen.writer.LocalTestClassWriter;
import org.apache.axis.wsdl.codegen.writer.MessageReceiverWriter;
import org.apache.axis.wsdl.codegen.writer.ServiceXMLWriter;
import org.apache.axis.wsdl.codegen.writer.SkeletonWriter;
import org.apache.axis.wsdl.codegen.writer.TestClassWriter;
import org.apache.axis.wsdl.codegen.writer.TestServiceXMLWriter;
import org.apache.axis.wsdl.codegen.writer.TestSkeletonImplWriter;
-import org.apache.axis.wsdl.codegen.writer.LocalTestClassWriter;
-import org.apache.axis.wsdl.codegen.writer.DatabindingSupportClassWriter;
import org.apache.axis.wsdl.databinding.TypeMapper;
import org.apache.crimson.tree.XmlDocument;
import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLDescription;
import org.apache.wsdl.WSDLEndpoint;
import org.apache.wsdl.WSDLExtensibilityElement;
@@ -36,15 +37,12 @@
import org.apache.wsdl.WSDLOperation;
import org.apache.wsdl.WSDLService;
import org.apache.wsdl.WSDLTypes;
-import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.SOAPOperation;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-import javax.wsdl.extensions.ExtensibilityElement;
-
/*
@@ -502,8 +500,15 @@
addAttribute(doc,"skeletonname",boundInterface.getName().getLocalPart() + SERVICE_CLASS_SUFFIX,rootElement);
addAttribute(doc, "basereceiver", "org.apache.axis.receivers.AbstractInOutSyncMessageReceiver", rootElement);
fillSyncAttributes(doc, rootElement);
- loadOperations(boundInterface, doc, rootElement);
+ loadOperations(boundInterface, doc, rootElement, binding);
doc.appendChild(rootElement);
+
+ try {
+ doc.write(System.out);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
return doc;
}
@@ -540,7 +545,7 @@
loadOperations(boundInterface, doc, rootElement, null);
}
- private void loadOperations(WSDLInterface boundInterface, XmlDocument doc, Element rootElement,WSDLBindingOperation binding) {
+ private void loadOperations(WSDLInterface boundInterface, XmlDocument doc, Element rootElement,WSDLBinding binding) {
Collection col = boundInterface.getOperations().values();
Element methodElement = null;
WSDLOperation operation = null;
@@ -553,7 +558,8 @@
addAttribute(doc,"namespace",operation.getName().getNamespaceURI(),methodElement);
addAttribute(doc,"style",operation.getStyle(),methodElement);
addAttribute(doc,"dbsupportname",localPart+DATABINDING_SUPPORTER_NAME_SUFFIX,methodElement);
- addSOAPAction(doc,methodElement,binding);
+ if(null != binding)
+ addSOAPAction(doc,methodElement,binding.getBindingOperation(operation.getName()));
addAttribute(doc, "mep",operation.getMessageExchangePattern(), methodElement);
methodElement.appendChild(getInputElement(doc,operation));
methodElement.appendChild(getOutputElement(doc,operation));
@@ -565,8 +571,8 @@
Iterator extIterator = binding.getExtensibilityElements().iterator();
boolean actionAdded = false;
while(extIterator.hasNext()){
- ExtensibilityElement element = (ExtensibilityElement)extIterator.next();
- if(element.getElementType().equals(ExtensionConstants.SOAP_OPERATION)){
+ WSDLExtensibilityElement element = (WSDLExtensibilityElement)extIterator.next();
+ if(element.getType().equals(ExtensionConstants.SOAP_OPERATION)){
addAttribute(doc,"soapaction", ((SOAPOperation)element).getSoapAction(),rootElement);
actionAdded = true ;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java?rev=202334&r1=202333&r2=202334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java Wed Jun 29 01:22:03 2005
@@ -16,11 +16,15 @@
package org.apache.axis.wsdl.codegen.extension;
+import java.util.Iterator;
+
import javax.xml.namespace.QName;
import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
import org.apache.wsdl.WSDLBinding;
import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLExtensibilityElement;
import org.apache.wsdl.WSDLInterface;
/**
@@ -54,6 +58,16 @@
newBinding.setBindingFaults(binding.getBindingFaults());
newBinding.setBindingOperations(binding.getBindingOperations());
+ Iterator elementIterator = binding.getExtensibilityElements().iterator();
+ while(elementIterator.hasNext()){
+ newBinding.addExtensibilityElement((WSDLExtensibilityElement)elementIterator.next());
+ }
+
+ Iterator attributeIterator = binding.getExtensibilityAttributes().iterator();
+ while(attributeIterator.hasNext()){
+ newBinding.addExtensibleAttributes((WSDLExtensibilityAttribute)attributeIterator.next());
+ }
+
wom.addBinding(newBinding);
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl?rev=202334&r1=202333&r2=202334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/template/java/MessageReceiverTemplate.xsl Wed Jun 29 01:22:03 2005
@@ -53,6 +53,7 @@
</xsl:if>
</xsl:for-each>);
</xsl:if>
+
}
</xsl:for-each>
}