You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2007/01/24 03:35:29 UTC
svn commit: r499213 [2/2] - in /incubator/woden/trunk/java:
src/org/apache/woden/ src/org/apache/woden/ant/
src/org/apache/woden/internal/ test/org/apache/woden/
test/org/apache/woden/resolver/ test/org/apache/woden/tests/
test/org/apache/woden/wsdl20/...
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -29,7 +29,6 @@
import org.apache.woden.wsdl20.BindingFault;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of HTTPBindingFaultExtensions.
@@ -63,9 +62,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding[] bindings = descComp.getBindings();
assertEquals("The Description should contain 1 Binding component.", 1, bindings.length);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -30,7 +30,6 @@
import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of HTTPBindingMessageReferenceExtensions.
@@ -63,9 +62,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding[] bindings = descComp.getBindings();
assertEquals("The Description should contain 1 Binding component.", 1, bindings.length);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -15,7 +15,6 @@
*/
package org.apache.woden.wsdl20.extensions.http;
-import java.net.URI;
import java.net.URL;
import junit.framework.Test;
@@ -30,7 +29,6 @@
import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of HTTPBindingOperationExtensions.
@@ -63,9 +61,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding[] bindings = descComp.getBindings();
assertEquals("The Description should contain 1 Binding component.", 1, bindings.length);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -29,7 +29,6 @@
import org.apache.woden.wsdl20.Endpoint;
import org.apache.woden.wsdl20.Service;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of HTTPEndpointExtensions.
@@ -63,9 +62,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- DescriptionElement descElem = reader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", descElem);
- Description descComp = descElem.toComponent();
+ Description descComp = reader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Service service = descComp.getServices()[0];
assertNotNull("The Description should contain 1 Service component.",
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -29,7 +29,6 @@
import org.apache.woden.wsdl20.Binding;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of SoapBindingExtensions.
@@ -42,7 +41,6 @@
private WSDLFactory fFactory = null;
private WSDLReader fReader = null;
private ErrorHandler fHandler = null;
- private DescriptionElement fDescElem = null;
private SOAPBindingExtensions fSoapBindExts = null;
private SOAPBindingExtensions fSoapBind2Exts = null;
@@ -64,9 +62,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- fDescElem = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", fDescElem);
- Description descComp = fDescElem.toComponent();
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding binding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", binding);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -32,7 +32,6 @@
import org.apache.woden.wsdl20.BindingFault;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of SoapBindingFaultExtensions.
@@ -45,7 +44,6 @@
private WSDLFactory fFactory = null;
private WSDLReader fReader = null;
private ErrorHandler fHandler = null;
- private DescriptionElement fDescElem = null;
private Binding fBinding = null;
private String fWsdlPath = "org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingFaultExtensions.wsdl";
@@ -70,9 +68,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- fDescElem = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", fDescElem);
- Description descComp = fDescElem.toComponent();
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
fBinding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", fBinding);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -32,7 +32,6 @@
import org.apache.woden.wsdl20.InterfaceFaultReference;
import org.apache.woden.wsdl20.enumeration.Direction;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of SoapBindingFaultReferenceExtensions.
@@ -45,7 +44,6 @@
private WSDLFactory fFactory = null;
private WSDLReader fReader = null;
private ErrorHandler fHandler = null;
- private DescriptionElement fDescElem = null;
private BindingOperation fBindOper = null;
private String fWsdlPath = "org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingFaultReferenceExtensions.wsdl";
@@ -70,9 +68,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- fDescElem = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", fDescElem);
- Description descComp = fDescElem.toComponent();
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding binding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", binding);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -32,7 +32,6 @@
import org.apache.woden.wsdl20.enumeration.Direction;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of SoapBindingMessageReferenceExtensions.
@@ -45,7 +44,6 @@
private WSDLFactory fFactory = null;
private WSDLReader fReader = null;
private ErrorHandler fHandler = null;
- private DescriptionElement fDescElem = null;
private BindingOperation fBindOper = null;
private String fWsdlPath = "org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingMessageReferenceExtensions.wsdl";
@@ -70,9 +68,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- fDescElem = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", fDescElem);
- Description descComp = fDescElem.toComponent();
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding binding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", binding);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java Tue Jan 23 18:35:28 2007
@@ -30,7 +30,6 @@
import org.apache.woden.wsdl20.BindingOperation;
import org.apache.woden.wsdl20.Description;
import org.apache.woden.wsdl20.extensions.ComponentExtensions;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
* Functional verification test of SoapBindingOperationExtensions.
@@ -43,7 +42,6 @@
private WSDLFactory fFactory = null;
private WSDLReader fReader = null;
private ErrorHandler fHandler = null;
- private DescriptionElement fDescElem = null;
private BindingOperation fBindOper = null;
private BindingOperation fBind2Oper = null;
@@ -69,9 +67,8 @@
assertNotNull("Failed to find the WSDL document on the classpath using the path: " + fWsdlPath + ".",
wsdlURL);
- fDescElem = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a WSDL description.", fDescElem);
- Description descComp = fDescElem.toComponent();
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a WSDL description.", descComp);
Binding binding = descComp.getBindings()[0];
assertNotNull("The Description does not contain a Binding.", binding);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/EndpointElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/EndpointElementTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/EndpointElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/EndpointElementTest.java Tue Jan 23 18:35:28 2007
@@ -30,6 +30,7 @@
import org.apache.woden.internal.wsdl20.EndpointImpl;
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.Description;
/**
* Functional verification test of org.apache.woden.wsdl20.xml.EndpointElement.
@@ -63,8 +64,9 @@
"org/apache/woden/wsdl20/xml/resources/EndpointElementTest.wsdl");
assertNotNull("Failed to find the WSDL document on the classpath.", wsdlURL);
- fParsedDesc = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a description.", fParsedDesc);
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a description.", descComp);
+ fParsedDesc = descComp.toElement();
ServiceElement service = fParsedDesc.getServiceElements()[0];
assertNotNull("The description does not contain a service.", service);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMEndpointElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMEndpointElementTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMEndpointElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMEndpointElementTest.java Tue Jan 23 18:35:28 2007
@@ -30,6 +30,7 @@
import org.apache.woden.internal.wsdl20.EndpointImpl;
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.Description;
/**
* Functional verification test of org.apache.woden.wsdl20.xml.EndpointElement.
@@ -60,8 +61,9 @@
"org/apache/woden/wsdl20/xml/resources/EndpointElementTest.wsdl");
assertNotNull("Failed to find the WSDL document on the classpath.", wsdlURL);
- fParsedDesc = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a description.", fParsedDesc);
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a description.", descComp);
+ fParsedDesc = descComp.toElement();
ServiceElement service = fParsedDesc.getServiceElements()[0];
assertNotNull("The description does not contain a service.", service);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMServiceElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMServiceElementTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMServiceElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/OMServiceElementTest.java Tue Jan 23 18:35:28 2007
@@ -28,10 +28,10 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
import org.apache.woden.internal.wsdl20.DescriptionImpl;
-import org.apache.woden.internal.wsdl20.EndpointImpl;
import org.apache.woden.internal.wsdl20.ServiceImpl;
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.Description;
/**
* Functional verification test of org.apache.woden.wsdl20.xml.ServiceElement.
@@ -63,8 +63,9 @@
"org/apache/woden/wsdl20/xml/resources/ServiceElementTest.wsdl");
assertNotNull("Failed to find the WSDL document on the classpath.", wsdlURL);
- fParsedDesc = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a description.", fParsedDesc);
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a description.", descComp);
+ fParsedDesc = descComp.toElement();
fParsedService = fParsedDesc.getServiceElements()[0];
assertNotNull("The description does not contain a service.", fParsedService);
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java?view=diff&rev=499213&r1=499212&r2=499213
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/ServiceElementTest.java Tue Jan 23 18:35:28 2007
@@ -28,10 +28,10 @@
import org.apache.woden.WSDLFactory;
import org.apache.woden.WSDLReader;
import org.apache.woden.internal.wsdl20.DescriptionImpl;
-import org.apache.woden.internal.wsdl20.EndpointImpl;
import org.apache.woden.internal.wsdl20.ServiceImpl;
import org.apache.woden.tests.TestErrorHandler;
import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.Description;
/**
* Functional verification test of org.apache.woden.wsdl20.xml.ServiceElement.
@@ -66,8 +66,9 @@
"org/apache/woden/wsdl20/xml/resources/ServiceElementTest.wsdl");
assertNotNull("Failed to find the WSDL document on the classpath.", wsdlURL);
- fParsedDesc = fReader.readWSDL(wsdlURL.toString());
- assertNotNull("The reader did not return a description.", fParsedDesc);
+ Description descComp = fReader.readWSDL(wsdlURL.toString());
+ assertNotNull("The reader did not return a description.", descComp);
+ fParsedDesc = descComp.toElement();
fParsedService = fParsedDesc.getServiceElements()[0];
assertNotNull("The description does not contain a service.", fParsedService);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org