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/19 12:14:53 UTC
svn commit: r191334 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/description/ wsdl/src/org/apache/axis/wsdl/builder/
wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/
wsdl/src/org/apache/axis/wsdl/codegen/
wsdl/src/org/apache/axis/wsdl/codegen/extension/
wsdl/src/org/apache/axis/wsdl/codegen/writer/
wsdl/src/org/apache/axis/wsdl/databinding/
wsdl/src/org/apache/axis/wsdl/util/ wsdl/src/org/apache/wsdl/
wsdl/src/org/apache/wsdl/extensions/
wsdl/src/org/apache/wsdl/extensions/impl/ wsdl/src/org/apache/wsdl/impl/
wsdl/src/org/apache/wsdl/util/ wsdl/test/org/apache/wsdl/
Author: chathura
Date: Sun Jun 19 03:14:50 2005
New Revision: 191334
URL: http://svn.apache.org/viewcvs?rev=191334&view=rev
Log:
Change made so that the ServiceDescription will look its bound interface for the operations that the service expose.
Changes made to look up the Operation Description given the SOAPAction. In the Service Description if get operation is called given a soap Action it will try to find a operation with that given unique qname. Otherwise it will return null
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDLComponentFactory.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
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/CodeGenConfiguration.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.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/codegen/writer/BeanWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ServiceXMLWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/SkeletonWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/TestClassWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/URLProcessor.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingFault.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingOperation.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisDescWSDLComponentFactory.java Sun Jun 19 03:14:50 2005
@@ -3,6 +3,7 @@
import org.apache.axis.wsdl.builder.WSDLComponentFactory;
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingMessageReference;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLDescription;
@@ -20,6 +21,7 @@
import org.apache.wsdl.extensions.ExtensionFactory;
import org.apache.wsdl.extensions.impl.ExtensionFactoryImpl;
import org.apache.wsdl.impl.MessageReferenceImpl;
+import org.apache.wsdl.impl.WSDLBindingFaultImpl;
import org.apache.wsdl.impl.WSDLBindingImpl;
import org.apache.wsdl.impl.WSDLBindingMessageReferenceImpl;
import org.apache.wsdl.impl.WSDLBindingOperationImpl;
@@ -123,6 +125,10 @@
public WSDLFaultReference createFaultReference(){
return new WSDLFaultReferenceImpl();
+ }
+
+ public WSDLBindingFault createBindingFault(){
+ return new WSDLBindingFaultImpl();
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java Sun Jun 19 03:14:50 2005
@@ -15,19 +15,26 @@
*/
package org.apache.axis.description;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.phaseresolver.PhaseResolver;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLEndpoint;
import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.extensions.ExtensionConstants;
+import org.apache.wsdl.extensions.SOAPOperation;
+import org.apache.wsdl.impl.WSDLInterfaceImpl;
import org.apache.wsdl.impl.WSDLServiceImpl;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
/**
* Class ServiceDescription
*/
@@ -39,7 +46,7 @@
* the Services, so we put this here for M1 until we foud better way to do
* that
*/
- protected final HashMap operationsMap = new HashMap();
+// protected final HashMap operationsMap = new HashMap();
private String serviceDescription = "Not Specified";
@@ -49,6 +56,7 @@
public ServiceDescription() {
this.setComponentProperty(MODULEREF_KEY, new ArrayList());
this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl());
+ this.setServiceInterface( new WSDLInterfaceImpl());
}
/**
@@ -133,10 +141,7 @@
*/
public OperationDescription getOperation(QName operationName) {
- // todo The key has been changed from the qname to the local name
- // because
- // todo when comparing the namespace will not be available
- return (OperationDescription) this.operationsMap.get(operationName.getLocalPart());
+ return (OperationDescription) this.getServiceInterface().getAllOperations().get(operationName.getLocalPart());
}
/*
@@ -152,12 +157,7 @@
*/
public void addOperation(OperationDescription operation) {
- // todo The key has been changed from the qname to the local name
- // because
- // todo when comparing the namespace will not be available
- if (operation != null) {
- this.operationsMap.put(operation.getName().getLocalPart(), operation);
- }
+ this.getServiceInterface().setOperation(operation);
}
/*
@@ -413,9 +413,73 @@
* @return
*/
public HashMap getOperations() {
- return operationsMap;
+ return this.getServiceInterface().getOperations();
+ }
+
+ public OperationDescription getOperation(String ncName){
+ return (OperationDescription)this.getServiceInterface().getOperations().get(ncName);
+ }
+
+ /**
+ * This method will return the operation given particular SOAP Action.
+ * This method should only be called if there is only one Endpoint is defined
+ * for this Service. If more than one Endpoint exists one of them will be picked.
+ * If more than one Operation is found with the given
+ * SOAP Action; null will be ruturned. If no particular Operation is found with
+ * the given SOAP Action; null will be returned.
+ * @param soapAction SOAP Action defined for the particular Operation
+ * @return A OperationDescription if a unque Operation can be found with the given SOAP Action
+ * otherwise will return null.
+ */
+ public OperationDescription getOperationBySOAPAction(String soapAction){
+ Iterator iterator = this.getEndpoints().keySet().iterator();
+ if(iterator.hasNext()){
+ WSDLEndpoint endpoint = (WSDLEndpoint)iterator.next();
+ return this.getOperationBySOAPAction(soapAction, endpoint.getName());
+ }
+
+ return null;
+
+
+ }
+
+
+ /**
+ * This method will return the operation given the particular endpoing and the
+ * particular SOAP Action. If more than one Operation is found with the given
+ * SOAP Action; null will be ruturned. If no particular Operation is found with
+ * the given SOAP Action; null will be returned
+ * @param endpoint Particular Enpoint in which the bining is defined with the particular SOAP
+ * Action.
+ * @param soapAction SOAP Action defined for the particular Operation
+ * @return A OperationDescription if a unque Operation can be found with the given SOAP Action
+ * otherwise will return null.
+ */
+ public OperationDescription getOperationBySOAPAction(String soapAction, QName endpoint){
+ HashMap bindingOperations = this.getEndpoint(endpoint).getBinding().getBindingOperations();
+ Iterator operationKeySetIterator = bindingOperations.keySet().iterator();
+ OperationDescription operation = null;
+ int count = 0;
+ while(operationKeySetIterator.hasNext()){
+ WSDLBindingOperation bindingOperation = (WSDLBindingOperation)bindingOperations.get(operationKeySetIterator.next());
+ Iterator extIterator = bindingOperation.getExtensibilityElements().iterator();
+ while(extIterator.hasNext()){
+ ExtensibilityElement element = (ExtensibilityElement)extIterator.next();
+ if(element.getElementType().equals(ExtensionConstants.SOAP_OPERATION)){
+ if(((SOAPOperation)element).getSoapAction().equals(soapAction)){
+ operation = (OperationDescription)bindingOperation.getOperation();
+ count++;
+ }
+ }
+ }
+ }
+ if(1 == count){
+ return operation;
+ }
+ return null;
}
+
/**
* This finds the ServiceContext provided that the incomming message that
* has have some serviceInstanceID. Currently this will not be added to the
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilder.java Sun Jun 19 03:14:50 2005
@@ -15,10 +15,11 @@
*/
package org.apache.axis.wsdl.builder;
-import org.apache.wsdl.WSDLDescription;
+import java.io.InputStream;
import javax.wsdl.WSDLException;
-import java.io.InputStream;
+
+import org.apache.wsdl.WSDLDescription;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WOMBuilderFactory.java Sun Jun 19 03:14:50 2005
@@ -15,16 +15,17 @@
*/
package org.apache.axis.wsdl.builder;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.wsdl.WSDLException;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.axis.wsdl.builder.wsdl4j.WSDL1ToWOMBuilder;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.util.Utils;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-
-import javax.wsdl.WSDLException;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.InputStream;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDL2ToWOMBuilder.java Sun Jun 19 03:14:50 2005
@@ -15,10 +15,11 @@
*/
package org.apache.axis.wsdl.builder;
-import org.apache.wsdl.WSDLDescription;
+import java.io.InputStream;
import javax.wsdl.WSDLException;
-import java.io.InputStream;
+
+import org.apache.wsdl.WSDLDescription;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDLComponentFactory.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/WSDLComponentFactory.java Sun Jun 19 03:14:50 2005
@@ -2,6 +2,7 @@
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingMessageReference;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLDescription;
@@ -110,6 +111,12 @@
* @return A new instance of <code>WSDLExtensibilityAttribute</code>
*/
public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute();
+
+ /**
+ *
+ * @return A new instance of <code>WSDLBindingFault</code>
+ */
+ public WSDLBindingFault createBindingFault();
/**
*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL11MEPFinder.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL11MEPFinder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL11MEPFinder.java Sun Jun 19 03:14:50 2005
@@ -15,11 +15,11 @@
*/
package org.apache.axis.wsdl.builder.wsdl4j;
-import org.apache.wsdl.WSDLConstants;
-import org.apache.wsdl.impl.WSDLProcessingException;
-
import javax.wsdl.Operation;
import javax.wsdl.OperationType;
+
+import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.impl.WSDLProcessingException;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Sun Jun 19 03:14:50 2005
@@ -15,6 +15,15 @@
*/
package org.apache.axis.wsdl.builder.wsdl4j;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.apache.axis.wsdl.builder.WOMBuilder;
import org.apache.axis.wsdl.builder.WSDLComponentFactory;
import org.apache.wsdl.WSDLDescription;
@@ -22,14 +31,6 @@
import org.apache.wsdl.util.Utils;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.InputStream;
/**
* @author chathura@opensource.lk
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=191334&r1=191333&r2=191334&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 Sun Jun 19 03:14:50 2005
@@ -40,6 +40,7 @@
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap.SOAPOperation;
import javax.xml.namespace.QName;
import org.apache.axis.wsdl.builder.WSDLComponentFactory;
@@ -47,6 +48,7 @@
import org.apache.wsdl.Component;
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingMessageReference;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLConstants;
@@ -66,6 +68,8 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import com.ibm.wsdl.extensions.soap.SOAPConstants;
+
/**
* @author chathura@opensource.lk
*/
@@ -488,13 +492,14 @@
}
-// Map bindingFaults = wsdl4jBindingOperation.getBindingFaults();
-// Iterator keyIterator = bindingFaults.keySet().iterator();
-// while(keyIterator.hasNext()){
-// BindingFault bindingFault = (BindingFault)bindingFaults.get(keyIterator.next());
-// bindingFault.getName()
-//
-// }
+ Map bindingFaults = wsdl4jBindingOperation.getBindingFaults();
+ Iterator keyIterator = bindingFaults.keySet().iterator();
+ while(keyIterator.hasNext()){
+ BindingFault bindingFault = (BindingFault)bindingFaults.get(keyIterator.next());
+ WSDLBindingFault womBindingFault = this.wsdlComponenetFactory.createBindingFault();
+ this.copyExtensibleElements(bindingFault.getExtensibilityElements(), womBindingFault);
+ wsdlBindingOperation.addOutFault(womBindingFault);
+ }
}
@@ -598,6 +603,16 @@
org.apache.wsdl.extensions.Schema extensibilityElement = (org.apache.wsdl.extensions.Schema)extensionFactory.getExtensionElement(schema.getElementType());
extensibilityElement.setElelment(schema.getElement());
Boolean required = schema.getRequired();
+ if(null != required){
+ extensibilityElement.setRequired(required.booleanValue());
+ }
+ component.addExtensibilityElement(extensibilityElement);
+ }else if(SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(wsdl4jElement.getElementType())){
+ SOAPOperation soapOperation = (SOAPOperation)wsdl4jElement;
+ org.apache.wsdl.extensions.SOAPOperation extensibilityElement = (org.apache.wsdl.extensions.SOAPOperation)extensionFactory.getExtensionElement(soapOperation.getElementType());
+ extensibilityElement.setSoapAction(soapOperation.getSoapActionURI());
+ extensibilityElement.setStyle(soapOperation.getStyle());
+ Boolean required = soapOperation.getRequired();
if(null != required){
extensibilityElement.setRequired(required.booleanValue());
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java Sun Jun 19 03:14:50 2005
@@ -16,10 +16,10 @@
package org.apache.axis.wsdl.codegen;
-import org.apache.wsdl.WSDLDescription;
-
import java.io.File;
import java.util.Map;
+
+import org.apache.wsdl.WSDLDescription;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java Sun Jun 19 03:14:50 2005
@@ -16,6 +16,15 @@
package org.apache.axis.wsdl.codegen;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.wsdl.WSDLException;
+
import org.apache.axis.wsdl.builder.WOMBuilderFactory;
import org.apache.axis.wsdl.codegen.emitter.CSharpEmitter;
import org.apache.axis.wsdl.codegen.emitter.Emitter;
@@ -24,14 +33,6 @@
import org.apache.axis.wsdl.codegen.extension.CodeGenExtention;
import org.apache.axis.wsdl.codegen.extension.PackageFinder;
import org.apache.wsdl.WSDLDescription;
-
-import javax.wsdl.WSDLException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java Sun Jun 19 03:14:50 2005
@@ -16,7 +16,11 @@
package org.apache.axis.wsdl.codegen;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* @author chathura@opensource.lk
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=191334&r1=191333&r2=191334&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 Sun Jun 19 03:14:50 2005
@@ -16,12 +16,12 @@
package org.apache.axis.wsdl.codegen.extension;
+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.WSDLInterface;
-
-import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,8 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java Sun Jun 19 03:14:50 2005
@@ -1,12 +1,12 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.util.FileWriter;
-import org.apache.axis.wsdl.util.XSLTTemplateProcessor;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
+import org.apache.axis.wsdl.util.FileWriter;
+import org.apache.axis.wsdl.util.XSLTTemplateProcessor;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,8 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,8 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ServiceXMLWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ServiceXMLWriter.java Sun Jun 19 03:14:50 2005
@@ -1,10 +1,10 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
+import org.apache.axis.wsdl.util.FileWriter;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/SkeletonWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/SkeletonWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/SkeletonWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/SkeletonWriter.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,8 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/TestClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/TestClassWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/TestClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/TestClassWriter.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,8 @@
package org.apache.axis.wsdl.codegen.writer;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java Sun Jun 19 03:14:50 2005
@@ -1,8 +1,9 @@
package org.apache.axis.wsdl.databinding;
-import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.util.Date;
+
+import javax.xml.namespace.QName;
/*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java Sun Jun 19 03:14:50 2005
@@ -1,9 +1,9 @@
package org.apache.axis.wsdl.util;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
import java.io.File;
import java.io.IOException;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/URLProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/URLProcessor.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/URLProcessor.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/URLProcessor.java Sun Jun 19 03:14:50 2005
@@ -1,7 +1,7 @@
package org.apache.axis.wsdl.util;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/XSLTTemplateProcessor.java Sun Jun 19 03:14:50 2005
@@ -1,11 +1,17 @@
package org.apache.axis.wsdl.util;
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
import java.io.InputStream;
import java.io.OutputStream;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
/*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBinding.java Sun Jun 19 03:14:50 2005
@@ -15,8 +15,9 @@
*/
package org.apache.wsdl;
-import javax.xml.namespace.QName;
import java.util.HashMap;
+
+import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingFault.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingFault.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingFault.java Sun Jun 19 03:14:50 2005
@@ -20,7 +20,7 @@
/**
* @author chathura@opensource.lk
*/
-public interface WSDLBindingFault {
+public interface WSDLBindingFault extends Component {
/**
* Method getRef
*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingOperation.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingOperation.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLBindingOperation.java Sun Jun 19 03:14:50 2005
@@ -15,6 +15,8 @@
*/
package org.apache.wsdl;
+import java.util.List;
+
import javax.xml.namespace.QName;
/**
@@ -76,4 +78,39 @@
* @param name
*/
public void setName(QName name);
+
+ /**
+ * Add the InFault to the Components InFaults
+ * @param inFault
+ */
+ public void addInFault(WSDLBindingFault inFault);
+
+ /**
+ * Add the OutFault to the Component OutFaults
+ * @param outFault
+ */
+ public void addOutFault(WSDLBindingFault outFault);
+
+ /**
+ *
+ * @return The list of infault <code>WSDLBindingFault</code>s
+ */
+ public List getInfaults() ;
+ /**
+ * Sets the list of infault <code>WSDLBindingFault</code>s
+ * @param infaults
+ */
+ public void setInfaults(List infaults) ;
+
+ /**
+ *
+ * @return The list of Outfaults <code>WSDLBindingFault</code>s
+ */
+ public List getOutfaults() ;
+
+ /**
+ * Sets the list of outfault <code>WSDLBindingFault</code>s
+ * @param outfaults
+ */
+ public void setOutfaults(List outfaults) ;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLInterface.java Sun Jun 19 03:14:50 2005
@@ -15,9 +15,10 @@
*/
package org.apache.wsdl;
-import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.List;
+
+import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLOperation.java Sun Jun 19 03:14:50 2005
@@ -15,8 +15,9 @@
*/
package org.apache.wsdl;
-import javax.xml.namespace.QName;
import java.util.List;
+
+import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java Sun Jun 19 03:14:50 2005
@@ -15,8 +15,9 @@
*/
package org.apache.wsdl;
-import javax.xml.namespace.QName;
import java.util.HashMap;
+
+import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java Sun Jun 19 03:14:50 2005
@@ -29,6 +29,9 @@
*/
public static final QName SOAP_ADDRESS = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "address");
+ public static final QName SOAP_OPERATION = new QName("http://schemas.xmlsoap.org/wsdl/soap/", "operation");
+
public static final QName SCHEMA = new QName("http://www.w3.org/2001/XMLSchema", "schema");
+
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java Sun Jun 19 03:14:50 2005
@@ -38,6 +38,8 @@
return new SOAPAddressImpl();
if(qName.equals(SCHEMA))
return new SchemaImpl();
+ if(qName.equals(SOAP_OPERATION))
+ return new SOAPOperationImpl();
return new DefaultExtensibilityElementImpl();
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/ComponentImpl.java Sun Jun 19 03:14:50 2005
@@ -20,9 +20,9 @@
import java.util.List;
import org.apache.wsdl.Component;
-import org.apache.wsdl.WSDLExtensibilityElement;
import org.apache.wsdl.WSDLConstants;
import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLExtensibilityElement;
import org.w3c.dom.Document;
/**
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/MessageReferenceImpl.java Sun Jun 19 03:14:50 2005
@@ -15,9 +15,9 @@
*/
package org.apache.wsdl.impl;
-import org.apache.wsdl.MessageReference;
-
import javax.xml.namespace.QName;
+
+import org.apache.wsdl.MessageReference;
/**
* @author Chathura Herath
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingFaultImpl.java Sun Jun 19 03:14:50 2005
@@ -15,9 +15,9 @@
*/
package org.apache.wsdl.impl;
-import org.apache.wsdl.WSDLBindingFault;
-
import javax.xml.namespace.QName;
+
+import org.apache.wsdl.WSDLBindingFault;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingImpl.java Sun Jun 19 03:14:50 2005
@@ -15,13 +15,14 @@
*/
package org.apache.wsdl.impl;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+
import org.apache.wsdl.WSDLBinding;
import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLInterface;
-
-import javax.xml.namespace.QName;
-import java.util.HashMap;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLBindingOperationImpl.java Sun Jun 19 03:14:50 2005
@@ -15,12 +15,16 @@
*/
package org.apache.wsdl.impl;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingMessageReference;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLOperation;
-import javax.xml.namespace.QName;
-
/**
* @author chathura@opensource.lk
*/
@@ -30,6 +34,17 @@
* Field name
*/
private QName name;
+
+
+ /**
+ * Field infaults
+ */
+ private List infaults = new LinkedList();
+
+ /**
+ * Field outfaults
+ */
+ private List outfaults = new LinkedList();
/**
* Field operation
@@ -117,4 +132,34 @@
public void setName(QName name) {
this.name = name;
}
+
+ /**
+ * Add the InFault to the Components InFaults
+ * @param inFault
+ */
+ public void addInFault(WSDLBindingFault inFault){
+ this.infaults.add(inFault);
+ }
+
+ /**
+ * Add the OutFault to the Component OutFaults
+ * @param outFault
+ */
+ public void addOutFault(WSDLBindingFault outFault){
+ this.outfaults.add(outFault);
+ }
+
+
+ public List getInfaults() {
+ return infaults;
+ }
+ public void setInfaults(List infaults) {
+ this.infaults = infaults;
+ }
+ public List getOutfaults() {
+ return outfaults;
+ }
+ public void setOutfaults(List outfaults) {
+ this.outfaults = outfaults;
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLDescriptionImpl.java Sun Jun 19 03:14:50 2005
@@ -23,6 +23,7 @@
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
import org.apache.wsdl.WSDLBindingMessageReference;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLDescription;
@@ -506,5 +507,9 @@
public WSDLFaultReference createFaultReference(){
return new WSDLFaultReferenceImpl();
+ }
+
+ public WSDLBindingFault createBindingFault(){
+ return new WSDLBindingFaultImpl();
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLEndpointImpl.java Sun Jun 19 03:14:50 2005
@@ -15,10 +15,10 @@
*/
package org.apache.wsdl.impl;
+import javax.xml.namespace.QName;
+
import org.apache.wsdl.WSDLBinding;
import org.apache.wsdl.WSDLEndpoint;
-
-import javax.xml.namespace.QName;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLInterfaceImpl.java Sun Jun 19 03:14:50 2005
@@ -15,14 +15,15 @@
*/
package org.apache.wsdl.impl;
-import org.apache.wsdl.WSDLInterface;
-import org.apache.wsdl.WSDLOperation;
-
-import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
/**
* @author Chathura Herath
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLOperationImpl.java Sun Jun 19 03:14:50 2005
@@ -15,14 +15,15 @@
*/
package org.apache.wsdl.impl;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLFaultReference;
import org.apache.wsdl.WSDLOperation;
import org.apache.wsdl.WSDLService;
-
-import javax.xml.namespace.QName;
-import java.util.LinkedList;
-import java.util.List;
/**
* @author Chathura Herath
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/impl/WSDLServiceImpl.java Sun Jun 19 03:14:50 2005
@@ -15,12 +15,13 @@
*/
package org.apache.wsdl.impl;
+import java.util.HashMap;
+
+import javax.xml.namespace.QName;
+
import org.apache.wsdl.WSDLEndpoint;
import org.apache.wsdl.WSDLInterface;
import org.apache.wsdl.WSDLService;
-
-import javax.xml.namespace.QName;
-import java.util.HashMap;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/wsdl/util/Utils.java Sun Jun 19 03:14:50 2005
@@ -15,14 +15,15 @@
*/
package org.apache.wsdl.util;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.InputStream;
+
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
/**
* @author Srinath Perera(hemapani@opensource.lk)
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java Sun Jun 19 03:14:50 2005
@@ -15,9 +15,9 @@
*/
package org.apache.wsdl;
-import junit.framework.TestCase;
-
import java.io.File;
+
+import junit.framework.TestCase;
/**
* Abstract base class for test cases.
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java?rev=191334&r1=191333&r2=191334&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/InterfaceTest.java Sun Jun 19 03:14:50 2005
@@ -15,11 +15,12 @@
*/
package org.apache.wsdl;
-import org.apache.wsdl.impl.WSDLInterfaceImpl;
-import org.apache.wsdl.impl.WSDLOperationImpl;
+import java.util.Iterator;
import javax.xml.namespace.QName;
-import java.util.Iterator;
+
+import org.apache.wsdl.impl.WSDLInterfaceImpl;
+import org.apache.wsdl.impl.WSDLOperationImpl;
public class InterfaceTest extends AbstractTestCase {
public InterfaceTest(String testName) {