You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/08/26 20:47:50 UTC
svn commit: r569858 - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/util/
container/openejb-core/src/main/resources/
server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/
Author: dblevins
Date: Sun Aug 26 11:47:49 2007
New Revision: 569858
URL: http://svn.apache.org/viewvc?rev=569858&view=rev
Log:
Patch from Karan Malhi, OPENEJB-669: remove hsql log messages from server startup
Added:
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlPrintWriter.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java?rev=569858&r1=569857&r2=569858&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java Sun Aug 26 11:47:49 2007
@@ -41,6 +41,7 @@
public static final LogCategory OPENEJB_RESOURCE_JDBC = OPENEJB.createChild("resource.jdbc");
public static final LogCategory OPENEJB_CONNECTOR = OPENEJB.createChild("connector");
public static final LogCategory OPENEJB_DEPLOY = OPENEJB.createChild("deploy");
+ public static final LogCategory OPENEJB_HSQL = OPENEJB.createChild("hsql");
public static final LogCategory TRANSACTION = new LogCategory( "Transaction");
public static final LogCategory ACTIVEMQ = new LogCategory( "org.apache.activemq");
public static final LogCategory GERONIMO = new LogCategory( "org.apache.geronimo");
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties?rev=569858&r1=569857&r2=569858&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties Sun Aug 26 11:47:49 2007
@@ -51,6 +51,7 @@
log4j.category.OpenEJB = warn
log4j.category.OpenEJB.server = info
log4j.category.OpenEJB.startup = debug
+log4j.category.OpenEJB.hsql = info
log4j.category.CORBA-Adapter = debug
log4j.category.Transaction = warn
log4j.category.org.apache.activemq = error
Added: openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlPrintWriter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlPrintWriter.java?rev=569858&view=auto
==============================================================================
--- openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlPrintWriter.java (added)
+++ openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlPrintWriter.java Sun Aug 26 11:47:49 2007
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.hsql;
+
+import java.io.PrintWriter;
+
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
+public class HsqlPrintWriter extends PrintWriter {
+ private Logger logger;
+ private boolean errorWriter;
+ private StringBuffer text = new StringBuffer("");
+ public HsqlPrintWriter(boolean errorWriter){
+ super(System.err);
+ logger = Logger.getInstance(LogCategory.OPENEJB_HSQL,HsqlPrintWriter.class);
+ this.errorWriter = errorWriter;
+ }
+ public void close() {
+ flush();
+ }
+
+ private void flushLine() {
+ if(!errorWriter)
+ logger.info(text.toString());
+ else
+ logger.error(text.toString());
+ text.setLength(0);
+ }
+
+ public void flush() {
+ if (!text.toString().equals("")) {
+ flushLine();
+ }
+ }
+
+ public void print(boolean b) {
+ text.append(b);
+ }
+
+ public void print(char c) {
+ text.append(c);
+ }
+
+ public void print(char[] s) {
+ text.append(s);
+ }
+
+ public void print(double d) {
+ text.append(d);
+ }
+
+ public void print(float f) {
+ text.append(f);
+ }
+
+ public void print(int i) {
+ text.append(i);
+ }
+
+ public void print(long l) {
+ text.append(l);
+ }
+
+ public void print(Object obj) {
+ text.append(obj);
+ }
+
+ public void print(String s) {
+ text.append(s);
+ }
+
+ public void println() {
+ if (!text.toString().equals("")) {
+ flushLine();
+ }
+ }
+
+ public void println(boolean x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(char x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(char[] x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(double x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(float x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(int x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(long x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(Object x) {
+ text.append(x);
+ flushLine();
+ }
+
+ public void println(String x) {
+ text.append(x);
+ flushLine();
+ }
+
+}
Modified: openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java?rev=569858&r1=569857&r2=569858&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java (original)
+++ openejb/trunk/openejb3/server/openejb-hsql/src/main/java/org/apache/openejb/server/hsql/HsqlService.java Sun Aug 26 11:47:49 2007
@@ -22,6 +22,7 @@
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceException;
import org.apache.openejb.server.SelfManaging;
+import org.apache.openejb.util.LogCategory;
import org.hsqldb.Server;
import org.hsqldb.ServerConfiguration;
import org.hsqldb.ServerConstants;
@@ -118,6 +119,11 @@
// create the server
server = new Server();
+ // add the silent property
+ properties.setProperty(ServerConstants.SC_KEY_SILENT, "true");
+ // set the log and error writers
+ server.setLogWriter(new HsqlPrintWriter(false));
+ server.setErrWriter(new HsqlPrintWriter(true));
server.setProperties(new HsqlProperties(properties));
// get the port