Author: chinthaka
Date: Thu Nov 3 22:26:09 2005
New Revision: 330725
URL: http://svn.apache.org/viewcvs?rev=330725&view=rev
Log:
Renaming getElement in MessageReference to getElementQName and adding the
method getElementSchema to that.
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/MessageReference.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
Thu Nov 3 22:26:09 2005
@@ -598,12 +598,12 @@
if (inputMessage!=null){
addAttribute(doc,
"name",
- this.mapper.getParameterName(inputMessage.getElement()),
+
this.mapper.getParameterName(inputMessage.getElementQName()),
param);
//todo modify the code here to unwrap if requested
String typeMapping = this.mapper.getTypeMapping(
- inputMessage.getElement());
+ inputMessage.getElementQName());
addAttribute(doc, "type", typeMapping == null ? "" : typeMapping,
param);
//add an extra attribute to say whether the type mapping is the
default
@@ -658,9 +658,9 @@
if (outputMessage!=null){
parameterName = this.mapper.getParameterName(
- outputMessage.getElement()) ;
+ outputMessage.getElementQName()) ;
String typeMapping = this.mapper.getTypeMapping(
- operation.getOutputMessage().getElement());
+ operation.getOutputMessage().getElementQName());
typeMappingStr = typeMapping == null ? "" : typeMapping;
}else{
Modified:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
Thu Nov 3 22:26:09 2005
@@ -436,7 +436,7 @@
if (null != message) {
//wrapping has to be done on per message basis
- wsdlInputMessage.setElement(
+ wsdlInputMessage.setElementQName(
this.generateReferenceQname(wrappedInputName
,message,findWrapppable(message)));
this.copyExtensibleElements(
@@ -461,7 +461,7 @@
Message outputMessage = wsdl4jOutputMessage.getMessage();
if (null != outputMessage) {
- wsdlOutputMessage.setElement(
+ wsdlOutputMessage.setElementQName(
this.generateReferenceQname(wrappedOutputName,outputMessage,findWrapppable(outputMessage)));
this.copyExtensibleElements(
(outputMessage).getExtensibilityElements(),
Modified:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/writer/WOMtoWSDL11Writer.java
Thu Nov 3 22:26:09 2005
@@ -278,12 +278,12 @@
while (opIterator.hasNext()) {
operation = (WSDLOperation) opIterator.next();
//populate the symbol table of Messages
- QName inputReference = operation.getInputMessage()
== null ? null : operation.getInputMessage().getElement();
+ QName inputReference = operation.getInputMessage()
== null ? null : operation.getInputMessage().getElementQName();
if (inputReference != null) {
populateMessageSymbol(inputReference);
}
- QName outputReference =
operation.getOutputMessage() == null ? null :
operation.getOutputMessage().getElement();
+ QName outputReference =
operation.getOutputMessage() == null ? null :
operation.getOutputMessage().getElementQName();
if (outputReference != null) {
populateMessageSymbol(outputReference);
}
@@ -450,7 +450,7 @@
WSDL11Message message;
MessageReference inputMessage = operation.getInputMessage();
if (inputMessage != null) {
- message = (WSDL11Message)
messageMap.get(inputMessage.getElement());
+ message = (WSDL11Message)
messageMap.get(inputMessage.getElementQName());
writer.writeStartElement(defaultWSDLPrefix,INPUT_NAME,
WSDL1_1_NAMESPACE_URI);
writer.writeAttribute("message", targetNamespacePrefix +
":" + message.getMessageName());
writer.writeEndElement();
@@ -459,7 +459,7 @@
//write the outputs
MessageReference outputMessage = operation.getOutputMessage();
if (outputMessage != null) {
- message = (WSDL11Message)
messageMap.get(outputMessage.getElement());
+ message = (WSDL11Message)
messageMap.get(outputMessage.getElementQName());
writer.writeStartElement(defaultWSDLPrefix, OUTPUT_NAME,
WSDL1_1_NAMESPACE_URI);
writer.writeAttribute("message", targetNamespacePrefix +
":" + message.getMessageName());
writer.writeEndElement();
Modified:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/MessageReference.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/MessageReference.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/MessageReference.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/MessageReference.java
Thu Nov 3 22:26:09 2005
@@ -16,6 +16,8 @@
package org.apache.wsdl;
+import org.w3c.dom.Element;
+
import javax.xml.namespace.QName;
public interface MessageReference extends ExtensibleComponent {
@@ -37,16 +39,15 @@
* This Element refers to the actual message that will get transported.
This Element
* Abstracts all the Message Parts that was defined in the WSDL 1.1.
*
- * @return
*/
- public QName getElement();
+ public QName getElementQName();
/**
- * Method setElement
+ * Method setElementQName
*
* @param element
*/
- public void setElement(QName element);
+ public void setElementQName(QName element);
/**
* Method getMessageLabel
@@ -61,4 +62,7 @@
* @param messageLabel
*/
public void setMessageLabel(String messageLabel);
+
+ public Element getElementSchema();
+ public void setElementSchema(Element element);
}
Modified:
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
Thu Nov 3 22:26:09 2005
@@ -17,6 +17,7 @@
package org.apache.wsdl.impl;
import org.apache.wsdl.MessageReference;
+import org.w3c.dom.Element;
import javax.xml.namespace.QName;
@@ -30,7 +31,7 @@
*/
private String messageLabel;
- // Can be "in" or "out" depending on the element name being "input" or
"output" respectively;
+ // Can be "in" or "out" depending on the elementQName name being "input"
or "output" respectively;
/**
* Field Direction
@@ -40,9 +41,10 @@
// TODO Do we need it "Message content model"
/**
- * Field element
+ * Field elementQName
*/
- private QName element;
+ private QName elementQName;
+ private Element elementSchema;
/**
* Method getDirection
@@ -68,8 +70,8 @@
*
* @return
*/
- public QName getElement() {
- return element;
+ public QName getElementQName() {
+ return elementQName;
}
/**
@@ -78,8 +80,8 @@
*
* @param element
*/
- public void setElement(QName element) {
- this.element = element;
+ public void setElementQName(QName element) {
+ this.elementQName = element;
}
/**
@@ -98,5 +100,13 @@
*/
public void setMessageLabel(String messageLabel) {
this.messageLabel = messageLabel;
+ }
+
+ public Element getElementSchema() {
+ return elementSchema;
+ }
+
+ public void setElementSchema(Element element) {
+ this.elementSchema = element;
}
}
Modified:
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java?rev=330725&r1=330724&r2=330725&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
(original)
+++
webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/MessageReuseTest.java
Thu Nov 3 22:26:09 2005
@@ -16,17 +16,10 @@
package org.apache.wsdl;
-import org.apache.axis2.wsdl.*;
+import org.apache.axis2.wsdl.WSDLVersionWrapper;
import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
-import org.apache.wsdl.extensions.ExtensionConstants;
-import org.apache.wsdl.extensions.Schema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import javax.wsdl.Definition;
-import javax.xml.namespace.QName;
-import java.util.Iterator;
public class MessageReuseTest extends AbstractTestCase {
@@ -68,10 +61,10 @@
// "BookQuote"));
// WSDLOperation operation1 = (WSDLOperation)
interface1.getAllOperations()
// .get("getBookPrice");
-// QName element1 = operation1.getInputMessage().getElement();
+// QName element1 = operation1.getInputMessage().getElementQName();
// WSDLOperation operation2 = (WSDLOperation)
interface1.getAllOperations()
// .get("getBookPriceNonRobust");
-// QName element2 = operation2.getInputMessage().getElement();
+// QName element2 = operation2.getInputMessage().getElementQName();
// assertEquals(element1, element2);
//
// Iterator iterator =
womDescription.getTypes().getExtensibilityElements()
@@ -84,7 +77,7 @@
// WSDLExtensibilityElement temp = (WSDLExtensibilityElement)
iterator.next();
// if (ExtensionConstants.SCHEMA.equals(temp.getType())) {
// types = (Schema) temp;
-// NodeList childNodes = types.getElement().getChildNodes();
+// NodeList childNodes =
types.getElementQName().getChildNodes();
// for (int i = 0; i < childNodes.getLength(); i++) {
// Node item = childNodes.item(i);
// if (item instanceof Element) {
