[openejb-scm] [2519] trunk/openejb1/modules/core/src/conf: Added log category for org.castor

[dblevins]

Title: [2519] trunk/openejb1/modules/core/src/conf: Added log category for org.castor

Revision

2519

Author

dblevins

Date

2006-02-26 18:49:50 -0500 (Sun, 26 Feb 2006)

Log Message

Added log category for org.castor

Modified Paths

• trunk/openejb1/modules/core/src/conf/default.logging.conf
• trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java

Diff

Modified: trunk/openejb1/modules/core/src/conf/default.logging.conf (2518 => 2519)

--- trunk/openejb1/modules/core/src/conf/default.logging.conf	2006-02-26 23:42:20 UTC (rev 2518)
+++ trunk/openejb1/modules/core/src/conf/default.logging.conf	2006-02-26 23:49:50 UTC (rev 2519)
@@ -37,6 +37,7 @@
 log4j.category.OpenEJB.CastorCMP = warn
 log4j.category.CastorCMP         = warn,  R
 log4j.category.org.exolab.castor = error,  R
+log4j.category.org.castor        = error,  R
 log4j.category.CORBA-Adapter     = debug, R
 log4j.category.Transaction       = debug, TX
 

Modified: trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java (2518 => 2519)

--- trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java	2006-02-26 23:42:20 UTC (rev 2518)
+++ trunk/openejb1/modules/itests/src/java/org/openejb/test/TomcatRemoteTestServer.java	2006-02-26 23:49:50 UTC (rev 2519)
@@ -69,10 +69,8 @@
 
             serverHasAlreadyBeenStarted = false;
 
-            FilePathBuilder tomcat = new FilePathBuilder(tomcatHome);
-            OutputStream catalinaOut = new FileOutputStream(tomcat.l("logs").f("catalina.out"));
 
-            execBootstrap("start", catalinaOut);
+            execBootstrap("start");
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Cannot start the server: " + e.getClass().getName() + ": " + e.getMessage(), e);
@@ -90,7 +88,7 @@
         if (!serverHasAlreadyBeenStarted) {
             try {
                 System.out.println("[] STOP TOMCAT SERVER");
-                execBootstrap("stop", System.out);
+                execBootstrap("stop");
 
                 disconnect(10);
             } catch (Exception e) {
@@ -99,10 +97,13 @@
         }
     }
 
-    private void execBootstrap(String command, OutputStream catalinaOut) throws IOException {
+    private void execBootstrap(String command) throws IOException {
         String[] bootstrapCommand = getBootstrapCommand(tomcatHome, command);
         Process server = Runtime.getRuntime().exec(bootstrapCommand);
 
+        FilePathBuilder tomcat = new FilePathBuilder(tomcatHome);
+        OutputStream catalinaOut = new FileOutputStream(tomcat.l("logs").f("catalina.out"));
+
         // Pipe the processes STDOUT to ours
         InputStream out = server.getInputStream();
         Thread serverOut = new Thread(new Pipe(out, catalinaOut));
@@ -112,7 +113,7 @@
 
         // Pipe the processes STDERR to ours
         InputStream err = server.getErrorStream();
-        Thread serverErr = new Thread(new Pipe(err, System.err));
+        Thread serverErr = new Thread(new Pipe(err, catalinaOut));
 
         serverErr.setDaemon(true);
         serverErr.start();