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 ba...@apache.org on 2006/11/03 20:50:36 UTC
svn commit: r470970 [2/2] - in /webservices/axis2/trunk/java/modules/jaxws:
src/org/apache/axis2/jaxws/description/
src/org/apache/axis2/jaxws/description/impl/
test/org/apache/axis2/jaxws/description/
test/org/apache/axis2/jaxws/description/impl/ test...
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceAnnotationTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceAnnotationTests.java?view=diff&rev=470970&r1=470969&r2=470970
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceAnnotationTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceAnnotationTests.java Fri Nov 3 11:50:33 2006
@@ -3,15 +3,17 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
+import org.apache.axis2.jaxws.description.EndpointDescriptionJava;
+
import junit.framework.TestCase;
public class ServiceAnnotationTests extends TestCase {
public void testWebServiceDefaults() {
String className = "WebServiceDefaultTest";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceDefaultTest.class);
- assertNotNull(testEndpointDesc.getWebServiceAnnotation());
- assertNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceDefaultTest.class);
+ assertNotNull(testEndpointDesc.getAnnoWebService());
+ assertNull(testEndpointDesc.getAnnoWebServiceProvider());
assertEquals(className, testEndpointDesc.getAnnoWebServiceName());
assertEquals("", testEndpointDesc.getAnnoWebServiceEndpointInterface());
assertEquals("http://description.jaxws.axis2.apache.org/", testEndpointDesc.getAnnoWebServiceTargetNamespace());
@@ -22,9 +24,9 @@
public void testWebServiceProviderDefaults() {
String className = "WebServiceProviderDefaultTest";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceProviderDefaultTest.class);
- assertNull(testEndpointDesc.getWebServiceAnnotation());
- assertNotNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceProviderDefaultTest.class);
+ assertNull(testEndpointDesc.getAnnoWebService());
+ assertNotNull(testEndpointDesc.getAnnoWebServiceProvider());
// name element not allowed on WebServiceProvider
assertEquals("", testEndpointDesc.getAnnoWebServiceName());
// EndpointInterface element not allowed on WebServiceProvider
@@ -37,9 +39,9 @@
public void testWebServiceName() {
String className = "WebServiceName";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceName.class);
- assertNotNull(testEndpointDesc.getWebServiceAnnotation());
- assertNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceName.class);
+ assertNotNull(testEndpointDesc.getAnnoWebService());
+ assertNull(testEndpointDesc.getAnnoWebServiceProvider());
assertEquals("WebServiceNameElement", testEndpointDesc.getAnnoWebServiceName());
assertEquals("", testEndpointDesc.getAnnoWebServiceEndpointInterface());
assertEquals("http://description.jaxws.axis2.apache.org/", testEndpointDesc.getAnnoWebServiceTargetNamespace());
@@ -51,9 +53,9 @@
public void testWebServiceNameAndPort() {
String className = "WebServiceNameAndPort";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceNameAndPort.class);
- assertNotNull(testEndpointDesc.getWebServiceAnnotation());
- assertNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceNameAndPort.class);
+ assertNotNull(testEndpointDesc.getAnnoWebService());
+ assertNull(testEndpointDesc.getAnnoWebServiceProvider());
assertEquals("WebServiceNameAndPortElement", testEndpointDesc.getAnnoWebServiceName());
assertEquals("", testEndpointDesc.getAnnoWebServiceEndpointInterface());
assertEquals("http://description.jaxws.axis2.apache.org/", testEndpointDesc.getAnnoWebServiceTargetNamespace());
@@ -65,9 +67,9 @@
public void testWebServiceAll() {
String className = "WebServiceAll";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceAll.class);
- assertNotNull(testEndpointDesc.getWebServiceAnnotation());
- assertNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceAll.class);
+ assertNotNull(testEndpointDesc.getAnnoWebService());
+ assertNull(testEndpointDesc.getAnnoWebServiceProvider());
assertEquals("WebServiceAllNameElement", testEndpointDesc.getAnnoWebServiceName());
assertEquals("org.apache.axis2.jaxws.description.MyEndpointInterface", testEndpointDesc.getAnnoWebServiceEndpointInterface());
assertEquals("http://namespace.target.jaxws.axis2.apache.org/", testEndpointDesc.getAnnoWebServiceTargetNamespace());
@@ -78,9 +80,9 @@
public void testWebServiceProviderAll() {
String className = "WebServiceProviderAll";
- EndpointDescriptionImpl testEndpointDesc = getEndpointDesc(WebServiceProviderAll.class);
- assertNull(testEndpointDesc.getWebServiceAnnotation());
- assertNotNull(testEndpointDesc.getWebServiceProviderAnnotation());
+ EndpointDescriptionJava testEndpointDesc = getEndpointDesc(WebServiceProviderAll.class);
+ assertNull(testEndpointDesc.getAnnoWebService());
+ assertNotNull(testEndpointDesc.getAnnoWebServiceProvider());
assertEquals("", testEndpointDesc.getAnnoWebServiceName());
assertEquals("", testEndpointDesc.getAnnoWebServiceEndpointInterface());
assertEquals("http://namespace.target.jaxws.axis2.apache.org/", testEndpointDesc.getAnnoWebServiceTargetNamespace());
@@ -93,7 +95,7 @@
/*
* Method to return the endpoint interface description for a given implementation class.
*/
- private EndpointDescriptionImpl getEndpointDesc(Class implementationClass) {
+ private EndpointDescriptionJava getEndpointDesc(Class implementationClass) {
// Use the description factory directly; this will be done within the JAX-WS runtime
ServiceDescription serviceDesc =
DescriptionFactory.createServiceDescriptionFromServiceImpl(implementationClass, null);
@@ -105,7 +107,7 @@
// TODO: How will the JAX-WS dispatcher get the appropriate port (i.e. endpoint)? Currently assumes [0]
EndpointDescription testEndpointDesc = endpointDesc[0];
- return (EndpointDescriptionImpl) testEndpointDesc;
+ return (EndpointDescriptionJava) testEndpointDesc;
}
}
Copied: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/impl/ServiceDescriptionTests.java (from r470831, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceDescriptionTests.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/impl/ServiceDescriptionTests.java?view=diff&rev=470970&p1=webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceDescriptionTests.java&r1=470831&p2=webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/impl/ServiceDescriptionTests.java&r2=470970
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/ServiceDescriptionTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/impl/ServiceDescriptionTests.java Fri Nov 3 11:50:33 2006
@@ -16,12 +16,15 @@
*/
-package org.apache.axis2.jaxws.description;
+package org.apache.axis2.jaxws.description.impl;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
+
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.description.impl.ServiceDescriptionImpl;
import junit.framework.TestCase;
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java?view=diff&rev=470970&r1=470969&r2=470970
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java Fri Nov 3 11:50:33 2006
@@ -28,10 +28,10 @@
import org.apache.axis2.jaxws.description.AnnotationServiceImplDescriptionTests;
import org.apache.axis2.jaxws.description.AnnotationServiceImplWithDBCTests;
import org.apache.axis2.jaxws.description.ServiceAnnotationTests;
-import org.apache.axis2.jaxws.description.ServiceDescriptionTests;
import org.apache.axis2.jaxws.description.WSDLDescriptionTests;
import org.apache.axis2.jaxws.description.WSDLTests;
import org.apache.axis2.jaxws.description.builder.DescriptionBuilderTests;
+import org.apache.axis2.jaxws.description.impl.ServiceDescriptionTests;
import org.apache.axis2.jaxws.dispatch.SOAP12Dispatch;
import org.apache.axis2.jaxws.exception.ExceptionFactoryTests;
import org.apache.axis2.jaxws.handler.HandlerChainProcessorTests;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org