Changeset 1608 for branches/3.0-Beta2/components

Timestamp:

06/09/07 00:43:00 (15 months ago)

Author:

david

Message:

replace printStackTrace() ticket #730

Location:

branches/3.0-Beta2/components

Files:

• blitz/src/ome/services/blitz/impl/Interceptor.java (modified) (3 diffs)
• client/test/ome/client/itests/RawPixelStoreTest.java (modified) (3 diffs)
• client/test/ome/client/itests/RenderingEngineTest.java (modified) (3 diffs)
• rendering/src/omeis/providers/re/GreyScaleStrategy.java (modified) (1 diff)
• rendering/src/omeis/providers/re/HSBStrategy.java (modified) (1 diff)
• rendering/src/omeis/providers/re/Renderer.java (modified) (1 diff)
• romio/test/ome/io/nio/utests/DeltaVisionTest.java (modified) (3 diffs)
• server/src/ome/dynamic/BuildRunner.java (modified) (3 diffs)
• server/src/ome/services/RawFileBean.java (modified) (3 diffs)
• server/src/ome/services/RawPixelsBean.java (modified) (2 diffs)
• server/src/ome/services/RenderingBean.java (modified) (1 diff)
• server/src/ome/services/query/ClassQuerySource.java (modified) (1 diff)

branches/3.0-Beta2/components/blitz/src/ome/services/blitz/impl/Interceptor.java

@@ -15 +15 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
@@ -22 +24 @@
 public class Interceptor implements MethodInterceptor {
 
+    private static Log log = LogFactory.getLog(Interceptor.class);
+    
     Class iface;
 
@@ -53 +57 @@
             retVal = invoker.invoke(service, __current, mapper, strippedArgs);
         } catch (Throwable t) {
-            t.printStackTrace();
+            log.error("ERROR: ", t);
             throw t;
         }

branches/3.0-Beta2/components/client/test/ome/client/itests/RawPixelStoreTest.java

@@ -7 +7 @@
 package ome.client.itests;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.*;
 
@@ -20 +22 @@
 @Test(groups = { "client", "integration", "binary" })
 public class RawPixelStoreTest extends TestCase {
+
+    private static Log log = LogFactory.getLog(RawPixelStoreTest.class);
 
     ServiceFactory sf;
@@ -37 +41 @@
             sf.getQueryService().get(Experimenter.class, 0L);
         } catch (Exception e) {
-            // e.printStackTrace();
+            log.error("ERROR caught:", e.getCause());
             // ok. http://bugs.openmicroscopy.org.uk/show_bug.cgi?id=649
         }

branches/3.0-Beta2/components/client/test/ome/client/itests/RenderingEngineTest.java

@@ -7 +7 @@
 package ome.client.itests;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.*;
 
@@ -31 +33 @@
 public class RenderingEngineTest extends TestCase {
 
+    private static Log log = LogFactory.getLog(RenderingEngineTest.class);
+    
     /*
      * Pixels p = new Pixels(); AcquisitionContext ac = new
@@ -56 +60 @@
             sf.getQueryService().get(Experimenter.class, 0L);
         } catch (Exception e) {
-            // e.printStackTrace();
+            log.error("ERROR caught:", e.getCause());
             // ok. http://bugs.openmicroscopy.org.uk/show_bug.cgi?id=649
         }

branches/3.0-Beta2/components/rendering/src/omeis/providers/re/GreyScaleStrategy.java

@@ -209 +209 @@
             pixels.close();
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new ResourceError(e.getMessage());
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
         }
     }

branches/3.0-Beta2/components/rendering/src/omeis/providers/re/HSBStrategy.java

@@ -158 +158 @@
             catch (IOException e)
             {
-                    final Writer result = new StringWriter();
-                    final PrintWriter printWriter = new PrintWriter(result);
-                    e.printStackTrace(printWriter);
-                        log.error(result.toString());
+                log.error("IOException caught, throwing ResourceError", e.getCause());
                         throw new ResourceError(
                                         e.getMessage() + " Please check server log.");

branches/3.0-Beta2/components/rendering/src/omeis/providers/re/Renderer.java

@@ -778 +778 @@
                 catch (IOException e)
                 {
-                    final Writer result = new StringWriter();
-                    final PrintWriter printWriter = new PrintWriter(result);
-                    e.printStackTrace(printWriter);
-                        log.error(result.toString());
-                        throw new ResourceError(
-                                        e.getMessage() + " Please check server log.");
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
                 }
     }

branches/3.0-Beta2/components/romio/test/ome/io/nio/utests/DeltaVisionTest.java

@@ -8 +8 @@
 import ome.io.nio.DeltaVisionHeader;
 import ome.model.core.OriginalFile;
+import ome.conditions.ResourceError;
 
 import org.apache.commons.logging.Log;
@@ -14 +15 @@
 import org.testng.annotations.Configuration;
 import org.testng.annotations.Test;
+
 
 /**
@@ -59 +61 @@
                                 
                         } catch (Exception ex) {
-                                ex.printStackTrace();
+                log.error("Exception caught, throwing ResourceError", ex.getCause());
+                throw new ResourceError(
+                        ex.getMessage() + " Please check server log.");
                         }
                         

branches/3.0-Beta2/components/server/src/ome/dynamic/BuildRunner.java

@@ -14 +14 @@
 import java.lang.reflect.Method;
 import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -39 +42 @@
 public @BuildTime
 class BuildRunner {
+    private static Log log = LogFactory.getLog(BuildRunner.class);
 
     public static void main(String[] args) {
@@ -145 +149 @@
         } catch (SecurityException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("SecurityException caught, throwing RuntimeException", e.getCause());
             throw new RuntimeException("Unimplemented exception.", e);
         } catch (NoSuchMethodException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("NoSuchMethodException caught, throwing RuntimeException", e.getCause());
             throw new RuntimeException("Unimplemented exception.", e);
         } catch (IllegalArgumentException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("IllegalArgumentException caught, throwing RuntimeException", e.getCause());
             throw new RuntimeException("Unimplemented exception.", e);
         } catch (IllegalAccessException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("IllegalAccessException caught, throwing RuntimeException", e.getCause());
             throw new RuntimeException("Unimplemented exception.", e);
         } catch (InvocationTargetException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("InvocationTargetException caught, throwing RuntimeException", e.getCause());
             throw new RuntimeException("Unimplemented exception.", e);
         }

branches/3.0-Beta2/components/server/src/ome/services/RawFileBean.java

@@ -175 +175 @@
                 catch (IOException e)
                 {
-                    final Writer result = new StringWriter();
-                    final PrintWriter printWriter = new PrintWriter(result);
-                    e.printStackTrace(printWriter);
-                        log.error(result.toString());
+            log.error("IOException caught, throwing ResourceError", e.getCause());
                         throw new ResourceError(
                                         e.getMessage() + " Please check server log.");
@@ -246 +243 @@
             buffer.read(buf, position);
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new ResourceError(e.getMessage());
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
         }
         return rawBuf;
@@ -265 +263 @@
             buffer.write(nioBuffer, position);
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new ResourceError(e.getMessage());
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
         }
     }

branches/3.0-Beta2/components/server/src/ome/services/RawPixelsBean.java

@@ -177 +177 @@
                 catch (IOException e)
                 {
-                    final Writer result = new StringWriter();
-                    final PrintWriter printWriter = new PrintWriter(result);
-                    e.printStackTrace(printWriter);
-                        log.error(result.toString());
-                        throw new ResourceError(
-                                        e.getMessage() + " Please check server log.");
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
                 }
     }
@@ -467 +464 @@
 
     private void handleException(Exception e) {
-        e.printStackTrace();
+
+        log.error("Exception caught, handling further propagation of errors.", e.getCause());
 
         if (e instanceof IOException) {

branches/3.0-Beta2/components/server/src/ome/services/RenderingBean.java

@@ -441 +441 @@
         catch (IOException e)
         {
-                    final Writer result = new StringWriter();
-                    final PrintWriter printWriter = new PrintWriter(result);
-                    e.printStackTrace(printWriter);
-                        log.error(result.toString());
-                        throw new ResourceError(
-                                        e.getMessage() + " Please check server log.");
+            log.error("IOException caught, throwing ResourceError", e.getCause());
+            throw new ResourceError(
+                    e.getMessage() + " Please check server log.");
         }
         finally

branches/3.0-Beta2/components/server/src/ome/services/query/ClassQuerySource.java

@@ -67 +67 @@
                 q = (Query) c.newInstance(parameters);
             } catch (Exception e) {
-                if (log.isDebugEnabled()) {
-                    e.printStackTrace();
-                }
+                log.error("Exception caught, throwing RuntimeException.");                
                 throw new RuntimeException("Error while trying to instantiate:"
                         + queryID, e);