Repository: ode Updated Branches: refs/heads/ode-1.3.x 6c0a99579 -> a5deb77ac
ODE-928: Got rid of some of the printstacks Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/21bfa1f6 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/21bfa1f6 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/21bfa1f6 Branch: refs/heads/ode-1.3.x Commit: 21bfa1f61a83164a36300bba8a71c7c10c748fde Parents: 6c0a995 Author: sathwik <[email protected]> Authored: Mon Oct 13 15:42:39 2014 +0530 Committer: sathwik <[email protected]> Committed: Mon Oct 13 15:42:39 2014 +0530 ---------------------------------------------------------------------- .../test/java/org/apache/ode/axis2/Axis2TestBase.java | 4 ++-- .../org/apache/ode/axis2/service/ManagementService.java | 4 ++-- .../apache/ode/bpel/compiler_2_0/GoodCompileTCase.java | 2 +- .../main/java/org/apache/ode/bpel/epr/WSAEndpoint.java | 2 +- .../org/apache/ode/il/config/OdeConfigProperties.java | 2 +- .../java/org/apache/ode/bpel/runtime/MockBpelServer.java | 11 +++-------- .../java/org/apache/ode/daohib/bpel/CriteriaBuilder.java | 2 +- .../org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java | 2 +- .../org/apache/ode/karaf/commands/OdeListCommand.java | 4 ++-- .../main/java/org/apache/ode/ra/OdeConnectionImpl.java | 2 -- .../java/org/apache/ode/tools/bpelc/cline/BpelC.java | 2 +- 11 files changed, 15 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java index 2d464fa..0164abe 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java @@ -260,7 +260,7 @@ public abstract class Axis2TestBase { try { _ode.init(odeRootDir, new ConfigurationContext(configContext.getAxisConfiguration())); } catch (ServletException e) { - e.printStackTrace(); + log.error(e); } } @@ -348,7 +348,7 @@ public abstract class Axis2TestBase { try { fos = new FileOutputStream(fileName); } catch (FileNotFoundException e) { - e.printStackTrace(); + log.error(e); } configContext.getAxisConfiguration().getService(serviceName).printWSDL(fos); } http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java ---------------------------------------------------------------------- diff --git a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java index 55c16e8..714ec51 100644 --- a/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java +++ b/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java @@ -43,7 +43,7 @@ import org.apache.axis2.description.AxisService; import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisEngine; import org.apache.axis2.receivers.AbstractMessageReceiver; -import org.apache.axis2.util.Utils; +import org.apache.axis2.util.MessageContextBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.axis2.hooks.ODEAxisService; @@ -115,7 +115,7 @@ public class ManagementService { public void invokeBusinessLogic(MessageContext messageContext) throws AxisFault { DynamicService<T> service = new DynamicService<T>(_service); - MessageContext outMsgContext = Utils.createOutMessageContext(messageContext); + MessageContext outMsgContext = MessageContextBuilder.createOutMessageContext(messageContext); outMsgContext.getOperationContext().addMessageContext(outMsgContext); SOAPFactory soapFactory = getSOAPFactory(messageContext); SOAPEnvelope envelope = soapFactory.getDefaultEnvelope(); http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java ---------------------------------------------------------------------- diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java index 9586d99..50510f4 100644 --- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java +++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTCase.java @@ -63,7 +63,7 @@ class GoodCompileTCase extends TestCase implements CompileListener { File bpelFile = new File(getClass().getResource(_bpel).toURI().getPath()); _compiler.compile(bpelFile, 0); } catch (Exception ex) { - ex.printStackTrace(); + __log.error(ex); fail("Compilation did not succeed."); } } http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java index 7f688f2..e2ad489 100644 --- a/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java +++ b/bpel-epr/src/main/java/org/apache/ode/bpel/epr/WSAEndpoint.java @@ -185,7 +185,7 @@ public class WSAEndpoint implements MutableEndpoint { try { serviceNS = _eprElmt.getOwnerDocument().lookupNamespaceURI(prefix); } catch (Exception e) { - e.printStackTrace(); + __log.error(e); } // Lookup failed, checking directly on our element if (serviceNS == null) { http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java index 763679e..328a211 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java @@ -164,7 +164,7 @@ public class OdeConfigProperties { try { fis.close(); } catch (Exception ex) { - ex.printStackTrace(); + __log.error(ex); } } } else { http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java index 79fe78e..aa6195a 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java @@ -18,7 +18,7 @@ */ package org.apache.ode.bpel.runtime; -import org.apache.derby.jdbc.EmbeddedXADataSource; + import org.apache.geronimo.connector.outbound.GenericConnectionManager; import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions; import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport; @@ -28,7 +28,6 @@ import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrack import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator; import org.apache.geronimo.transaction.manager.RecoverableTransactionManager; import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; -import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; import org.apache.ode.bpel.engine.BpelServerImpl; import org.apache.ode.bpel.iapi.BindingContext; import org.apache.ode.bpel.iapi.ContextException; @@ -41,9 +40,7 @@ import org.apache.ode.bpel.iapi.MyRoleMessageExchange; import org.apache.ode.bpel.iapi.PartnerRoleChannel; import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; import org.apache.ode.bpel.iapi.Scheduler; -import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; -import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl; import org.apache.ode.il.EmbeddedGeronimoFactory; import org.apache.ode.il.MockScheduler; import org.apache.ode.il.config.OdeConfigProperties; @@ -51,7 +48,6 @@ import org.apache.ode.il.dbutil.Database; import org.apache.ode.store.ProcessStoreImpl; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.GUID; -import org.hsqldb.jdbc.jdbcDataSource; import org.tranql.connector.derby.EmbeddedLocalMCF; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -87,8 +83,8 @@ class MockBpelServer { MessageExchangeContext _mexContext; BindingContext _bindContext; HashMap<String, QName> _activated = new HashMap<String, QName>(); - @SuppressWarnings("unchecked") - HashMap _endpoints = new HashMap(); + + HashMap<String,EndpointReference> _endpoints = new HashMap<String,EndpointReference>(); public MockBpelServer() { try { @@ -115,7 +111,6 @@ class MockBpelServer { _server.start(); } catch (Exception except) { System.err.println(except.getMessage()); - except.printStackTrace(System.err); throw new RuntimeException(except); } } http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java index d92ede2..7a2bf5c 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java @@ -240,7 +240,7 @@ class CriteriaBuilder { try { dt = ISO8601DateParser.parse(date); } catch (ParseException e) { - e.printStackTrace(); + __log.error(e); } Timestamp ts = new Timestamp(dt.getTime()); return op + " '" + ts.toString() + "'"; http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java index c45affb..4bccfa1 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java @@ -148,7 +148,7 @@ public class BPELDAOConnectionImpl implements BpelDAOConnection { try { dt = ISO8601DateParser.parse(date); } catch (ParseException e) { - e.printStackTrace(); + __log.error(e); } Timestamp ts = new Timestamp(dt.getTime()); return op + " '" + ts.toString() + "'"; http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java ---------------------------------------------------------------------- diff --git a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java index eefd6be..5355ba7 100644 --- a/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java +++ b/jbi-karaf-commands/src/main/java/org/apache/ode/karaf/commands/OdeListCommand.java @@ -117,7 +117,7 @@ public class OdeListCommand extends OdeCommandsBase { collectFailedActivities(scopeInfo, failedActivites); } } catch (Exception e) { - e.printStackTrace(); + __log.error(e); } return failedActivites; } @@ -131,7 +131,7 @@ public class OdeListCommand extends OdeCommandsBase { return scopeInfoDoc.getScopeInfo(); } } catch (Exception e) { - e.printStackTrace(); + __log.error(e); } } return null; http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java ---------------------------------------------------------------------- diff --git a/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java b/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java index 6c07b9c..d3b800f 100644 --- a/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java +++ b/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java @@ -100,10 +100,8 @@ class OdeConnectionImpl implements InvocationHandler, Connection { String methodSig = Reflect.generateMethodSignature(method); return mc().getTransport().invokeConnectionMethod(methodSig, args); } catch (RuntimeException pe) { - pe.printStackTrace(); throw new OdeConnectionException("Unexpected RuntimeException", pe); } catch (RemoteException re) { - re.printStackTrace(); throw new OdeConnectionException("Unexpected RemoteException.", re); } catch (InvocationTargetException ite) { throw ite.getTargetException(); http://git-wip-us.apache.org/repos/asf/ode/blob/21bfa1f6/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java index f351578..54ac8ff 100644 --- a/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java +++ b/tools/src/main/java/org/apache/ode/tools/bpelc/cline/BpelC.java @@ -104,7 +104,7 @@ public class BpelC extends BaseCommandlineTool { // This is really quite unexpected, so we should // print the stack trace to stderr. consoleErr(t.getMessage()); - t.printStackTrace(); + __log.error(t); System.exit(-2); } System.exit(0);
