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 2007/03/16 03:14:37 UTC
svn commit: r518841 -
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/
Author: dims
Date: Thu Mar 15 19:14:36 2007
New Revision: 518841
URL: http://svn.apache.org/viewvc?view=rev&rev=518841
Log:
Fix for AXIS2-2273 - The toString() methods in the metadata description package should not cause fatal errors
Modified:
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/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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -1523,49 +1523,55 @@
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("AxisService: " + getAxisService());
- //
- string.append(newline);
- EndpointInterfaceDescription endpointInterfaceDesc = getEndpointInterfaceDescription();
- if (endpointInterfaceDesc != null) {
- string.append("EndpointInterfaceDescription: " + endpointInterfaceDesc.toString());
+ try {
+ 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("AxisService: " + getAxisService());
+ //
+ string.append(newline);
+ EndpointInterfaceDescription endpointInterfaceDesc = getEndpointInterfaceDescription();
+ if (endpointInterfaceDesc != null) {
+ string.append("EndpointInterfaceDescription: " + endpointInterfaceDesc.toString());
+ }
+ else {
+ string.append("EndpointInterfaceDescription is null.");
+ }
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "EndpointDescription");
+ return string.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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -884,33 +884,39 @@
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());
- }
+ try {
+ 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");
+ }
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "EndpointInterfaceDescription");
+ return string.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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -219,21 +219,26 @@
final String newline = "\n";
final String sameline = "; ";
StringBuffer string = new StringBuffer();
-
-
- string.append(super.toString());
- string.append(newline);
- string.append("Exception class: " + getExceptionClassName());
- string.append(newline);
- string.append("Name: " + getName());
- string.append(newline);
- string.append("Namespace: " + getName());
- string.append(newline);
- string.append("FaultBean: " + getFaultBean());
- string.append(newline);
- string.append("FaultInfo Type Name : " + getFaultInfo());
-
-
+ try {
+ string.append(super.toString());
+ string.append(newline);
+ string.append("Exception class: " + getExceptionClassName());
+ string.append(newline);
+ string.append("Name: " + getName());
+ string.append(newline);
+ string.append("Namespace: " + getName());
+ string.append(newline);
+ string.append("FaultBean: " + getFaultBean());
+ string.append(newline);
+ string.append("FaultInfo Type Name : " + getFaultInfo());
+
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "FaultDescription");
+ return string.toString();
+ }
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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -1455,89 +1455,96 @@
final String newline = "\n";
final String sameline = "; ";
StringBuffer string = new StringBuffer();
+ try {
+ 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 declaring class name: " + getJavaDeclaringClassName());
+ 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(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 declaring class name: " + getJavaDeclaringClassName());
- 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);
- 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");
+ }
- 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");
- }
-
- string.append("RuntimeDescriptions:" +this.runtimeDescMap.size());
- string.append(newline);
- for (OperationRuntimeDescription runtimeDesc:runtimeDescMap.values()) {
- string.append(runtimeDesc.toString());
- string.append(newline);
+ string.append("RuntimeDescriptions:" +this.runtimeDescMap.size());
+ string.append(newline);
+ for (OperationRuntimeDescription runtimeDesc:runtimeDescMap.values()) {
+ string.append(runtimeDesc.toString());
+ string.append(newline);
+ }
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "OperationDescription");
+ return string.toString();
}
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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -337,24 +337,30 @@
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());
-
+ try {
+ 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());
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "ParameterDescription");
+ return string.toString();
+ }
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=518841&r1=518840&r2=518841
==============================================================================
--- 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 Thu Mar 15 19:14:36 2007
@@ -1185,60 +1185,67 @@
// 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));
+ try {
+ // 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("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
- // We don't print out the config context because it will force one to be created
- // if it doesn't already exist.
-// 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("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);
- for (EndpointDescription endpointDesc : endpointDescs) {
- string.append(endpointDesc.toString());
+ 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
+ // We don't print out the config context because it will force one to be created
+ // if it doesn't already exist.
+ // 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);
+ }
}
- }
- string.append("RuntimeDescriptions:" +this.runtimeDescMap.size());
- string.append(newline);
- for (ServiceRuntimeDescription runtimeDesc:runtimeDescMap.values()) {
- string.append(runtimeDesc.toString());
+ string.append("RuntimeDescriptions:" +this.runtimeDescMap.size());
string.append(newline);
+ for (ServiceRuntimeDescription runtimeDesc:runtimeDescMap.values()) {
+ string.append(runtimeDesc.toString());
+ string.append(newline);
+ }
+ }
+ catch(Throwable t) {
+ string.append(newline);
+ string.append("Complete debug information not currently available for " +
+ "ServiceDescription");
+ return string.toString();
}
return string.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org