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 ba...@apache.org on 2007/02/06 23:29:46 UTC
svn commit: r504338 - in /webservices/axis2/trunk/java/modules: jaxws/
jaxws/src/org/apache/axis2/jaxws/server/dispatcher/
jaxws/test/org/apache/axis2/jaxws/framework/
metadata/src/org/apache/axis2/jaxws/description/impl/
Author: barrettj
Date: Tue Feb 6 14:29:45 2007
New Revision: 504338
URL: http://svn.apache.org/viewvc?view=rev&rev=504338
Log:
Add toString() methods on the Description classes that print out detailed information about each object. When debug is enabled
this will be done from the DescriptionFactory and from the JavaBeanDispather.
Also temporarily removed the ParallelAsyncTest that fails intermittently with logs enabled and on Linux.
Modified:
webservices/axis2/trunk/java/modules/jaxws/project.properties
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
Modified: webservices/axis2/trunk/java/modules/jaxws/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.properties?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.properties (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.properties Tue Feb 6 14:29:45 2007
@@ -19,7 +19,7 @@
# -------------------------------------------------------------------
# JUnit
# -------------------------------------------------------------------
-maven.junit.jvmargs=-Xmx256m -Djava.awt.headless=true -Dbuild.repository=./target/test-classes
+maven.junit.jvmargs=-Xmx512m -Djava.awt.headless=true -Dbuild.repository=./target/test-classes
maven.junit.fork=true
# -------------------------------------------------------------------
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java Tue Feb 6 14:29:45 2007
@@ -45,7 +45,6 @@
public class JavaBeanDispatcher extends JavaDispatcher {
private static final Log log = LogFactory.getLog(JavaBeanDispatcher.class);
- private static final boolean debug = log.isDebugEnabled();
private EndpointDescription endpointDesc = null;
@@ -58,7 +57,7 @@
* @see org.apache.axis2.jaxws.server.EndpointDispatcher#invoke(org.apache.axis2.jaxws.core.MessageContext)
*/
public MessageContext invoke(MessageContext mc) throws Exception {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug("Preparing to invoke service endpoint implementation " +
"class: " + serviceImplClass.getName());
}
@@ -71,6 +70,11 @@
MethodMarshaller methodMarshaller = getMethodMarshaller(mc.getMessage().getProtocol(), mc.getOperationDescription());
Object[] methodInputParams = methodMarshaller.demarshalRequest(mc.getMessage(), mc.getOperationDescription());
Method target = getJavaMethod(mc, serviceImplClass);
+ if (log.isDebugEnabled()) {
+ // At this point, the OpDesc includes everything we know, including the actual method
+ // on the service impl we will delegate to; it was set by getJavaMethod(...) above.
+ log.debug("JavaBeanDispatcher about to invoke using OperationDesc: " + operationDesc.toString());
+ }
//At this point, we have the method that is going to be invoked and
//the parameter data to invoke it with, so we use the instance and
@@ -84,7 +88,7 @@
} catch (Exception e) {
faultThrown = true;
fault = e;
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug("Exception invoking a method of " +
serviceImplClass.toString() + " of instance " +
serviceInstance.toString());
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=504338&r1=504337&r2=504338
==============================================================================
--- 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 Feb 6 14:29:45 2007
@@ -79,6 +79,8 @@
static {
// Uncomment the following line to enable debug
+ // Note you will probably need to increase the java heap size, for example
+ // -Xmx512m. This can be done by setting maven.junit.jvmargs in project.properties.
// BasicConfigurator.configure();
}
@@ -139,7 +141,8 @@
suite.addTestSuite(WrapTests.class);
suite.addTestSuite(NonAnonymousComplexTypeTests.class);
suite.addTestSuite(AddNumbersTests.class);
- suite.addTestSuite(ParallelAsyncTests.class);
+ // TODO: This test intermittently fails on Linux and with trace enabled.
+// suite.addTestSuite(ParallelAsyncTests.class);
suite.addTestSuite(FaultyWebServiceTests.class);
suite.addTestSuite(FaultsServiceTests.class);
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java Tue Feb 6 14:29:45 2007
@@ -56,14 +56,25 @@
public static ServiceDescription createServiceDescription(URL wsdlURL,
QName serviceQName, Class serviceClass) {
- return new ServiceDescriptionImpl(wsdlURL, serviceQName, serviceClass);
+ ServiceDescription serviceDesc = new ServiceDescriptionImpl(wsdlURL, serviceQName, serviceClass);
+
+ if (log.isDebugEnabled()) {
+ log.debug("ServiceDescription created with WSDL URL: " + wsdlURL + "; QName: " + serviceQName + "; Class: " + serviceClass);
+ log.debug(serviceDesc.toString());
+ }
+ return serviceDesc;
}
// TODO: Taking an AxisService is only temporary; the AxisService should be
// created when creating the ServiceDesc
public static ServiceDescription createServiceDescriptionFromServiceImpl(
Class serviceImplClass, AxisService axisService) {
- return new ServiceDescriptionImpl(serviceImplClass, axisService);
+ ServiceDescription serviceDesc = new ServiceDescriptionImpl(serviceImplClass, axisService);
+ if (log.isDebugEnabled()) {
+ log.debug("ServiceDescription created with Class: " + serviceImplClass + "; AxisService: " + axisService);
+ log.debug(serviceDesc.toString());
+ }
+ return serviceDesc;
}
// TODO: Determine whether this method is necessary...we may want to always
@@ -84,6 +95,9 @@
ServiceDescriptionValidator validator = new ServiceDescriptionValidator(serviceDescription);
if (validator.validate()) {
serviceDescriptionList.add(serviceDescription);
+ if (log.isDebugEnabled()) {
+ log.debug("Service Description created from DescriptionComposite: " + serviceDescription);
+ }
}
else {
@@ -93,7 +107,7 @@
if (log.isDebugEnabled()) {
log.debug("Validation Phase 2 failure: " + msg);
log.debug("Failing composite: " + serviceImplComposite.toString());
-
+ log.debug("Failing Service Description: " + serviceDescription.toString());
}
// TODO: Validate all service descriptions before failing
@@ -125,6 +139,9 @@
ServiceDescription.UpdateType updateType) {
EndpointDescription endpointDesc =
((ServiceDescriptionImpl) serviceDescription).updateEndpointDescription(sei, portQName, updateType);
+ if (log.isDebugEnabled()) {
+ log.debug("EndpointDescription updated: " + endpointDesc);
+ }
return endpointDesc;
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java Tue Feb 6 14:29:45 2007
@@ -147,10 +147,6 @@
int startOfClassIndex = endOfPackageIndex + 1;
returnName = fqName.substring(startOfClassIndex);
}
- else {
- // TODO: RAS and NLS
- throw new UnsupportedOperationException("Java class is null");
- }
return returnName;
}
@@ -170,10 +166,6 @@
int startOfClassIndex = endOfPackageIndex + 1;
returnName = fqName.substring(startOfClassIndex);
}
- else {
- // TODO: RAS and NLS
- throw new UnsupportedOperationException("Java class is null");
- }
return returnName;
}
@@ -193,10 +185,6 @@
returnPackage = fqName.substring(0, endOfPackageIndex);
}
}
- else {
- // TODO: RAS and NLS
- throw new UnsupportedOperationException("Java class is null");
- }
return returnPackage;
}
@@ -215,10 +203,6 @@
returnPackage = fqName.substring(0, endOfPackageIndex);
}
}
- else {
- // TODO: RAS and NLS
- throw new UnsupportedOperationException("Java class is null");
- }
return returnPackage;
}
@@ -339,6 +323,9 @@
static final String JAXWS_SUBPACKAGE = "jaxws";
static String determineActualAritfactPackage(String wrapperClassName) {
String returnWrapperClassName = null;
+ if (wrapperClassName == null) {
+ return returnWrapperClassName;
+ }
// Try to load the class that was passed in
try {
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -1472,8 +1472,60 @@
}
}
return wsdlComposite;
- }
-
+ }
+
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ StringBuffer string = new StringBuffer();
+
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Name: " + getName());
+ string.append(sameline);
+ string.append("Endpoint Address: " + getEndpointAddress());
+ //
+ string.append(newline);
+ string.append("ServiceQName: " + getServiceQName());
+ string.append(sameline);
+ string.append("PortQName: " + getPortQName());
+ string.append(sameline);
+ string.append("TargetNamespace: " + getTargetNamespace());
+ //
+ string.append(newline);
+ string.append("Service Mode: " + getServiceMode());
+ string.append(sameline);
+ string.append("Binding Type: " + getBindingType());
+ string.append(sameline);
+ string.append("Client Binding Type: " + getClientBindingID());
+ //
+ string.append(newline);
+ string.append("Is provider-based: " + (isProviderBased() == true));
+ string.append(sameline);
+ string.append("Is proxy-based: " + (isEndpointBased() == true));
+ string.append(sameline);
+ string.append("Is WSDL fully specified: " + (isWSDLFullySpecified() == true));
+ //
+ string.append(newline);
+ string.append("Handler List: " + getHandlerList());
+ //
+ string.append(newline);
+ string.append("Packages: " + getPackages());
+ //
+ string.append(newline);
+ string.append("AxisService: " + getAxisService());
+ //
+ string.append(newline);
+ EndpointInterfaceDescription endpointInterfaceDesc = getEndpointInterfaceDescription();
+ if (endpointInterfaceDesc != null) {
+ string.append("EndpointInterfaceDescription: " + endpointInterfaceDesc.toString());
+ }
+ else {
+ string.append("EndpointInterfaceDescription is null.");
+ }
+
+ return string.toString();
+ }
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -747,5 +747,39 @@
String tns = getTargetNamespace();
return new QName(tns, name);
}
+
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ StringBuffer string = new StringBuffer();
+
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Name: " + getName());
+ string.append(sameline);
+ string.append("PortType: " + getPortType());
+ //
+ string.append(newline);
+ string.append("SOAP Style: " + getSoapBindingStyle());
+ string.append(sameline);
+ string.append("SOAP Use: " + getSoapBindingUse());
+ string.append(sameline);
+ string.append("SOAP Paramater Style: " + getSoapBindingParameterStyle());
+ //
+ string.append(newline);
+ OperationDescription[] operations = getOperations();
+ if (operations != null && operations.length > 0) {
+ string.append("Number of operations: " + operations.length);
+ for (OperationDescription operation : operations) {
+ string.append(newline);
+ string.append("Operation: " + operation.toString());
+ }
+ }
+ else {
+ string.append("OperationDescription array is null");
+ }
+
+ return string.toString();
+ }
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -257,5 +257,20 @@
else
return false;
}
-
+
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ StringBuffer string = new StringBuffer();
+
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Name: " + getName());
+ string.append(newline);
+ string.append("Fault Bean: " + getFaultBean());
+ string.append(newline);
+ string.append("Exception class: " + getExceptionClassName());
+
+ return string.toString();
+ }
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -56,6 +56,8 @@
import org.apache.axis2.jaxws.description.builder.OneWayAnnot;
import org.apache.axis2.jaxws.description.builder.ParameterDescriptionComposite;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @see ../OperationDescription
@@ -80,7 +82,7 @@
private MethodDescriptionComposite methodComposite;
private ParameterDescription[] parameterDescriptions;
private FaultDescription[] faultDescriptions;
-
+ private static final Log log = LogFactory.getLog(OperationDescriptionImpl.class);
// ===========================================
// ANNOTATION related information
// ===========================================
@@ -445,6 +447,9 @@
private static String determineOperationName(Method javaMethod) {
String operationName = null;
+ if (javaMethod == null) {
+ return null;
+ }
WebMethod wmAnnotation = javaMethod.getAnnotation(WebMethod.class);
// Per JSR-181 MR Sec 4.2 "Annotation: javax.jws.WebMethod" pg 17,
@@ -465,6 +470,9 @@
private static String determineOperationName(MethodDescriptionComposite mdc) {
String operationName = null;
+ if (mdc == null) {
+ return null;
+ }
WebMethod wmAnnotation = mdc.getWebMethodAnnot();
if (wmAnnotation != null && !DescriptionUtils.isEmpty(wmAnnotation.operationName())) {
operationName = wmAnnotation.operationName();
@@ -482,10 +490,12 @@
}
public String getAnnoWebMethodOperationName() {
if (webMethodOperationName == null) {
- if (!isDBC())
+ if (!isDBC() && seiMethod != null) {
webMethodOperationName = determineOperationName(seiMethod);
- else
- webMethodOperationName = determineOperationName(methodComposite);
+ }
+ else if (methodComposite != null) {
+ webMethodOperationName = determineOperationName(methodComposite);
+ }
}
return webMethodOperationName;
}
@@ -533,11 +543,15 @@
// ==========================================
public RequestWrapper getAnnoRequestWrapper() {
if (requestWrapperAnnotation == null) {
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
requestWrapperAnnotation = seiMethod.getAnnotation(RequestWrapper.class);
- } else {
+ } else if (isDBC() && methodComposite != null){
requestWrapperAnnotation = methodComposite.getRequestWrapperAnnot();
- }
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get RequestWrapper annotation");
+ }
+ }
}
return requestWrapperAnnotation;
}
@@ -618,16 +632,20 @@
// the JAX-WS spec, BUT Conformance(Using javax.xml.ws.RequestWrapper) in Sec 2.3.1.2 on p. 13
// says the entire annotation "...MAY be omitted if all its properties would have default vaules."
// implying there IS some sort of default. We'll try this for now:
- if (isDBC()) {
+ if (isDBC() && methodComposite != null) {
String declaringClazz = this.methodComposite.getDeclaringClass();
String packageName = declaringClazz.substring(0, declaringClazz.lastIndexOf("."));
requestWrapperClassName = packageName + "." + DescriptionUtils.javaMethodtoClassName(methodComposite.getMethodName());
- } else {
+ } else if (!isDBC() && seiMethod != null) {
Class clazz = seiMethod.getDeclaringClass();
String packageName = clazz.getPackage().getName();
String className = DescriptionUtils.javaMethodtoClassName(seiMethod.getName());
requestWrapperClassName = packageName + "." + className;
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get RequestWrapper classname");
+ }
}
requestWrapperClassName = DescriptionUtils.determineActualAritfactPackage(requestWrapperClassName);
}
@@ -640,10 +658,14 @@
// ===========================================
public ResponseWrapper getAnnoResponseWrapper() {
if (responseWrapperAnnotation == null) {
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
responseWrapperAnnotation = seiMethod.getAnnotation(ResponseWrapper.class);
- } else {
+ } else if (isDBC() && methodComposite != null){
responseWrapperAnnotation = methodComposite.getResponseWrapperAnnot();
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get ResponseWrapper annotation");
+ }
}
}
return responseWrapperAnnotation;
@@ -724,18 +746,23 @@
// the JAX-WS spec, BUT Conformance(Using javax.xml.ws.ResponseWrapper) in Sec 2.3.1.2 on p. 13
// says the entire annotation "...MAY be omitted if all its properties would have default vaules."
// implying there IS some sort of default. We'll try this for now:
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
Class clazz = seiMethod.getDeclaringClass();
String packageName = clazz.getPackage().getName();
String className = DescriptionUtils.javaMethodtoClassName(seiMethod.getName());
responseWrapperClassName = packageName + "." + className + "Response";
- } else {
+ } else if (methodComposite != null) {
//JAXWS Spec is not clear on what default should be added. We think its the endpoint impls package + OperationName + Response.
//In situation where wsGen uses sei's package to store jaxb bean.
String declaringClazz = methodComposite.getDeclaringClass();
String packageName = declaringClazz.substring(0, declaringClazz.lastIndexOf("."));
responseWrapperClassName = packageName + "." + DescriptionUtils.javaMethodtoClassName(methodComposite.getMethodName()) + "Response";
}
+ else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get ResponseWrapper annotation class name");
+ }
+ }
responseWrapperClassName = DescriptionUtils.determineActualAritfactPackage(responseWrapperClassName);
}
}
@@ -877,12 +904,15 @@
// ===========================================
public WebResult getAnnoWebResult() {
if (webResultAnnotation == null) {
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
webResultAnnotation = seiMethod.getAnnotation(WebResult.class);
- } else {
+ } else if (methodComposite != null){
webResultAnnotation = methodComposite.getWebResultAnnot();
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get WebResult annotation");
+ }
}
-
}
return webResultAnnotation;
}
@@ -894,14 +924,18 @@
public boolean isOperationReturningResult() {
boolean isResult = false;
if (!isAnnoOneWay()) {
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
if (seiMethod.getReturnType() != Void.TYPE) {
isResult = true;
}
- } else {
+ } else if (methodComposite != null){
if (!DescriptionUtils.isEmpty(methodComposite.getReturnType()) &&
!methodComposite.getReturnType().equals("void"))
isResult = true;
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("No class to determine if result is returned");
+ }
}
}
return isResult;
@@ -1010,10 +1044,14 @@
// TODO: VALIDATION: Only style of DOCUMENT allowed on Method annotation; remember to check the Type's style setting also
// JSR-181 Sec 4.7 p. 28
if (soapBindingAnnotation == null) {
- if (!isDBC()) {
+ if (!isDBC() && seiMethod != null) {
soapBindingAnnotation = seiMethod.getAnnotation(SOAPBinding.class);
- } else {
+ } else if (isDBC() && methodComposite != null){
soapBindingAnnotation = methodComposite.getSoapBindingAnnot();
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get SOAP Binding annotation");
+ }
}
}
return soapBindingAnnotation;
@@ -1078,12 +1116,17 @@
// it will always be null, should consider relying on 'isOneWay'
if (onewayAnnotation == null) {
- if (isDBC()) {
+ if (isDBC() && methodComposite != null) {
if (methodComposite.isOneWay()) {
onewayAnnotation = OneWayAnnot.createOneWayAnnotImpl();
}
- } else
+ } else if (!isDBC() && seiMethod != null) {
onewayAnnotation = seiMethod.getAnnotation(Oneway.class);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get OneWay annotation");
+ }
+ }
}
return onewayAnnotation;
}
@@ -1118,14 +1161,20 @@
* @see org.apache.axis2.jaxws.description.OperationDescription#getResultType()
*/
public Class getResultType() {
-
- if (!isDBC()) {
+ Class returnClass = null;
+ if (!isDBC() && getSEIMethod() != null) {
Method seiMethod = this.getSEIMethod();
- return seiMethod.getReturnType();
+ returnClass = seiMethod.getReturnType();
}
+ else if (methodComposite != null) {
+ returnClass = methodComposite.getReturnTypeClass();
+ }
else {
- return methodComposite.getReturnTypeClass();
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to get result type from null class");
+ }
}
+ return returnClass;
}
/* (non-Javadoc)
@@ -1137,6 +1186,9 @@
// But we shouldn't get an async OpDesc on the service since getDispatchableOperation(QN) removes them.
Class returnType = getResultType();
+ if (returnType == null) {
+ return null;
+ }
if(isJAXWSAsyncClientMethod()){
//pooling implementation
if(Response.class == returnType){
@@ -1239,6 +1291,16 @@
return answer;
}
+ /**
+ * Return the Service Implementation method for this operation IFF it has been set by
+ * a previous call to getMethodFromServiceImpl(Class serviceImplClass). Otherwise
+ * a null is returned.
+ * @return
+ */
+ private Method getMethodFromServiceImpl() {
+ return serviceImplMethod;
+
+ }
public Method getMethodFromServiceImpl(Class serviceImpl) {
// TODO: This doesn't support overloaded methods in the service impl This is
@@ -1320,5 +1382,88 @@
type = pd.getParameterActualType().getName();
}
return type;
+ }
+
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ StringBuffer string = new StringBuffer();
+
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Name: " + getName());
+ string.append(sameline);
+ string.append("Operation Name: " + getOperationName());
+ string.append(sameline);
+ string.append("Action: " + getAction());
+ //
+ string.append(newline);
+ string.append("Operation excluded: " + (isExcluded() == true));
+ string.append(sameline);
+ string.append("Is oneway: " + (isOneWay() == true));
+ string.append(sameline);
+ string.append("Is returning result: " + (isOperationReturningResult() == true));
+ string.append(sameline);
+ string.append("Is result header: " + (isResultHeader() == true));
+ string.append(sameline);
+ string.append("Is JAXWS Client Async method: " + (isJAXWSAsyncClientMethod() == true));
+ //
+ string.append(newline);
+ string.append("SOAP Style: " + getSoapBindingStyle());
+ string.append(sameline);
+ string.append("SOAP Use: " + getSoapBindingUse());
+ string.append(sameline);
+ string.append("SOAP Paramater Style: " + getSoapBindingParameterStyle());
+ //
+ string.append(newline);
+ string.append("Result name: " + getResultName());
+ string.append(sameline);
+ string.append("Result part name: " + getResultPartName());
+ string.append(sameline);
+ string.append("Result type: " + getResultType());
+ string.append(sameline);
+ string.append("Result actual type: " + getResultActualType());
+ //
+ string.append(newline);
+ string.append("Request Wrapper class: " + getRequestWrapperClassName());
+ string.append(sameline);
+ string.append("Response Wrapper class: " + getResponseWrapperClassName());
+ //
+ string.append(newline);
+ string.append("Java method name: " + getJavaMethodName());
+ string.append(newline);
+ string.append("Java paramaters: " + getJavaParameters());
+ string.append(newline);
+ string.append("Service Implementation method: " + getMethodFromServiceImpl());
+ string.append(newline);
+ string.append("Axis Operation: " + getAxisOperation());
+
+ string.append(newline);
+ ParameterDescription[] paramDescs = getParameterDescriptions();
+ if (paramDescs != null && paramDescs.length > 0) {
+ string.append("Number of Parameter Descriptions: " + paramDescs.length);
+ for (ParameterDescription paramDesc : paramDescs) {
+ string.append(newline);
+ string.append("Parameter Description: " + paramDesc.toString());
+ }
+ }
+ else {
+ string.append("No Paramater Descriptions");
+ }
+
+ string.append(newline);
+ FaultDescription[] faultDescs = getFaultDescriptions();
+ if (faultDescs != null && faultDescs.length > 0) {
+ string.append("Number of Fault Descriptions: " + faultDescs.length);
+ for (FaultDescription faultDesc : faultDescs) {
+ string.append(newline);
+ string.append("Fault Description: " + faultDesc.toString());
+ }
+ }
+ else {
+ string.append("No Fault Descriptions");
+ }
+
+ return string.toString();
}
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ParameterDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -326,4 +326,29 @@
}
return webParamHeader.booleanValue();
}
+
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ StringBuffer string = new StringBuffer();
+
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Name: " + getParameterName());
+ //
+ string.append(newline);
+ string.append("Is header: " + (isHeader() == true));
+ string.append(sameline);
+ string.append("Is holder: " + (isHolderType() == true));
+ //
+ string.append(newline);
+ string.append("Mode: " + getMode());
+ //
+ string.append(newline);
+ string.append("Type: " + getParameterType());
+ string.append(sameline);
+ string.append("Actual type: " + getParameterActualType());
+
+ return string.toString();
+ }
}
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?view=diff&rev=504338&r1=504337&r2=504338
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Tue Feb 6 14:29:45 2007
@@ -490,6 +490,10 @@
return wsdlURL;
}
+ /**
+ * TODO: This method should be replaced with specific methods for getWSDLGenerated... similar
+ * to how getWsdlWrapper should be replaced.
+ */
public WSDLWrapper getGeneratedWsdlWrapper() {
return this.generatedWsdlWrapper;
}
@@ -955,9 +959,17 @@
}
public boolean isWSDLSpecified() {
- return getWSDLWrapper().getDefinition() != null;
+ boolean wsdlSpecified = false;
+ if (getWSDLWrapper() != null) {
+ wsdlSpecified = (getWSDLWrapper().getDefinition() != null);
+ }
+ return wsdlSpecified;
}
+ /**
+ * Returns the WSDL definiton as specified in the metadata. Note that this
+ * WSDL may not be complete.
+ */
public Definition getWSDLDefinition() {
Definition defn = null;
if (getWSDLWrapper() != null) {
@@ -965,6 +977,17 @@
}
return defn;
}
+ /**
+ * Returns the WSDL definiton as created by calling the WSDL generator. This will be null
+ * unless the WSDL definition provided by the metadata is incomplete
+ */
+ public Definition getWSDLGeneratedDefinition() {
+ Definition defn = null;
+ if (getGeneratedWsdlWrapper() != null) {
+ defn = getGeneratedWsdlWrapper().getDefinition();
+ }
+ return defn;
+ }
public Service getWSDLService() {
Service returnWSDLService = null;
@@ -1050,4 +1073,66 @@
return portsUsingAddress;
}
+ /**
+ * Return a string representing this Description object and all the objects
+ * it contains.
+ */
+ public String toString() {
+ final String newline = "\n";
+ final String sameline = "; ";
+ // This produces a TREMENDOUS amount of output if we have the WSDL Definition objects
+ // do a toString on themselves.
+ boolean dumpWSDLContents = false;
+ StringBuffer string = new StringBuffer();
+
+ // Basic information
+ string.append(super.toString());
+ string.append(newline);
+ string.append("ServiceQName: " + getServiceQName());
+ // WSDL information
+ string.append(newline);
+ string.append("isWSDLSpecified: " + isWSDLSpecified());
+ string.append(sameline);
+ string.append("WSDL Location: " + getWSDLLocation());
+ string.append(newline);
+ if (dumpWSDLContents) {
+ string.append("WSDL Definition: " + getWSDLDefinition());
+ string.append(newline);
+ string.append("Generated WSDL Definition: " + getWSDLGeneratedDefinition());
+ }
+ else {
+ string.append("WSDL Definition available: " + (getWSDLDefinition() != null));
+ string.append(sameline);
+ string.append("Generated WSDL Definition available: " + (getWSDLGeneratedDefinition() != null));
+ }
+ // Ports
+ string.append(newline);
+ List<QName> ports = getPorts();
+ string.append("Number of ports: " + ports.size());
+ string.append(newline);
+ string.append("Port QNames: ");
+ for (QName port : ports) {
+ string.append(port + sameline);
+ }
+ // Axis Config information
+ string.append(newline);
+ string.append("ConfigurationContext: " + getAxisConfigContext());
+ // EndpointDescriptions
+ string.append(newline);
+ EndpointDescription[] endpointDescs = getEndpointDescriptions();
+ if (endpointDescs == null) {
+ string.append("EndpointDescription array is null");
+ }
+ else {
+ string.append("Number of EndpointDescrptions: " + endpointDescs.length);
+ string.append(newline);
+ for (EndpointDescription endpointDesc : endpointDescs) {
+ string.append(endpointDesc.toString());
+ string.append(newline);
+ }
+ }
+
+ return string.toString();
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org