Author: mriou
Date: Mon Mar 12 11:44:11 2007
New Revision: 517324
URL: http://svn.apache.org/viewvc?view=rev&rev=517324
Log:
Being friendly with WSDL4J 1.6.1.
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Definition4BPELImpl.java
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java?view=diff&rev=517324&r1=517323&r2=517324
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WSDLLocatorImpl.java
Mon Mar 12 11:44:11 2007
@@ -1,16 +1,15 @@
package org.apache.ode.bpel.compiler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.xml.sax.InputSource;
+
+import javax.wsdl.xml.WSDLLocator;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
-import javax.wsdl.xml.WSDLLocator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.xml.sax.InputSource;
-
public class WSDLLocatorImpl implements WSDLLocator {
private static final Log __log = LogFactory.getLog(WSDLLocatorImpl.class);
@@ -66,4 +65,7 @@
return _latest;
}
+ public void close() {
+ _resourceFinder = null;
+ }
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Definition4BPELImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Definition4BPELImpl.java?view=diff&rev=517324&r1=517323&r2=517324
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Definition4BPELImpl.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/wsdl/Definition4BPELImpl.java
Mon Mar 12 11:44:11 2007
@@ -25,7 +25,23 @@
import org.apache.ode.utils.stl.MemberOfFunction;
import org.w3c.dom.Element;
-import javax.wsdl.*;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Import;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.xml.namespace.QName;
@@ -37,310 +53,350 @@
* Implementation of the [EMAIL PROTECTED] Definition4BPEL} wrapper.
*/
class Definition4BPELImpl implements Definition4BPEL {
- private static final long serialVersionUID = 1L;
- Definition _def;
- private String _bpwsNS;
- private String _plnkNS;
-
- Definition4BPELImpl(Definition wsdlDef, String bpwsNS, String plnkNS) {
- _def = wsdlDef;
- _bpwsNS = bpwsNS;
- _plnkNS = plnkNS;
- }
-
- /**
- * Get a list of the defined [EMAIL PROTECTED] PartnerLinkType}s.
- *
- * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PartnerLinkType}
objects
- */
- public List<PartnerLinkType> getPartnerLinkTypes() {
- return getElementsForType(new QName(_plnkNS, "partnerLinkType"),
PartnerLinkType.class);
- }
-
- /**
- * Get a list of the defined [EMAIL PROTECTED] PartnerLinkType}s.
- *
- * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PartnerLinkType}
objects
- */
- public List<Property> getProperties() {
- return getElementsForType(new QName(_bpwsNS, "property"), Property.class);
- }
-
- /**
- * Get a list of the defined [EMAIL PROTECTED] PropertyAlias}es.
- *
- * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PropertyAlias}
objects
- */
- public List<PropertyAlias> getPropertyAliases() {
- return getElementsForType(new QName(_bpwsNS, "propertyAlias"),
PropertyAlias.class);
- }
-
- public Property getProperty(final QName name) {
- return CollectionsX.find_if(getProperties(), new
MemberOfFunction<Property>() {
- public boolean isMember(Property o) {
- return o.getName().equals(name);
- }
- });
- }
-
- public PartnerLinkType getPartnerLinkType(final QName partnerLinkTypeName) {
- return CollectionsX.find_if(getPartnerLinkTypes(), new
MemberOfFunction<PartnerLinkType>() {
- public boolean isMember(PartnerLinkType o) {
- return o.getName().equals(partnerLinkTypeName);
- }
- });
- }
-
- public PropertyAlias getPropertyAlias(final QName propertyName, final QName
messageType) {
- return CollectionsX.find_if(getPropertyAliases(), new
MemberOfFunction<PropertyAlias>() {
- public boolean isMember(PropertyAlias o) {
- return o.getPropertyName().equals(propertyName) &&
o.getMessageType().equals(messageType);
- }
- });
- }
-
-
-
- /**
- * Get a list of the schema types defined in-line.
- *
- * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] XMLSchemaType}
objects
- */
- @SuppressWarnings("unchecked")
- public List <XMLSchemaType> getSchemas() {
- return (List<XMLSchemaType>)getTypes().getExtensibilityElements();
- }
-
- public void addBinding(Binding binding) {
- _def.addBinding(binding);
- }
-
- public void addExtensibilityElement(ExtensibilityElement
extensibilityElement) {
- _def.addExtensibilityElement(extensibilityElement);
- }
-
- public void addImport(Import anImport) {
- _def.addImport(anImport);
- }
-
- public void addMessage(Message message) {
- _def.addMessage(message);
- }
-
- public void addNamespace(String s, String s1) {
- _def.addNamespace(s,s1);
- }
-
- public void addPortType(PortType portType) {
- _def.addPortType(portType);
- }
-
- public void addService(Service service) {
- _def.addService(service);
- }
-
- public Binding createBinding() {
- return _def.createBinding();
- }
-
- public BindingFault createBindingFault() {
- return _def.createBindingFault();
- }
-
- public BindingInput createBindingInput() {
- return _def.createBindingInput();
- }
-
- public BindingOperation createBindingOperation() {
- return _def.createBindingOperation();
- }
-
- public BindingOutput createBindingOutput() {
- return _def.createBindingOutput();
- }
-
- public Fault createFault() {
- return _def.createFault();
- }
-
- public Import createImport() {
- return _def.createImport();
- }
-
- public Input createInput() {
- return _def.createInput();
- }
-
- public Message createMessage() {
- return _def.createMessage();
- }
-
- public Operation createOperation() {
- return _def.createOperation();
- }
-
- public Output createOutput() {
- return _def.createOutput();
- }
-
- public Part createPart() {
- return _def.createPart();
- }
-
- public Port createPort() {
- return _def.createPort();
- }
-
- public PortType createPortType() {
- return _def.createPortType();
- }
-
- public Service createService() {
- return _def.createService();
- }
-
- public Types createTypes() {
- return _def.createTypes();
- }
-
- public Binding getBinding(QName qName) {
- return _def.getBinding(qName);
- }
-
- public Map getBindings() {
- return _def.getBindings();
- }
-
- public String getDocumentBaseURI() {
- return _def.getDocumentBaseURI();
- }
-
- public Element getDocumentationElement() {
- return _def.getDocumentationElement();
- }
-
- public List getExtensibilityElements() {
- return _def.getExtensibilityElements();
- }
-
- public ExtensionRegistry getExtensionRegistry() {
- return _def.getExtensionRegistry();
- }
-
- public Map getImports() {
- return _def.getImports();
- }
-
- public List getImports(String s) {
- return _def.getImports(s);
- }
-
- public Message getMessage(QName qName) {
- return _def.getMessage(qName);
- }
-
- public Map getMessages() {
- return _def.getMessages();
- }
-
- public String getNamespace(String s) {
- return _def.getNamespace(s);
- }
-
- public Map getNamespaces() {
- return _def.getNamespaces();
- }
-
- public PortType getPortType(QName qName) {
- return _def.getPortType(qName);
- }
-
- public Map getPortTypes() {
- return _def.getPortTypes();
- }
-
- public String getPrefix(String s) {
- return _def.getPrefix(s);
- }
-
- public QName getQName() {
- return _def.getQName();
- }
-
- public Service getService(QName qName) {
- return _def.getService(qName);
- }
-
- public Map getServices() {
- return _def.getServices();
- }
-
- public String getTargetNamespace() {
- return _def.getTargetNamespace();
- }
-
- public Types getTypes() {
- return _def.getTypes();
- }
-
- public Binding removeBinding(QName qName) {
- return _def.removeBinding(qName);
- }
-
- public Message removeMessage(QName qName) {
- return _def.removeMessage(qName);
- }
-
- public PortType removePortType(QName qName) {
- return _def.removePortType(qName);
- }
-
- public Service removeService(QName qName) {
- return _def.removeService(qName);
- }
-
- public void setDocumentBaseURI(String s) {
- _def.setDocumentBaseURI(s);
- }
-
- public void setDocumentationElement(Element element) {
- _def.setDocumentationElement(element);
- }
-
- public void setExtensionRegistry(ExtensionRegistry extensionRegistry) {
- _def.setExtensionRegistry(extensionRegistry);
- }
-
- public void setQName(QName qName) {
- _def.setQName(qName);
- }
-
- public void setTargetNamespace(String s) {
- _def.setTargetNamespace(s);
- }
-
- public void setTypes(Types types) {
- _def.setTypes(types);
- }
-
- public Definition getDefinition() {
- return _def;
- }
-
- /**
- * Get all the extensibility elements of a certain name (element name that
is).
- * @param type type of extensibility element
- * @return list of extensibility elements of the given type
- */
- @SuppressWarnings("unchecked")
- private <T extends ExtensibilityElement> List<T> getElementsForType(final
QName type, Class<T> cls) {
- List<T> ret = new ArrayList<T>();
- CollectionsX.filter(ret, getExtensibilityElements(), new
MemberOfFunction() {
- public boolean isMember(Object o) {
- return ((ExtensibilityElement)o).getElementType().equals(type);
- }
- });
- return ret;
- }
+ private static final long serialVersionUID = 1L;
+ Definition _def;
+ private String _bpwsNS;
+ private String _plnkNS;
+
+ Definition4BPELImpl(Definition wsdlDef, String bpwsNS, String plnkNS) {
+ _def = wsdlDef;
+ _bpwsNS = bpwsNS;
+ _plnkNS = plnkNS;
+ }
+
+ /**
+ * Get a list of the defined [EMAIL PROTECTED] PartnerLinkType}s.
+ *
+ * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PartnerLinkType}
objects
+ */
+ public List<PartnerLinkType> getPartnerLinkTypes() {
+ return getElementsForType(new QName(_plnkNS, "partnerLinkType"),
PartnerLinkType.class);
+ }
+
+ /**
+ * Get a list of the defined [EMAIL PROTECTED] PartnerLinkType}s.
+ *
+ * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PartnerLinkType}
objects
+ */
+ public List<Property> getProperties() {
+ return getElementsForType(new QName(_bpwsNS, "property"),
Property.class);
+ }
+
+ /**
+ * Get a list of the defined [EMAIL PROTECTED] PropertyAlias}es.
+ *
+ * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] PropertyAlias}
objects
+ */
+ public List<PropertyAlias> getPropertyAliases() {
+ return getElementsForType(new QName(_bpwsNS, "propertyAlias"),
PropertyAlias.class);
+ }
+
+ public Property getProperty(final QName name) {
+ return CollectionsX.find_if(getProperties(), new
MemberOfFunction<Property>() {
+ public boolean isMember(Property o) {
+ return o.getName().equals(name);
+ }
+ });
+ }
+
+ public PartnerLinkType getPartnerLinkType(final QName partnerLinkTypeName)
{
+ return CollectionsX.find_if(getPartnerLinkTypes(), new
MemberOfFunction<PartnerLinkType>() {
+ public boolean isMember(PartnerLinkType o) {
+ return o.getName().equals(partnerLinkTypeName);
+ }
+ });
+ }
+
+ public PropertyAlias getPropertyAlias(final QName propertyName, final
QName messageType) {
+ return CollectionsX.find_if(getPropertyAliases(), new
MemberOfFunction<PropertyAlias>() {
+ public boolean isMember(PropertyAlias o) {
+ return o.getPropertyName().equals(propertyName) &&
o.getMessageType().equals(messageType);
+ }
+ });
+ }
+
+
+
+ /**
+ * Get a list of the schema types defined in-line.
+ *
+ * @return [EMAIL PROTECTED] List} of [EMAIL PROTECTED] XMLSchemaType}
objects
+ */
+ @SuppressWarnings("unchecked")
+ public List <XMLSchemaType> getSchemas() {
+ return (List<XMLSchemaType>)getTypes().getExtensibilityElements();
+ }
+
+ public void addBinding(Binding binding) {
+ _def.addBinding(binding);
+ }
+
+ public void addExtensibilityElement(ExtensibilityElement
extensibilityElement) {
+ _def.addExtensibilityElement(extensibilityElement);
+ }
+
+ public void addImport(Import anImport) {
+ _def.addImport(anImport);
+ }
+
+ public void addMessage(Message message) {
+ _def.addMessage(message);
+ }
+
+ public void addNamespace(String s, String s1) {
+ _def.addNamespace(s,s1);
+ }
+
+ public void addPortType(PortType portType) {
+ _def.addPortType(portType);
+ }
+
+ public void addService(Service service) {
+ _def.addService(service);
+ }
+
+ public Binding createBinding() {
+ return _def.createBinding();
+ }
+
+ public BindingFault createBindingFault() {
+ return _def.createBindingFault();
+ }
+
+ public BindingInput createBindingInput() {
+ return _def.createBindingInput();
+ }
+
+ public BindingOperation createBindingOperation() {
+ return _def.createBindingOperation();
+ }
+
+ public BindingOutput createBindingOutput() {
+ return _def.createBindingOutput();
+ }
+
+ public Fault createFault() {
+ return _def.createFault();
+ }
+
+ public Import createImport() {
+ return _def.createImport();
+ }
+
+ public Input createInput() {
+ return _def.createInput();
+ }
+
+ public Message createMessage() {
+ return _def.createMessage();
+ }
+
+ public Operation createOperation() {
+ return _def.createOperation();
+ }
+
+ public Output createOutput() {
+ return _def.createOutput();
+ }
+
+ public Part createPart() {
+ return _def.createPart();
+ }
+
+ public Port createPort() {
+ return _def.createPort();
+ }
+
+ public PortType createPortType() {
+ return _def.createPortType();
+ }
+
+ public Service createService() {
+ return _def.createService();
+ }
+
+ public Types createTypes() {
+ return _def.createTypes();
+ }
+
+ public Binding getBinding(QName qName) {
+ return _def.getBinding(qName);
+ }
+
+ public Map getBindings() {
+ return _def.getBindings();
+ }
+
+ public String getDocumentBaseURI() {
+ return _def.getDocumentBaseURI();
+ }
+
+ public Element getDocumentationElement() {
+ return _def.getDocumentationElement();
+ }
+
+ public List getExtensibilityElements() {
+ return _def.getExtensibilityElements();
+ }
+
+ public ExtensionRegistry getExtensionRegistry() {
+ return _def.getExtensionRegistry();
+ }
+
+ public Map getImports() {
+ return _def.getImports();
+ }
+
+ public List getImports(String s) {
+ return _def.getImports(s);
+ }
+
+ public Message getMessage(QName qName) {
+ return _def.getMessage(qName);
+ }
+
+ public Map getMessages() {
+ return _def.getMessages();
+ }
+
+ public String getNamespace(String s) {
+ return _def.getNamespace(s);
+ }
+
+ public Map getNamespaces() {
+ return _def.getNamespaces();
+ }
+
+ public PortType getPortType(QName qName) {
+ return _def.getPortType(qName);
+ }
+
+ public Map getPortTypes() {
+ return _def.getPortTypes();
+ }
+
+ public String getPrefix(String s) {
+ return _def.getPrefix(s);
+ }
+
+ public QName getQName() {
+ return _def.getQName();
+ }
+
+ public Service getService(QName qName) {
+ return _def.getService(qName);
+ }
+
+ public Map getServices() {
+ return _def.getServices();
+ }
+
+ public String getTargetNamespace() {
+ return _def.getTargetNamespace();
+ }
+
+ public Types getTypes() {
+ return _def.getTypes();
+ }
+
+ public Binding removeBinding(QName qName) {
+ return _def.removeBinding(qName);
+ }
+
+ public Message removeMessage(QName qName) {
+ return _def.removeMessage(qName);
+ }
+
+ public PortType removePortType(QName qName) {
+ return _def.removePortType(qName);
+ }
+
+ public Service removeService(QName qName) {
+ return _def.removeService(qName);
+ }
+
+ public void setDocumentBaseURI(String s) {
+ _def.setDocumentBaseURI(s);
+ }
+
+ public void setDocumentationElement(Element element) {
+ _def.setDocumentationElement(element);
+ }
+
+ public void setExtensionRegistry(ExtensionRegistry extensionRegistry) {
+ _def.setExtensionRegistry(extensionRegistry);
+ }
+
+ public void setQName(QName qName) {
+ _def.setQName(qName);
+ }
+
+ public void setTargetNamespace(String s) {
+ _def.setTargetNamespace(s);
+ }
+
+ public void setTypes(Types types) {
+ _def.setTypes(types);
+ }
+
+ public Definition getDefinition() {
+ return _def;
+ }
+
+ public Map getAllServices() {
+ return _def.getAllServices();
+ }
+
+ public Map getAllBindings() {
+ return _def.getAllBindings();
+ }
+
+ public Map getAllPortTypes() {
+ return _def.getAllPortTypes();
+ }
+
+ public Import removeImport(Import anImport) {
+ return _def.removeImport(anImport);
+ }
+
+ public String removeNamespace(String string) {
+ return _def.removeNamespace(string);
+ }
+
+ public Object getExtensionAttribute(QName qName) {
+ return _def.getExtensionAttribute(qName);
+ }
+
+ public Map getExtensionAttributes() {
+ return _def.getExtensionAttributes();
+ }
+
+ public List getNativeAttributeNames() {
+ return _def.getNativeAttributeNames();
+ }
+
+ public void setExtensionAttribute(QName qName, Object object) {
+ _def.setExtensionAttribute(qName, object);
+ }
+
+ public ExtensibilityElement
removeExtensibilityElement(ExtensibilityElement e) {
+ return _def.removeExtensibilityElement(e);
+ }
+
+ /**
+ * Get all the extensibility elements of a certain name (element name that
is).
+ * @param type type of extensibility element
+ * @return list of extensibility elements of the given type
+ */
+ @SuppressWarnings("unchecked")
+ private <T extends ExtensibilityElement> List<T> getElementsForType(final
QName type, Class<T> cls) {
+ List<T> ret = new ArrayList<T>();
+ CollectionsX.filter(ret, getExtensibilityElements(), new
MemberOfFunction() {
+ public boolean isMember(Object o) {
+ return ((ExtensibilityElement)o).getElementType().equals(type);
+ }
+ });
+ return ret;
+ }
}
