Author: jkaputin
Date: Fri Oct 6 17:59:45 2006
New Revision: 453823
URL: http://svn.apache.org/viewvc?view=rev&rev=453823
Log:
Due to conflicts, manually merged in changes to
OMWSDLReader from trunk/java to WODEN-44 for
rev 429642 to 453800.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=453823&r1=453822&r2=453823
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Fri Oct 6 17:59:45 2006
@@ -31,7 +31,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.woden.*;
+import org.apache.woden.ErrorHandler;
+import org.apache.woden.ErrorReporter;
+import org.apache.woden.WSDLException;
+import org.apache.woden.WSDLSource;
import org.apache.woden.internal.schema.ImportedSchemaImpl;
import org.apache.woden.internal.schema.InlinedSchemaImpl;
import org.apache.woden.internal.schema.SchemaConstants;
@@ -51,7 +54,9 @@
import org.apache.woden.wsdl20.xml.BindingFaultReferenceElement;
import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement;
import org.apache.woden.wsdl20.xml.BindingOperationElement;
+import org.apache.woden.wsdl20.xml.ConfigurableElement;
import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.xml.DocumentableElement;
import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.EndpointElement;
import org.apache.woden.wsdl20.xml.FeatureElement;
@@ -69,6 +74,7 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaException;
+import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.xml.sax.InputSource;
/**
@@ -154,31 +160,31 @@
while (wsdlComponents.hasNext()){
OMElement wsdlComponent = ((OMElement)wsdlComponents.next());
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
wsdlComponent)){
- desc.addDocumentationElement(parseDocumentation(wsdlComponent,
desc));
+ parseDocumentation(wsdlComponent, desc, desc);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_TYPES,
wsdlComponent)){
- desc.setTypesElement(parseTypes(wsdlComponent, desc));
+ parseTypes(wsdlComponent, desc);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_INTERFACE,
wsdlComponent)){
- desc.addInterfaceElement(parseInterface(wsdlComponent, desc));
+ parseInterface(wsdlComponent, desc);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_BINDING,
wsdlComponent)){
- desc.addBindingElement(parseBinding(wsdlComponent, desc));
+ parseBinding(wsdlComponent, desc);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_SERVICE,
wsdlComponent)){
- desc.addServiceElement(parseService(wsdlComponent, desc));
+ parseService(wsdlComponent, desc);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_IMPORT,
wsdlComponent)){
if(documentBaseURI != null &&
!wsdlModules.containsKey(documentBaseURI)){
wsdlModules.put(documentBaseURI, desc);
}
- desc.addImportElement(parseImport(wsdlComponent, desc,
wsdlModules));
+ parseImport(wsdlComponent, desc, wsdlModules);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_INCLUDE,
wsdlComponent)){
if(documentBaseURI != null &&
!wsdlModules.containsKey(documentBaseURI)){
wsdlModules.put(documentBaseURI, desc);
}
- desc.addIncludeElement(parseInclude(wsdlComponent, desc,
wsdlModules));
+ parseInclude(wsdlComponent, desc, wsdlModules);
}
else{
desc.addExtensionElement(parseExtensionElement(DescriptionElement.class, desc,
wsdlComponent, desc) );
@@ -192,10 +198,11 @@
private DocumentationElement parseDocumentation(OMElement docEl,
- DescriptionElement desc)
+ DescriptionElement desc,
+ DocumentableElement parent)
throws WSDLException {
- DocumentationElement documentation = desc.createDocumentationElement();
+ DocumentationElement documentation = parent.addDocumentationElement();
//Stores the documentation values as a string
documentation.setContent(docEl.getText());
@@ -218,7 +225,7 @@
DescriptionElement desc)
throws WSDLException {
- TypesElement types = desc.createTypesElement();
+ TypesElement types = desc.getTypesElement();
//TODO for now set to W3 XML Schema. Later, add support for non-XML
Schema type systems
types.setTypeSystem(Constants.TYPE_XSD_2001);
@@ -233,7 +240,7 @@
QName elementType = OMQNameUtils.newQName(typesChildElement);
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
typesChildElement)){
-
types.addDocumentationElement(parseDocumentation(typesChildElement, desc));
+ parseDocumentation(typesChildElement, desc, types);
}
else if
(SchemaConstants.XSD_IMPORT_QNAME_LIST.contains(typesChildElement)){
types.addSchema(parseSchemaImport(typesChildElement, desc));
@@ -254,7 +261,7 @@
DescriptionElement desc)
throws WSDLException{
- ServiceElement service = desc.createServiceElement();
+ ServiceElement service = desc.addServiceElement();
String name = OMUtils.getAttribute(serviceEl, Constants.ATTR_NAME);
if(name != null){
@@ -284,16 +291,16 @@
while (serviceElChildren.hasNext()){
OMElement serviceElChild = (OMElement)serviceElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
serviceElChild)){
-
service.addDocumentationElement(parseDocumentation(serviceElChild, desc));
+ parseDocumentation(serviceElChild, desc, service);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_ENDPOINT,
serviceElChild)){
- service.addEndpointElement(parseEndpoint(serviceElChild, desc,
service));
+ parseEndpoint(serviceElChild, desc, service);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
serviceElChild)){
- service.addFeatureElement(parseFeature(serviceElChild, desc,
service));
+ parseFeature(serviceElChild, desc, service);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
serviceElChild)){
- service.addPropertyElement(parseProperty(serviceElChild, desc,
service));
+ parseProperty(serviceElChild, desc, service);
}
else{
service.addExtensionElement(parseExtensionElement(ServiceElement.class,
service, serviceElChild, desc) );
@@ -305,10 +312,10 @@
private EndpointElement parseEndpoint(OMElement endpointEl,
DescriptionElement desc,
- WSDLElement parent)
+ ServiceElement parent)
throws WSDLException{
- EndpointElement endpoint = desc.createEndpointElement();
+ EndpointElement endpoint = parent.addEndpointElement();
endpoint.setParentElement(parent);
String name = OMUtils.getAttribute(endpointEl, Constants.ATTR_NAME);
@@ -345,13 +352,13 @@
while (endpointElChildren.hasNext()){
OMElement endpointElChild = (OMElement)endpointElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
endpointElChild)){
-
endpoint.addDocumentationElement(parseDocumentation(endpointElChild, desc));
+ parseDocumentation(endpointElChild, desc, endpoint);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
endpointElChild)){
- endpoint.addFeatureElement(parseFeature(endpointElChild, desc,
endpoint));
+ parseFeature(endpointElChild, desc, endpoint);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
endpointElChild)){
- endpoint.addPropertyElement(parseProperty(endpointElChild,
desc, endpoint));
+ parseProperty(endpointElChild, desc, endpoint);
}
else{
endpoint.addExtensionElement(
@@ -366,14 +373,14 @@
DescriptionElement desc)
throws WSDLException{
- BindingElement binding = desc.createBindingElement();
+ BindingElement binding = desc.addBindingElement();
String name = OMUtils.getAttribute(bindEl, Constants.ATTR_NAME);
if(name != null){
binding.setName(new NCName(name));
}
- QName intfaceQN;
+ QName intfaceQN = null;
String intface = OMUtils.getAttribute(bindEl,
Constants.ATTR_INTERFACE);
if(intface != null){
try{
@@ -401,19 +408,19 @@
while (bindElChildren.hasNext()){
OMElement bindElChild = (OMElement)bindElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
bindElChild)){
-
binding.addDocumentationElement(parseDocumentation(bindElChild, desc));
+ parseDocumentation(bindElChild, desc, binding);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FAULT,
bindElChild)){
- binding.addBindingFaultElement(parseBindingFault(bindElChild,
desc, binding));
+ parseBindingFault(bindElChild, desc, binding);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_OPERATION,
bindElChild)){
-
binding.addBindingOperationElement(parseBindingOperation(bindElChild, desc,
binding));
+ parseBindingOperation(bindElChild, desc, binding);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
bindElChild)){
- binding.addFeatureElement(parseFeature(bindElChild, desc,
binding));
+ parseFeature(bindElChild, desc, binding);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
bindElChild)){
- binding.addPropertyElement(parseProperty(bindElChild, desc,
binding));
+ parseProperty(bindElChild, desc, binding);
}
else{
binding.addExtensionElement(parseExtensionElement(BindingElement.class,
binding, bindElChild, desc) );
@@ -425,13 +432,13 @@
private BindingOperationElement parseBindingOperation(OMElement bindOpEl,
DescriptionElement
desc,
- WSDLElement parent)
+ BindingElement
parent)
throws WSDLException{
- BindingOperationElement oper = desc.createBindingOperationElement();
+ BindingOperationElement oper = parent.addBindingOperationElement();
oper.setParentElement(parent);
- QName refQN;
+ QName refQN = null;
String ref = OMUtils.getAttribute(bindOpEl, Constants.ATTR_REF);
if(ref != null){
try{
@@ -454,25 +461,25 @@
while (bindOpElChildren.hasNext()){
OMElement bindOpElChild = (OMElement)bindOpElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
bindOpElChild)){
- oper.addDocumentationElement(parseDocumentation(bindOpElChild,
desc));
+ parseDocumentation(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
bindOpElChild)){
- oper.addFeatureElement(parseFeature(bindOpElChild, desc,
oper));
+ parseFeature(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
bindOpElChild)){
- oper.addPropertyElement(parseProperty(bindOpElChild, desc,
oper));
+ parseProperty(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_INPUT,
bindOpElChild)){
-
oper.addBindingMessageReferenceElement(parseBindingMessageReference(bindOpElChild,
desc, oper));
+ parseBindingMessageReference(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_OUTPUT,
bindOpElChild)){
-
oper.addBindingMessageReferenceElement(parseBindingMessageReference(bindOpElChild,
desc, oper));
+ parseBindingMessageReference(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_INFAULT,
bindOpElChild)){
-
oper.addBindingFaultReferenceElement(parseBindingFaultReference(bindOpElChild,
desc, oper));
+ parseBindingFaultReference(bindOpElChild, desc, oper);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_OUTFAULT,
bindOpElChild)){
-
oper.addBindingFaultReferenceElement(parseBindingFaultReference(bindOpElChild,
desc, oper));
+ parseBindingFaultReference(bindOpElChild, desc, oper);
}
else{
oper.addExtensionElement(
@@ -486,13 +493,13 @@
private BindingFaultReferenceElement parseBindingFaultReference(
OMElement faultRefEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingOperationElement
parent)
throws WSDLException{
- BindingFaultReferenceElement faultRef =
desc.createBindingFaultReferenceElement();
+ BindingFaultReferenceElement faultRef =
parent.addBindingFaultReferenceElement();
faultRef.setParentElement(parent);
- QName refQN;
+ QName refQN = null;
String ref = OMUtils.getAttribute(faultRefEl, Constants.ATTR_REF);
if(ref != null){
try{
@@ -510,16 +517,7 @@
String msgLabel = OMUtils.getAttribute(faultRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())){
- faultRef.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())){
- faultRef.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- faultRef.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ faultRef.setMessageLabel(new NCName(msgLabel));
}
parseExtensionAttributes(faultRefEl,
BindingFaultReferenceElement.class, faultRef, desc);
@@ -529,13 +527,13 @@
while (faultRefElChildren.hasNext()){
OMElement faultRefChild = (OMElement)faultRefElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
faultRefChild)){
-
faultRef.addDocumentationElement(parseDocumentation(faultRefChild, desc));
+ parseDocumentation(faultRefChild, desc, faultRef);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
faultRefChild)){
- faultRef.addFeatureElement(parseFeature(faultRefChild, desc,
faultRef));
+ parseFeature(faultRefChild, desc, faultRef);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
faultRefChild)){
- faultRef.addPropertyElement(parseProperty(faultRefChild, desc,
faultRef));
+ parseProperty(faultRefChild, desc, faultRef);
}
else{
faultRef.addExtensionElement(parseExtensionElement(BindingFaultReferenceElement.class,
faultRef, faultRefChild, desc) );
@@ -548,10 +546,10 @@
private BindingMessageReferenceElement parseBindingMessageReference(
OMElement msgRefEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingOperationElement
parent)
throws WSDLException {
- BindingMessageReferenceElement message =
desc.createBindingMessageReferenceElement();
+ BindingMessageReferenceElement message =
parent.addBindingMessageReferenceElement();
message.setParentElement(parent);
if(Constants.ELEM_INPUT.equals(msgRefEl.getLocalName())) {
@@ -563,16 +561,7 @@
String msgLabel = OMUtils.getAttribute(msgRefEl,
Constants.ATTR_MESSAGE_LABEL);
if(msgLabel != null){
- if(msgLabel.equals(MessageLabel.IN.toString())) {
- message.setMessageLabel(MessageLabel.IN);
- }
- else if(msgLabel.equals(MessageLabel.OUT.toString())) {
- message.setMessageLabel(MessageLabel.OUT);
- }
- else {
- //invalid value, but capture it anyway.
- message.setMessageLabel(MessageLabel.invalidValue(msgLabel));
- }
+ message.setMessageLabel(new NCName(msgLabel));
}
else{
//TODO this is a temp fix, correct action to use MEP to determine
default
@@ -591,13 +580,13 @@
while (msgRefElChildren.hasNext()){
OMElement msgRefChild = (OMElement)msgRefElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
msgRefChild)){
-
message.addDocumentationElement(parseDocumentation(msgRefChild, desc));
+ parseDocumentation(msgRefChild, desc, message);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
msgRefChild)){
- message.addFeatureElement(parseFeature(msgRefChild, desc,
message));
+ parseFeature(msgRefChild, desc, message);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
msgRefChild)){
- message.addPropertyElement(parseProperty(msgRefChild, desc,
message));
+ parseProperty(msgRefChild, desc, message);
}
else{
message.addExtensionElement(parseExtensionElement(BindingMessageReferenceElement.class,
message, msgRefChild, desc) );
@@ -609,13 +598,13 @@
private BindingFaultElement parseBindingFault(OMElement bindFaultEl,
DescriptionElement desc,
- WSDLElement parent)
+ BindingElement parent)
throws WSDLException{
- BindingFaultElement fault = desc.createBindingFaultElement();
+ BindingFaultElement fault = parent.addBindingFaultElement();
fault.setParentElement(parent);
- QName intFltQN;
+ QName intFltQN = null;
String ref = OMUtils.getAttribute(bindFaultEl, Constants.ATTR_REF);
if(ref != null){
try{
@@ -638,13 +627,13 @@
while (bindFaultElChildren.hasNext()){
OMElement bindFaultChild = (OMElement)bindFaultElChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
bindFaultChild)){
-
fault.addDocumentationElement(parseDocumentation(bindFaultChild, desc));
+ parseDocumentation(bindFaultChild, desc, fault);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
bindFaultChild)){
- fault.addFeatureElement(parseFeature(bindFaultChild, desc,
fault));
+ parseFeature(bindFaultChild, desc, fault);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
bindFaultChild)){
- fault.addPropertyElement(parseProperty(bindFaultChild, desc,
fault));
+ parseProperty(bindFaultChild, desc, fault);
}
else{
fault.addExtensionElement(parseExtensionElement(BindingFaultElement.class,
fault, bindFaultChild, desc) );
@@ -657,7 +646,7 @@
DescriptionElement desc)
throws WSDLException {
- InterfaceElement intface = desc.createInterfaceElement();
+ InterfaceElement intface = desc.addInterfaceElement();
String name = OMUtils.getAttribute(interfaceEl, Constants.ATTR_NAME);
if(name != null){
intface.setName(new NCName(name));
@@ -669,15 +658,14 @@
Iterator it = stringList.iterator();
while(it.hasNext()){
uriString = (String)it.next();
+ intface.addStyleDefaultURI(getURI(uriString));
}
- intface.addStyleDefaultURI(getURI(uriString));
}
-
String extendsAttr = OMUtils.getAttribute(interfaceEl,
Constants.ATTR_EXTENDS);
if(extendsAttr != null){
List stringList = StringUtils.parseNMTokens(extendsAttr);
- String qnString;
+ String qnString = null;
Iterator it = stringList.iterator();
while(it.hasNext()){
qnString = (String)it.next();
@@ -692,19 +680,19 @@
while (interfaceChildren.hasNext()){
OMElement interfaceChild = (OMElement)interfaceChildren.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_DOCUMENTATION,
interfaceChild)){
-
intface.addDocumentationElement(parseDocumentation(interfaceChild, desc));
+ parseDocumentation(interfaceChild, desc, intface);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FAULT,
interfaceChild)){
-
intface.addInterfaceFaultElement(parseInterfaceFault(interfaceChild, desc,
intface));
+ parseInterfaceFault(interfaceChild, desc, intface);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_OPERATION,
interfaceChild)){
-
intface.addInterfaceOperationElement(parseInterfaceOperation(interfaceChild,
desc, intface));
+ parseInterfaceOperation(interfaceChild, desc, intface);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_FEATURE,
interfaceChild)){
- intface.addFeatureElement(parseFeature(interfaceChild, desc,
intface));
+ parseFeature(interfaceChild, desc, intface);
}
else if (OMQNameUtils.matches(Constants.Q_ELEM_PROPERTY,
interfaceChild)){
- intface.addPropertyElement(parseProperty(interfaceChild, desc,
intface));
+ parseProperty(interfaceChild, desc, intface);
}
else{
intface.addExtensionElement(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
