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 wh...@apache.org on 2002/08/07 17:10:26 UTC
cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/ejb WSIFDynamicProvider_EJB.java
whitlock 2002/08/07 08:10:26
Modified: java/src/org/apache/wsif/providers/soap/apachesoap
SOAPJMSConnection.java WSIFPort_ApacheSOAP.java
WSIFOperation_ApacheSOAP.java
WSIFDynamicProvider_ApacheSOAP.java
java/src/org/apache/wsif/base WSIFDefaultMessageFactory.java
WSIFDefaultMessage.java WSIFClientProxy.java
WSIFServiceImpl.java
WSIFDefaultCorrelationService.java
WSIFDefaultOperation.java
java/src/org/apache/wsif/providers/jms
WSIFDynamicProvider_Jms.java
PrimitiveTypeFormatHandler.java JMSFormatter.java
WSIFPort_Jms.java
java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFPort_ApacheAxis.java WSIFJmsSender.java
WSIFDynamicProvider_ApacheAxis.java
WSIFOperation_ApacheAxis.java
java/src/org/apache/wsif/util/jms WSIFJMSProperties.java
JMS2HTTPBridgeDestination.java
WSIFJMSFinderForJndi.java WSIFJMSDestination.java
java/src/org/apache/wsif/util WSIFProperties.java
WSIFPluggableProviders.java
java/src/org/apache/wsif/wsdl WSIFWSDLLocatorImpl.java
java/src/org/apache/wsif/providers/ejb
WSIFDynamicProvider_EJB.java
Log:
Add Trc.exception to catch clauses
Revision Changes Path
1.7 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPJMSConnection.java
Index: SOAPJMSConnection.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPJMSConnection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPJMSConnection.java 29 Jul 2002 15:05:31 -0000 1.6
+++ SOAPJMSConnection.java 7 Aug 2002 15:10:25 -0000 1.7
@@ -157,9 +157,11 @@
responseReader = new BufferedReader(new StringReader(response));
}
} catch (IOException ioe) {
+ Trc.exception(ioe);
// Not sure what the faultCode should be - this may be wrong
throw new SOAPException("WSIF SOAPJMSConnection ", ioe.toString());
} catch (MessagingException me) {
+ Trc.exception(me);
// Not sure what the faultCode should be - this may be wrong
throw new SOAPException("WSIF SOAPJMSConnection ", me.toString());
}
1.12 +4 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFPort_ApacheSOAP.java
Index: WSIFPort_ApacheSOAP.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFPort_ApacheSOAP.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSIFPort_ApacheSOAP.java 6 Aug 2002 09:48:16 -0000 1.11
+++ WSIFPort_ApacheSOAP.java 7 Aug 2002 15:10:25 -0000 1.12
@@ -176,6 +176,7 @@
try {
url = new URL(s);
} catch (MalformedURLException meu) {
+ Trc.exception(meu);
throw new WSIFException(
"could not set SOAP address to " + s,
meu);
@@ -355,6 +356,7 @@
Thread.currentThread().getContextClassLoader())
.newInstance();
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
Serializer literalSerializer = partSer;
@@ -381,6 +383,7 @@
try {
ser = theSMR.querySerializer(javaClass, soapEncoding);
} catch (IllegalArgumentException iae) {
+ Trc.exception(iae);
}
// Only add a mapping if a serializer does not already exist
if (ser == null) {
@@ -397,6 +400,7 @@
ser = null;
ser = theSMR.querySerializer(javaClass, LITERAL_ENCODING);
} catch (IllegalArgumentException iae) {
+ Trc.exception(iae);
}
// Only add a mapping if a serializer does not already exist
if (ser == null) {
1.20 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java
Index: WSIFOperation_ApacheSOAP.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFOperation_ApacheSOAP.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WSIFOperation_ApacheSOAP.java 7 Aug 2002 12:04:44 -0000 1.19
+++ WSIFOperation_ApacheSOAP.java 7 Aug 2002 15:10:25 -0000 1.20
@@ -451,6 +451,7 @@
try {
partInst = input.getObjectPart(names[i]);
} catch (WSIFException ex) {
+ Trc.exception(ex);
partInst = null;
}
Object value = partInst;
1.5 +3 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFDynamicProvider_ApacheSOAP.java
Index: WSIFDynamicProvider_ApacheSOAP.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/WSIFDynamicProvider_ApacheSOAP.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSIFDynamicProvider_ApacheSOAP.java 19 Jul 2002 15:46:31 -0000 1.4
+++ WSIFDynamicProvider_ApacheSOAP.java 7 Aug 2002 15:10:25 -0000 1.5
@@ -197,6 +197,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -220,6 +221,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -239,6 +241,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
1.4 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultMessageFactory.java
Index: WSIFDefaultMessageFactory.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultMessageFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFDefaultMessageFactory.java 19 Jul 2002 15:46:29 -0000 1.3
+++ WSIFDefaultMessageFactory.java 7 Aug 2002 15:10:25 -0000 1.4
@@ -89,6 +89,7 @@
Trc.exit(msg);
return msg;
} catch (Exception ex) {
+ Trc.exception(ex);
WSIFMessage wm = new WSIFDefaultMessage();
Trc.exit(wm);
return wm;
@@ -113,6 +114,7 @@
(packageString.equals("") ? "" : packageString + ".") + st.nextToken();
}
} catch (java.net.MalformedURLException mue) {
+ Trc.exception(mue);
mue.printStackTrace();
}
return packageString;
1.5 +19 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultMessage.java
Index: WSIFDefaultMessage.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultMessage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSIFDefaultMessage.java 19 Jul 2002 15:46:29 -0000 1.4
+++ WSIFDefaultMessage.java 7 Aug 2002 15:10:25 -0000 1.5
@@ -229,10 +229,12 @@
Trc.exit(b);
return b;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Byte");
Trc.exit(0);
return 0;
@@ -257,10 +259,12 @@
Trc.exit(c);
return c;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(
name,
parts.get(name).getClass().getName(),
@@ -288,10 +292,12 @@
Trc.exit(i);
return i;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Integer");
Trc.exit(0);
return 0;
@@ -316,10 +322,12 @@
Trc.exit(new Long(l));
return l;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Long");
Trc.exit(0);
return 0;
@@ -344,10 +352,12 @@
Trc.exit(s);
return s;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Short");
Trc.exit(0);
return 0;
@@ -372,10 +382,12 @@
Trc.exit(new Float(f));
return f;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Float");
Trc.exit(0);
return 0;
@@ -400,10 +412,12 @@
Trc.exit(new Double(d));
return d;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(0);
return 0;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Double");
Trc.exit(0);
return 0;
@@ -428,10 +442,12 @@
Trc.exit(b);
return b;
} catch (NullPointerException ne) {
+ Trc.exception(ne);
handlePartNotFoundException(name);
Trc.exit(false);
return false;
} catch (ClassCastException ce) {
+ Trc.exception(ce);
handlePartCastException(name, parts.get(name).getClass().getName(), "Boolean");
Trc.exit(false);
return false;
@@ -472,12 +488,14 @@
Object poc = clone.invoke(po, null);
dm.setObjectPart(pn, poc);
} catch (InvocationTargetException e) {
+ Trc.exception(e);
throw new CloneNotSupportedException(
"Exception thrown whilst cloning part "
+ pn
+ ". Message is "
+ e.getTargetException().getMessage());
} catch (Exception e) {
+ Trc.exception(e);
throw new CloneNotSupportedException(
"Exception thrown whilst cloning part "
+ pn
@@ -497,6 +515,7 @@
in.close();
dm.setObjectPart(pn, poc);
} catch (Exception e) {
+ Trc.exception(e);
throw new CloneNotSupportedException(
"Exception thrown whilst cloning part "
+ pn
1.4 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFClientProxy.java
Index: WSIFClientProxy.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFClientProxy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFClientProxy.java 19 Jul 2002 15:46:29 -0000 1.3
+++ WSIFClientProxy.java 7 Aug 2002 15:10:25 -0000 1.4
@@ -462,6 +462,7 @@
exactMatchThisArg = true;
}
} catch (ClassNotFoundException ignored) {
+ Trc.exception(ignored);
}
}
1.22 +12 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java
Index: WSIFServiceImpl.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WSIFServiceImpl.java 1 Aug 2002 16:06:39 -0000 1.21
+++ WSIFServiceImpl.java 7 Aug 2002 15:10:25 -0000 1.22
@@ -160,6 +160,7 @@
def = WSIFUtils.readWSDL(null, wsdlLoc);
checkWSDL(def);
} catch (WSDLException ex) {
+ Trc.exception(ex);
throw new WSIFException("could not load " + wsdlLoc, ex);
}
@@ -203,6 +204,7 @@
def = WSIFUtils.readWSDL(null, wsdlLoc, cl);
checkWSDL(def);
} catch (WSDLException ex) {
+ Trc.exception(ex);
throw new WSIFException("could not load " + wsdlLoc, ex);
}
@@ -359,6 +361,7 @@
try {
it = this.myPortsMap.keySet().iterator();
} catch (NullPointerException ne) {
+ Trc.exception(ne);
it = null;
}
Trc.exit();
@@ -730,8 +733,10 @@
(ExtensibilityElement) addressExList.get(0);
addressNS = addressFirstEx.getElementType().getNamespaceURI();
} catch (NullPointerException npe) {
+ Trc.exception(npe);
// ignore
} catch (ArrayIndexOutOfBoundsException aie) {
+ Trc.exception(aie);
// Extensibility element 0 does not exist
// Allow address namespace to be the same as binding
}
@@ -744,10 +749,12 @@
}
}
} catch (NullPointerException e) {
+ Trc.exception(e);
// Binding or extensibility element or QName was null
// any of which means something's not right with
// the port so don't include it.
} catch (ArrayIndexOutOfBoundsException aie) {
+ Trc.exception(aie);
// Extensibility element 0 does not exist
}
}
@@ -829,6 +836,7 @@
s2j2001.createJavaMapping(schemaEl, typeReg);
}
} catch (Exception e) {
+ Trc.exception(e);
//ignored
}
}
@@ -932,6 +940,7 @@
try {
checkWSDL(def);
} catch (WSDLException ex) {
+ Trc.exception(ex);
throw new WSIFException("invalid WSDL defintion " + def.getQName(), ex);
}
}
@@ -1068,6 +1077,7 @@
return ser;
}
} catch (WSDLException ex) {
+ Trc.exception(ex);
throw ex;
}
}
@@ -1095,6 +1105,7 @@
return deser;
}
} catch (WSDLException ex) {
+ Trc.exception(ex);
throw ex;
}
}
@@ -1118,6 +1129,7 @@
Trc.exit(ee);
return ee;
} catch (WSDLException ignored) {
+ Trc.exception(ignored);
}
}
ee = super.createExtension(parentType, elementType);
1.6 +5 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultCorrelationService.java
Index: WSIFDefaultCorrelationService.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultCorrelationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFDefaultCorrelationService.java 1 Aug 2002 10:03:20 -0000 1.5
+++ WSIFDefaultCorrelationService.java 7 Aug 2002 15:10:25 -0000 1.6
@@ -129,6 +129,7 @@
new Long(System.currentTimeMillis() + timeout));
}
} catch (IOException ex) {
+ Trc.exception(ex);
throw new WSIFException(ex.toString());
}
} else {
@@ -160,6 +161,7 @@
Trc.exit(s);
return s;
} catch (Exception ex) {
+ Trc.exception(ex);
throw new WSIFException(ex.toString());
}
}
@@ -221,6 +223,7 @@
try {
sleep(WSIFConstants.CORRELATION_TIMEOUT_DELAY);
} catch (InterruptedException ex) {
+ Trc.exception(ex);
}
checkForTimeouts();
}
@@ -250,6 +253,7 @@
}
}
} catch (ConcurrentModificationException ex) {
+ Trc.exception(ex);
} // ignore this, get the others next time
if (expiredKeys.size() > 0) {
@@ -299,6 +303,7 @@
try {
return super.resolveClass( desc );
} catch (ClassNotFoundException ex) {
+ Trc.exception(ex);
if ( desc.getName().equals("int") ) {
return int.class;
} else if ( desc.getName().equals("float") ) {
1.9 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java
Index: WSIFDefaultOperation.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WSIFDefaultOperation.java 19 Jul 2002 15:46:29 -0000 1.8
+++ WSIFDefaultOperation.java 7 Aug 2002 15:10:25 -0000 1.9
@@ -328,6 +328,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"Unexpected ClassNotFoundException when processing "
+ "jms:propertyValue "
@@ -358,6 +359,7 @@
throw new WSIFException(
"jms:propertyValue " + name + " had an invalid type");
} catch (NumberFormatException nfe) {
+ Trc.exception(nfe);
throw new WSIFException(
"jms:propertyValue "
+ name
1.6 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFDynamicProvider_Jms.java
Index: WSIFDynamicProvider_Jms.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFDynamicProvider_Jms.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFDynamicProvider_Jms.java 19 Jul 2002 15:46:29 -0000 1.5
+++ WSIFDynamicProvider_Jms.java 7 Aug 2002 15:10:25 -0000 1.6
@@ -165,6 +165,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -187,6 +188,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
1.6 +4 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/jms/PrimitiveTypeFormatHandler.java
Index: PrimitiveTypeFormatHandler.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/PrimitiveTypeFormatHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrimitiveTypeFormatHandler.java 1 Aug 2002 11:24:06 -0000 1.5
+++ PrimitiveTypeFormatHandler.java 7 Aug 2002 15:10:25 -0000 1.6
@@ -200,6 +200,7 @@
else if (message instanceof javax.jms.ObjectMessage)
write((javax.jms.ObjectMessage) message);
} catch (Exception e) {
+ Trc.exception(e);
e.printStackTrace();
}
Trc.exit();
@@ -216,6 +217,7 @@
else if (message instanceof javax.jms.ObjectMessage)
read((javax.jms.ObjectMessage) message);
} catch (Exception e) {
+ Trc.exception(e);
e.printStackTrace();
}
Trc.exit();
@@ -273,6 +275,7 @@
try {
result = STANDARD_DATE_FORMAT.parse(value);
} catch (java.text.ParseException standardException) {
+ Trc.exception(standardException);
result = PRECISE_DATE_FORMAT.parse(value);
}
primitiveType = result;
@@ -284,6 +287,7 @@
primitiveType = constructor.newInstance(new Object[] { value });
}
} catch (Exception e) {
+ Trc.exception(e);
throw new JMSException("Unable to parse message");
}
1.6 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSFormatter.java
Index: JMSFormatter.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/JMSFormatter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMSFormatter.java 19 Jul 2002 15:46:29 -0000 1.5
+++ JMSFormatter.java 7 Aug 2002 15:10:25 -0000 1.6
@@ -261,6 +261,7 @@
input = msg.getStringProperty( WSIFConstants.JMS_PROP_INPUT_NAME );
output = msg.getStringProperty( WSIFConstants.JMS_PROP_OUTPUT_NAME );
} catch (javax.jms.JMSException e) {
+ Trc.exception(e);
}
}
1.8 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFPort_Jms.java
Index: WSIFPort_Jms.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/jms/WSIFPort_Jms.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WSIFPort_Jms.java 24 Jul 2002 13:28:30 -0000 1.7
+++ WSIFPort_Jms.java 7 Aug 2002 15:10:25 -0000 1.8
@@ -244,6 +244,7 @@
fieldObjectReference = (JMSAddress) portExtension;
} catch (Exception ex) {
+ Trc.exception(ex);
throw new WSIFException(
"Could not create object of class '???todo??? " + "'",
ex);
1.8 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFPort_ApacheAxis.java
Index: WSIFPort_ApacheAxis.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFPort_ApacheAxis.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WSIFPort_ApacheAxis.java 24 Jul 2002 13:28:31 -0000 1.7
+++ WSIFPort_ApacheAxis.java 7 Aug 2002 15:10:25 -0000 1.8
@@ -168,6 +168,7 @@
try {
url = new URL(s);
} catch (MalformedURLException malformedurlexception) {
+ Trc.exception(malformedurlexception);
throw new WSIFException(
"could not set SOAP address to " + s,
malformedurlexception);
@@ -449,6 +450,7 @@
} else
call = new Call( new org.apache.axis.client.Service() );
} catch (JAXRPCException e) {
+ Trc.exception(e);
throw new WSIFException(e.toString());
}
}
1.6 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java
Index: WSIFJmsSender.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFJmsSender.java 29 Jul 2002 15:05:31 -0000 1.5
+++ WSIFJmsSender.java 7 Aug 2002 15:10:25 -0000 1.6
@@ -101,6 +101,7 @@
messageContext.setResponseMessage(responseMessage);
}
} catch (WSIFException we) {
+ Trc.exception(we);
throw new AxisFault(we.toString());
}
Trc.exit();
1.5 +3 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFDynamicProvider_ApacheAxis.java
Index: WSIFDynamicProvider_ApacheAxis.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFDynamicProvider_ApacheAxis.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSIFDynamicProvider_ApacheAxis.java 19 Jul 2002 15:46:31 -0000 1.4
+++ WSIFDynamicProvider_ApacheAxis.java 7 Aug 2002 15:10:25 -0000 1.5
@@ -158,6 +158,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -181,6 +182,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -200,6 +202,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
1.18 +15 -4 xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WSIFOperation_ApacheAxis.java 7 Aug 2002 12:04:44 -0000 1.17
+++ WSIFOperation_ApacheAxis.java 7 Aug 2002 15:10:25 -0000 1.18
@@ -457,6 +457,7 @@
}
return result;
} catch (Exception ex) {
+ Trc.exception(ex);
throw new WSIFException(ex.getMessage());
}
@@ -588,6 +589,7 @@
try {
obj = wsifmessage.getObjectPart(names[i]);
} catch (WSIFException ex) {
+ Trc.exception(ex);
obj = null;
}
if (obj != null) {
@@ -620,6 +622,7 @@
response =
call.invoke(getInputNamespace(), operation.getName(), objects.toArray());
} catch (AxisFault e) {
+ Trc.exception(e);
response = e;
respOK = false;
}
@@ -932,7 +935,9 @@
try {
jmsProps.put( partName.substring( WSIFConstants.CONTEXT_JMS_PREFIX.length() ),
context.getObjectPart( partName ) );
- } catch (WSIFException ex) {}
+ } catch (WSIFException ex) {
+ Trc.exception(ex);
+ }
}
}
if ( jmsProps.size() > 0 ) {
@@ -956,7 +961,9 @@
if ( o instanceof String ) {
addHTTPHeader( call, name, (String)o );
}
- } catch (WSIFException ex) {}
+ } catch (WSIFException ex) {
+ Trc.exception(ex);
+ }
name = WSIFConstants.CONTEXT_HTTP_PSWD;
try {
@@ -964,7 +971,9 @@
if ( o instanceof String ) {
addHTTPHeader( call, name, (String)o );
}
- } catch (WSIFException ex) {}
+ } catch (WSIFException ex) {
+ Trc.exception(ex);
+ }
try {
name = WSIFConstants.CONTEXT_SOAP_HEADERS;
@@ -972,7 +981,9 @@
if ( o instanceof List ) {
addSOAPHeader( call, name, (List)o );
}
- } catch (WSIFException ex) {}
+ } catch (WSIFException ex) {
+ Trc.exception(ex);
+ }
}
/**
1.4 +3 -0 xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSProperties.java
Index: WSIFJMSProperties.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFJMSProperties.java 19 Jul 2002 15:46:29 -0000 1.3
+++ WSIFJMSProperties.java 7 Aug 2002 15:10:26 -0000 1.4
@@ -176,6 +176,7 @@
producer.setTimeToLive(((Long) value).longValue());
}
} catch (ClassCastException ce) {
+ Trc.exception(ce);
throw new WSIFException(
"Unexpected type "
+ type
@@ -214,6 +215,7 @@
message.setObjectProperty(prop, value);
}
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
@@ -248,6 +250,7 @@
put(name, message.getObjectProperty(name));
}
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
1.4 +4 -0 xml-axis-wsif/java/src/org/apache/wsif/util/jms/JMS2HTTPBridgeDestination.java
Index: JMS2HTTPBridgeDestination.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/jms/JMS2HTTPBridgeDestination.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMS2HTTPBridgeDestination.java 19 Jul 2002 15:46:29 -0000 1.3
+++ JMS2HTTPBridgeDestination.java 7 Aug 2002 15:10:26 -0000 1.4
@@ -126,6 +126,7 @@
break;
}
} catch (Exception ignored) {
+ Trc.exception(ignored);
}
}
Trc.exit();
@@ -167,8 +168,10 @@
System.out.println("Waiting... " + i);
}
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
} catch (InterruptedException ignored) {
+ Trc.exception(ignored);
System.out.println("Exitting");
}
Trc.exit();
@@ -201,6 +204,7 @@
try {
sender.close();
} catch (Exception e) {
+ Trc.exception(e);
}
sender = null;
}
1.5 +10 -0 xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSFinderForJndi.java
Index: WSIFJMSFinderForJndi.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSFinderForJndi.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSIFJMSFinderForJndi.java 19 Jul 2002 15:46:29 -0000 1.4
+++ WSIFJMSFinderForJndi.java 7 Aug 2002 15:10:26 -0000 1.5
@@ -125,6 +125,7 @@
try {
namedJndiContext = new InitialDirContext(environment);
} catch (NamingException ne) {
+ Trc.exception(ne);
throw new WSIFException(
"WSIFJMSFinderForJndi caught '"
+ ne
@@ -139,6 +140,7 @@
try {
containersJndiContext = new InitialDirContext();
} catch (NamingException ne) {
+ Trc.exception(ne);
if (initialContextFactory == null && jndiProviderURL == null)
throw new WSIFException(
"WSIFJMSFinderForJndi caught '"
@@ -164,11 +166,13 @@
+ jndiConnectionFactory
+ " in JNDI.");
} catch (ClassCastException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"WSIFJMSFinderForJndi caught ClassCastException. The ConnectionFactory "
+ jndiConnectionFactory
+ " in JNDI was not defined to be a connection factory.");
} catch (NamingException ne) {
+ Trc.exception(ne);
throw new WSIFException(
"WSIFJMSFinderForJndi caught NamingException. The ConnectionFactory "
+ jndiConnectionFactory
@@ -184,11 +188,13 @@
+ jndiDestinationName
+ " in JNDI.");
} catch (ClassCastException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"WSIFJMSFinderForJndi caught ClassCastException. The Destination "
+ jndiDestinationName
+ " in JNDI was not defined to be a destination.");
} catch (NamingException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"WSIFJMSFinderForJndi caught NamingException. The Destination "
+ jndiDestinationName
@@ -227,11 +233,13 @@
+ name
+ " in JNDI.");
} catch (ClassCastException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"WSIFJMSFinderForJndi caught ClassCastException. The Queue "
+ name
+ " in JNDI was not defined to be a queue.");
} catch (NamingException cce) {
+ Trc.exception(cce);
throw new WSIFException(
"WSIFJMSFinderForJndi caught NamingException. The Queue "
+ name
@@ -258,10 +266,12 @@
try {
result = containersJndiContext.lookup(name);
} catch (NamingException ne) {
+ Trc.exception(ne);
if (namedJndiContext != null) {
try {
result = namedJndiContext.lookup(name);
} catch (NamingException ignored) {
+ Trc.exception(ignored);
throw ne;
}
}
1.6 +10 -0 xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSDestination.java
Index: WSIFJMSDestination.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/jms/WSIFJMSDestination.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFJMSDestination.java 19 Jul 2002 15:46:29 -0000 1.5
+++ WSIFJMSDestination.java 7 Aug 2002 15:10:26 -0000 1.6
@@ -158,6 +158,7 @@
connection.start();
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
if (Trc.ON)
@@ -185,6 +186,7 @@
if (cnnctn != null)
cnnctn.close();
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
Trc.exit();
@@ -227,6 +229,7 @@
Trc.exit(s);
return s;
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
}
@@ -260,6 +263,7 @@
Trc.exit(s);
return s;
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
}
@@ -295,6 +299,7 @@
msgId = msg.getJMSMessageID();
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
} finally { // If properties were set, trash the sender so we get the default props next time.
if (propsSet)
@@ -333,6 +338,7 @@
"Reply message was not a TextMessage:msg="
+ (msg == null ? "null" : msg.toString()));
} catch (JMSException e) {
+ Trc.exception(e);
throw WSIFJMSConstants.ToWsifException(e);
}
Trc.exit(s);
@@ -362,12 +368,14 @@
msg = rec.receive(timeout);
} catch (JMSException e) {
+ Trc.exception(e);
throw WSIFJMSConstants.ToWsifException(e);
} finally {
try {
if (rec != null)
rec.close();
} catch (Exception ignored) {
+ Trc.exception(ignored);
}
}
@@ -387,6 +395,7 @@
if (syncTempQueue == null)
syncTempQueue = session.createTemporaryQueue();
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
@@ -522,6 +531,7 @@
else
throw new WSIFException("Unable to support message type");
} catch (JMSException je) {
+ Trc.exception(je);
throw WSIFJMSConstants.ToWsifException(je);
}
Trc.exit(jmsMsg);
1.3 +3 -0 xml-axis-wsif/java/src/org/apache/wsif/util/WSIFProperties.java
Index: WSIFProperties.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/WSIFProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFProperties.java 19 Jul 2002 15:46:30 -0000 1.2
+++ WSIFProperties.java 7 Aug 2002 15:10:26 -0000 1.3
@@ -94,6 +94,7 @@
try {
p2.load(in);
} catch (Exception ignored) {
+ Trc.exception(ignored);
return null;
}
return p2;
@@ -132,6 +133,7 @@
t = t * 1000; // convert to milliseconds
}
} catch (NumberFormatException e) {
+ Trc.exception(e);
t = 0;
}
Trc.exit(new Long(t));
@@ -152,6 +154,7 @@
t = 0;
}
} catch (NumberFormatException e) {
+ Trc.exception(e);
t = 0;
}
Trc.exit(new Long(t));
1.3 +1 -0 xml-axis-wsif/java/src/org/apache/wsif/util/WSIFPluggableProviders.java
Index: WSIFPluggableProviders.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/WSIFPluggableProviders.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFPluggableProviders.java 29 Jul 2002 12:34:44 -0000 1.2
+++ WSIFPluggableProviders.java 7 Aug 2002 15:10:26 -0000 1.3
@@ -463,6 +463,7 @@
}
}
} catch (NumberFormatException e) { // ignore any error
+ Trc.exception(e);
} // ignore any error
return false;
}
1.8 +18 -0 xml-axis-wsif/java/src/org/apache/wsif/wsdl/WSIFWSDLLocatorImpl.java
Index: WSIFWSDLLocatorImpl.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/wsdl/WSIFWSDLLocatorImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WSIFWSDLLocatorImpl.java 18 Jul 2002 17:15:58 -0000 1.7
+++ WSIFWSDLLocatorImpl.java 7 Aug 2002 15:10:26 -0000 1.8
@@ -63,6 +63,7 @@
import java.net.URL;
import com.ibm.wsdl.util.StringUtils;
+import org.apache.wsif.logging.Trc;
/**
* Implementation of javax.wsdl.xml.WSDLLocator. This class can be used to
@@ -88,9 +89,11 @@
* @param cl A ClassLoader to use in locating the base wsdl document and imports
*/
public WSIFWSDLLocatorImpl(String ctxt, String wsdlURI, ClassLoader cl) {
+ Trc.entry(this,ctxt,wsdlURI,cl);
contextURI = ctxt;
wsdlLocation = wsdlURI;
loader = cl;
+ Trc.exit();
}
/**
@@ -100,9 +103,11 @@
* @param cl A ClassLoader to use in locating the base wsdl document and imports
*/
public WSIFWSDLLocatorImpl(String docBase, Reader reader, ClassLoader cl) {
+ Trc.entry(this,docBase,cl);
documentBase = docBase;
baseReader = reader;
loader = cl;
+ Trc.exit();
}
/**
@@ -111,6 +116,7 @@
* @return The reader or null if the import cannot be resolved
*/
public Reader getBaseReader() {
+ Trc.entry(this);
if (baseReader == null) {
try {
URL url = null;
@@ -133,6 +139,7 @@
in = loader.getResourceAsStream(wsdlRelativeLocation);
baseReader = new InputStreamReader(in);
} catch (Exception exc) {
+ Trc.exception(exc);
}
}
if (baseReader == null) {
@@ -142,9 +149,11 @@
if (url != null)
documentBase = url.toString();
} catch (Exception e) {
+ Trc.exception(e);
documentBase = wsdlLocation;
}
}
+ Trc.exit();
return baseReader;
}
@@ -156,6 +165,8 @@
* @return The reader or null if the import cannot be resolved
*/
public Reader getImportReader(String base, String relativeLocation) {
+ Trc.entry(this,base,relativeLocation);
+
// Reset importReader if finding import within import
importReader = null;
boolean triedSU = false;
@@ -218,6 +229,7 @@
}
importBase = (url == null) ? relativeLocation : url.toString();
} catch (Exception e) {
+ Trc.exception(e);
// If we have not tried using a non-ClassLoader route, try it now
// as a last resort.
if (!triedSU) {
@@ -227,6 +239,7 @@
importReader = StringUtils.getContentAsReader(url);
importBase = (url == null) ? relativeLocation : url.toString();
} catch (Exception e2) {
+ Trc.exception(e2);
// we can't find the import so set the base as an empty string
importBase = "";
}
@@ -235,6 +248,7 @@
importBase = "";
}
}
+ Trc.exit();
return importReader;
}
@@ -243,6 +257,8 @@
* @return The document base uri
*/
public String getBaseURI() {
+ Trc.entry(this);
+ Trc.exit(documentBase);
return documentBase;
}
@@ -252,6 +268,8 @@
* @return The document base uri
*/
public String getLatestImportURI() {
+ Trc.entry(this);
+ Trc.exit(importBase);
return importBase;
}
1.6 +2 -0 xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFDynamicProvider_EJB.java
Index: WSIFDynamicProvider_EJB.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFDynamicProvider_EJB.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSIFDynamicProvider_EJB.java 19 Jul 2002 15:46:31 -0000 1.5
+++ WSIFDynamicProvider_EJB.java 7 Aug 2002 15:10:26 -0000 1.6
@@ -163,6 +163,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}
@@ -185,6 +186,7 @@
true,
Thread.currentThread().getContextClassLoader());
} catch (Throwable ignored) {
+ Trc.exception(ignored);
}
return null;
}