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 na...@apache.org on 2006/11/09 21:05:18 UTC
svn commit: r473055 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
Author: nagy
Date: Thu Nov 9 12:05:17 2006
New Revision: 473055
URL: http://svn.apache.org/viewvc?view=rev&rev=473055
Log:
Fixed build problems associated with new Woden snapshot
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
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=473055&r1=473054&r2=473055
==============================================================================
--- 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 Thu Nov 9 12:05:17 2006
@@ -7,6 +7,7 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
import org.apache.woden.WSDLSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.DOMWSDLFactory;
import org.apache.woden.schema.Schema;
import org.apache.woden.wsdl20.Binding;
@@ -18,6 +19,7 @@
import org.apache.woden.wsdl20.InterfaceOperation;
import org.apache.woden.wsdl20.Service;
import org.apache.woden.wsdl20.enumeration.Direction;
+import org.apache.woden.wsdl20.enumeration.MessageLabel;
import org.apache.woden.wsdl20.extensions.ExtensionElement;
import org.apache.woden.wsdl20.extensions.UnknownExtensionElement;
import org.apache.woden.wsdl20.xml.BindingElement;
@@ -34,7 +36,6 @@
import org.apache.ws.policy.util.DOMPolicyReader;
import org.apache.ws.policy.util.PolicyFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -326,7 +327,7 @@
for (int i = 0; i < interfaceMessageReferences.length; i++) {
InterfaceMessageReferenceElement messageReference = interfaceMessageReferences[i].toElement();
if (messageReference.getMessageLabel().equals(
- messageReference.getMessageLabel().IN)) {
+ MessageLabel.IN)) {
// Its an input message
if (isServerSide) {
@@ -345,7 +346,7 @@
// TODO copy policy elements
}
} else if (messageReference.getMessageLabel().equals(
- messageReference.getMessageLabel().OUT)) {
+ MessageLabel.OUT)) {
if (isServerSide) {
AxisMessage outMessage = axisOperation
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -397,35 +398,35 @@
// TODO this is wrong. Compare this with WSDL 2.0 QName
if (WSDLConstants.WSDL11Constants.SOAP_12_OPERATION.equals(unknown
.getExtensionType())) {
- Element unknownElement = unknown.getElement();
+ XMLElement unknownElement = unknown.getElement();
if (description instanceof AxisOperation) {
AxisOperation axisOperation = (AxisOperation) description;
- String style = unknownElement.getAttribute("style");
+ String style = unknownElement.getAttributeValue("style");
if (style != null) {
axisOperation.setStyle(style);
}
axisOperation.setSoapAction(unknownElement
- .getAttribute("soapAction"));
+ .getAttributeValue("soapAction"));
}
} else if (WSDLConstants.WSDL11Constants.SOAP_12_HEADER.equals(unknown
.getExtensionType())) {
// TODO : implement thid
} else if (WSDLConstants.WSDL11Constants.SOAP_12_BINDING.equals(unknown
.getExtensionType())) {
- style = unknown.getElement().getAttribute("style");
+ style = unknown.getElement().getAttributeValue("style");
axisService.setSoapNsUri(element.getExtensionType()
.getNamespaceURI());
} else if (WSDLConstants.WSDL11Constants.SOAP_12_ADDRESS.equals(unknown
.getExtensionType())) {
- axisService.setEndpoint(unknown.getElement().getAttribute(
+ axisService.setEndpoint(unknown.getElement().getAttributeValue(
"location"));
} else if (WSDLConstants.WSDL11Constants.POLICY.equals(unknown
.getExtensionType())) {
DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
- Policy policy = policyReader.readPolicy(unknown
- .getElement());
+ //REVIEW: getSource(...) is probably not correct here, but without modifying the policyReader it's all that we can do
+ Policy policy = policyReader.readPolicy((org.w3c.dom.Element)unknown.getElement().getSource());
// addPolicy(description, originOfExtensibilityElements,
// policy);
@@ -435,8 +436,8 @@
DOMPolicyReader policyReader = (DOMPolicyReader) PolicyFactory
.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
- PolicyReference policyRef = policyReader
- .readPolicyReference(unknown.getElement());
+ //REVIEW: getSource(...) is probably not correct here, but without modifying the policyReader it's all that we can do
+ PolicyReference policyRef = policyReader.readPolicyReference((org.w3c.dom.Element)unknown.getElement().getSource());
// addPolicyRef(description, originOfExtensibilityElements,
// policyRef);
@@ -563,7 +564,7 @@
return binding;
}
- private Element[] generateWrapperSchema(
+ private XMLElement[] generateWrapperSchema(
DescriptionElement wodenDescription, BindingElement binding) {
List schemaElementList = new ArrayList();
@@ -583,11 +584,11 @@
schemaElementList.add(createSchemaForInterface(binding
.getInterfaceElement(), targetNamespaceUri,
findWrapForceable(binding)));
- return (Element[]) schemaElementList
- .toArray(new Element[schemaElementList.size()]);
+ return (XMLElement[]) schemaElementList
+ .toArray(new XMLElement[schemaElementList.size()]);
}
- private Element createSchemaForInterface(InterfaceElement interfaceElement,
+ private XMLElement createSchemaForInterface(InterfaceElement interfaceElement,
String targetNamespaceUri, boolean forceWrapping) {
// loop through the messages. We'll populate things map with the
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org