You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/12/20 03:37:10 UTC
svn commit: r488892 - in /webservices/axis2/trunk/java/modules:
jaxws/test/org/apache/axis2/jaxws/description/
jaxws/test/org/apache/axis2/jaxws/framework/
metadata/test/org/apache/axis2/jaxws/description/
Author: dims
Date: Tue Dec 19 18:37:09 2006
New Revision: 488892
URL: http://svn.apache.org/viewvc?view=rev&rev=488892
Log:
Move One more test and remove moved test from the JAXWSTest
Added:
webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java
- copied, changed from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java
Removed:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java
Modified:
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java?view=diff&rev=488892&r1=488891&r2=488892
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DescriptionTestUtils.java Tue Dec 19 18:37:09 2006
@@ -21,18 +21,11 @@
import java.lang.reflect.Field;
import java.net.URL;
-import javax.jws.WebParam.Mode;
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.ws.Service;
-import org.apache.axis2.jaxws.description.builder.DescriptionBuilderComposite;
-import org.apache.axis2.jaxws.description.builder.MethodDescriptionComposite;
-import org.apache.axis2.jaxws.description.builder.ParameterDescriptionComposite;
-import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
-import org.apache.axis2.jaxws.description.builder.WebParamAnnot;
-import org.apache.axis2.jaxws.description.builder.WebServiceAnnot;
import org.apache.axis2.jaxws.spi.ServiceDelegate;
/**
@@ -98,66 +91,4 @@
return returnServiceDelegate;
}
- static public DescriptionBuilderComposite buildDBCNoEndpointInterface() {
-
- //Create a WebServiceAnnot
- String WSName = "EchoServiceAnnotated";
- String WSTargetNamespace = "http://description.jaxws.axis2.apache.org/";
- String WSServiceName = "EchoServiceName";
- //String WSWsdlLocation = "http://EchoService/wsdl";
- String WSWsdlLocation = "";
- String WSEndpointInterface = "";
- String WSPortName = "EchoServiceAnnotatedPort";
-
- WebServiceAnnot webServiceAnnot =
- WebServiceAnnot.createWebServiceAnnotImpl(
- WSName,
- WSTargetNamespace,
- WSServiceName,
- WSWsdlLocation,
- WSEndpointInterface,
- WSPortName);
-
- //Create a WebMethodAnnot
- String operationName = "echoStringMethod";
- String action = "urn:EchoStringMethod";
- boolean exclude = false;
-
- WebMethodAnnot webMethodAnnot = WebMethodAnnot.createWebMethodAnnotImpl();
- webMethodAnnot.setOperationName(operationName);
- webMethodAnnot.setAction(action);
- webMethodAnnot.setExclude(exclude);
-
- //Create the WebParamAnnot
- String WPName = "arg0";
- String WPPartName = "sku";
- String WPTargetNamespace = "http://description.jaxws.axis2.apache.org/";
- Mode WPMode = Mode.IN;
- boolean WPHeader = true;
-
- WebParamAnnot webParamAnnot = WebParamAnnot.createWebParamAnnotImpl();
- webParamAnnot.setName(WPName);
- webParamAnnot.setPartName(WPPartName);
- webParamAnnot.setMode(WPMode);
- webParamAnnot.setTargetNamespace(WPTargetNamespace);
- webParamAnnot.setHeader(WPHeader);
-
- //Build up the the DBC and all necessary composites
- ParameterDescriptionComposite pdc = new ParameterDescriptionComposite();
- pdc.setParameterType("java.lang.String");
- pdc.setWebParamAnnot(webParamAnnot);
-
- MethodDescriptionComposite mdc = new MethodDescriptionComposite();
- mdc.setWebMethodAnnot(webMethodAnnot);
- mdc.setMethodName(operationName);
- mdc.addParameterDescriptionComposite(pdc,0);
-
- DescriptionBuilderComposite dbc = new DescriptionBuilderComposite();
- dbc.setClassName("org.apache.axis2.samples.EchoServiceAnnotated");
- dbc.setWebServiceAnnot(webServiceAnnot);
- dbc.addMethodDescriptionComposite(mdc);
-
- return dbc;
- }
-
}
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=488892&r1=488891&r2=488892
==============================================================================
--- 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 Tue Dec 19 18:37:09 2006
@@ -28,8 +28,6 @@
import org.apache.axis2.jaxws.client.ProxySoapActionTests;
import org.apache.axis2.jaxws.databinding.BindingToProtocolTests;
import org.apache.axis2.jaxws.description.AnnotationDescriptionTests;
-import org.apache.axis2.jaxws.description.AnnotationServiceImplDescriptionTests;
-import org.apache.axis2.jaxws.description.AnnotationServiceImplWithDBCTests;
import org.apache.axis2.jaxws.description.GetDescFromBindingProvider;
import org.apache.axis2.jaxws.description.PartialWSDLTests;
import org.apache.axis2.jaxws.description.PortSelectionTests;
@@ -111,8 +109,6 @@
suite.addTestSuite(WSDLTests.class);
suite.addTestSuite(WSDLDescriptionTests.class);
suite.addTestSuite(AnnotationDescriptionTests.class);
- suite.addTestSuite(AnnotationServiceImplDescriptionTests.class);
- suite.addTestSuite(AnnotationServiceImplWithDBCTests.class);
suite.addTestSuite(PartialWSDLTests.class);
suite.addTestSuite(ValidateWSDLTests.class);
suite.addTestSuite(GetDescFromBindingProvider.class);
Copied: webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java (from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java?view=diff&rev=488892&p1=webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java&r1=488498&p2=webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java&r2=488892
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplWithDBCTests.java Tue Dec 19 18:37:09 2006
@@ -37,6 +37,11 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.jaxws.description.builder.DescriptionBuilderComposite;
+import org.apache.axis2.jaxws.description.builder.WebServiceAnnot;
+import org.apache.axis2.jaxws.description.builder.WebMethodAnnot;
+import org.apache.axis2.jaxws.description.builder.WebParamAnnot;
+import org.apache.axis2.jaxws.description.builder.ParameterDescriptionComposite;
+import org.apache.axis2.jaxws.description.builder.MethodDescriptionComposite;
import org.apache.ws.axis2.tests.EchoPort;
import org.apache.ws.axis2.tests.EchoServiceImplWithSEI;
@@ -60,7 +65,7 @@
//all necessary associated DBC's possibly including SEI and superclasses
HashMap<String, DescriptionBuilderComposite> dbcMap = new HashMap<String,DescriptionBuilderComposite>();
- DescriptionBuilderComposite dbc = DescriptionTestUtils.buildDBCNoEndpointInterface();
+ DescriptionBuilderComposite dbc = buildDBCNoEndpointInterface();
dbcMap.put(dbc.getClassName(), dbc);
@@ -132,6 +137,68 @@
// return (new EndpointInterfaceDescription());
// //return testEndpointInterfaceDesc;
//}
+
+ static public DescriptionBuilderComposite buildDBCNoEndpointInterface() {
+
+ //Create a WebServiceAnnot
+ String WSName = "EchoServiceAnnotated";
+ String WSTargetNamespace = "http://description.jaxws.axis2.apache.org/";
+ String WSServiceName = "EchoServiceName";
+ //String WSWsdlLocation = "http://EchoService/wsdl";
+ String WSWsdlLocation = "";
+ String WSEndpointInterface = "";
+ String WSPortName = "EchoServiceAnnotatedPort";
+
+ WebServiceAnnot webServiceAnnot =
+ WebServiceAnnot.createWebServiceAnnotImpl(
+ WSName,
+ WSTargetNamespace,
+ WSServiceName,
+ WSWsdlLocation,
+ WSEndpointInterface,
+ WSPortName);
+
+ //Create a WebMethodAnnot
+ String operationName = "echoStringMethod";
+ String action = "urn:EchoStringMethod";
+ boolean exclude = false;
+
+ WebMethodAnnot webMethodAnnot = WebMethodAnnot.createWebMethodAnnotImpl();
+ webMethodAnnot.setOperationName(operationName);
+ webMethodAnnot.setAction(action);
+ webMethodAnnot.setExclude(exclude);
+
+ //Create the WebParamAnnot
+ String WPName = "arg0";
+ String WPPartName = "sku";
+ String WPTargetNamespace = "http://description.jaxws.axis2.apache.org/";
+ WebParam.Mode WPMode = WebParam.Mode.IN;
+ boolean WPHeader = true;
+
+ WebParamAnnot webParamAnnot = WebParamAnnot.createWebParamAnnotImpl();
+ webParamAnnot.setName(WPName);
+ webParamAnnot.setPartName(WPPartName);
+ webParamAnnot.setMode(WPMode);
+ webParamAnnot.setTargetNamespace(WPTargetNamespace);
+ webParamAnnot.setHeader(WPHeader);
+
+ //Build up the the DBC and all necessary composites
+ ParameterDescriptionComposite pdc = new ParameterDescriptionComposite();
+ pdc.setParameterType("java.lang.String");
+ pdc.setWebParamAnnot(webParamAnnot);
+
+ MethodDescriptionComposite mdc = new MethodDescriptionComposite();
+ mdc.setWebMethodAnnot(webMethodAnnot);
+ mdc.setMethodName(operationName);
+ mdc.addParameterDescriptionComposite(pdc,0);
+
+ DescriptionBuilderComposite dbc = new DescriptionBuilderComposite();
+ dbc.setClassName("org.apache.axis2.samples.EchoServiceAnnotated");
+ dbc.setWebServiceAnnot(webServiceAnnot);
+ dbc.addMethodDescriptionComposite(mdc);
+
+ return dbc;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org