[jboss-cvs] JBossAS SVN: r90714 - in branches/dml-log-service-integration: iiop/src/main/org/jboss/util and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 30 17:40:59 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-30 17:40:58 -0400 (Tue, 30 Jun 2009)
New Revision: 90714
Added:
branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
Removed:
branches/dml-log-service-integration/iiop/src/main/org/jboss/util/JacorbLoggerFactory.java
branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
Modified:
branches/dml-log-service-integration/ejb3/build-test.xml
branches/dml-log-service-integration/testsuite/build.xml
Log:
Go back to the Log4jLoggerFactory name just to make this work
Modified: branches/dml-log-service-integration/ejb3/build-test.xml
===================================================================
--- branches/dml-log-service-integration/ejb3/build-test.xml 2009-06-30 21:20:40 UTC (rev 90713)
+++ branches/dml-log-service-integration/ejb3/build-test.xml 2009-06-30 21:40:58 UTC (rev 90714)
@@ -890,7 +890,7 @@
-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.iiop.csiv2.SASClientInitializer
-DORBInitRef.NameService=corbaloc::localhost:3528/JBoss/Naming/root
-Djacorb.log.default.verbosity=10
- -Djacorb.log.loggerFactory=org.jboss.util.JacorbLoggerFactory" />
+ -Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
</antcall>
</target>
Deleted: branches/dml-log-service-integration/iiop/src/main/org/jboss/util/JacorbLoggerFactory.java
===================================================================
--- branches/dml-log-service-integration/iiop/src/main/org/jboss/util/JacorbLoggerFactory.java 2009-06-30 21:20:40 UTC (rev 90713)
+++ branches/dml-log-service-integration/iiop/src/main/org/jboss/util/JacorbLoggerFactory.java 2009-06-30 21:40:58 UTC (rev 90714)
@@ -1,165 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.util;
-
-import org.jacorb.config.LoggerFactory;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import java.io.IOException;
-
-/**
- * A stub logger factory which delegates to the JBoss common logging system.
- */
-public final class JacorbLoggerFactory implements LoggerFactory
-{
- public String getLoggingBackendName()
- {
- return "jboss";
- }
-
- public Logger getNamedLogger(String s)
- {
- return new AvalonLogger(s);
- }
-
- public Logger getNamedRootLogger(String s)
- {
- return getNamedLogger(s);
- }
-
- public Logger getNamedLogger(String s, String s1, long l) throws IOException
- {
- return null;
- }
-
- public void setDefaultLogFile(String s, long l) throws IOException
- {
- // ignore
- }
-
- public void configure(Configuration configuration) throws ConfigurationException
- {
- // ignore
- }
-
- /**
- * A stub Avalon logger implementation which delegates to the JBoss logger system.
- */
- static final class AvalonLogger implements Logger
- {
- private static final String FQCN = AvalonLogger.class.getName();
-
- private final org.jboss.logging.Logger logger;
- private final String name;
-
- public AvalonLogger(String name)
- {
- this.name = name;
- logger = org.jboss.logging.Logger.getLogger(name);
- }
-
- public void debug(String s)
- {
- logger.debug(FQCN, s, null);
- }
-
- public void debug(String s, Throwable throwable)
- {
- logger.debug(FQCN, s, throwable);
- }
-
- @Deprecated
- public boolean isDebugEnabled()
- {
- return logger.isDebugEnabled();
- }
-
- public void info(String s)
- {
- logger.info(FQCN, s, null);
- }
-
- public void info(String s, Throwable throwable)
- {
- logger.info(FQCN, s, throwable);
- }
-
- public boolean isInfoEnabled()
- {
- return logger.isInfoEnabled();
- }
-
- public void warn(String s)
- {
- logger.warn(FQCN, s, null);
- }
-
- public void warn(String s, Throwable throwable)
- {
- logger.warn(FQCN, s, throwable);
- }
-
- public boolean isWarnEnabled()
- {
- return true;
- }
-
- public void error(String s)
- {
- logger.error(FQCN, s, null);
- }
-
- public void error(String s, Throwable throwable)
- {
- logger.error(FQCN, s, throwable);
- }
-
- public boolean isErrorEnabled()
- {
- return true;
- }
-
- public void fatalError(String s)
- {
- logger.fatal(FQCN, s, null);
- }
-
- public void fatalError(String s, Throwable throwable)
- {
- logger.fatal(FQCN, s, throwable);
- }
-
- public boolean isFatalErrorEnabled()
- {
- return true;
- }
-
- public Logger getChildLogger(String s)
- {
- final String name = this.name;
- return new AvalonLogger(name == null || name.length() == 0 ? s : name + "." + s);
- }
- }
-}
Deleted: branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
===================================================================
--- branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java 2009-06-30 21:20:40 UTC (rev 90713)
+++ branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java 2009-06-30 21:40:58 UTC (rev 90714)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.util;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.Log4JLogger;
-import org.jacorb.config.LoggerFactory;
-import org.jboss.logging.log4j.Log4jLoggerPlugin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * JacORB logger factory that creates named Avalon loggers with log4j
- * as the underlying log mechanism.
- *
- * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
- * @version $Revision$
- */
-public class Log4jLoggerFactory
- implements LoggerFactory
-{
- /** logging back-end mechanism used by all Log4jLoggerFactory instances */
- private final static String name = "log4j";
-
- /** cache of created loggers */
- private final Map namedLoggers = new HashMap();
-
- // Auxiliary static methods --------------------------------------
-
- /**
- * Gets a log4j logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.log4j.Logger</code> instance
- */
- private static org.apache.log4j.Logger getLog4jLogger(String name)
- {
- org.jboss.logging.Logger l = org.jboss.logging.Logger.getLogger(name);
- org.jboss.logging.LoggerPlugin lp = l.getLoggerPlugin();
- if (lp instanceof Log4jLoggerPlugin)
- return ((Log4jLoggerPlugin)lp).getLogger();
- else
- {
- return null;
- }
- }
-
-
- // Implementation of org.apache.avalon.framework.configuration.Configuration
-
- public void configure(Configuration configuration)
- throws ConfigurationException
- {
- }
-
- // Implementation of org.jacorb.util.LoggerFactory ---------------
-
- /**
- * Gets the name of the logging back-end mechanism.
- *
- * @return the string <code>"log4j"</code>
- */
- public final String getLoggingBackendName()
- {
- return name;
- }
-
- /**
- * Gets an Avalon logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.avalon.framework.logger.Logger</code>
- * instance
- */
- public Logger getNamedLogger(String name)
- {
- Object o = namedLoggers.get(name);
-
- if (o != null)
- return (Logger)o;
-
- org.apache.log4j.Logger log4jLogger = getLog4jLogger(name);
- Logger logger = new Log4JLogger(log4jLogger);
-
- namedLoggers.put(name, logger);
- return logger;
- }
-
- /**
- * Gets an Avalon root logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.avalon.framework.logger.Logger</code>
- * instance
- */
- public Logger getNamedRootLogger(String name)
- {
- return getNamedLogger(name);
- }
-
- /**
- * Creates a named Avalon logger with given <code>logFileName</code>
- * and <code>maxLogSize</code> parameters. This is a dummy implementation
- * that always return null.
- *
- * @param name the name of the logger
- * @param logFileName the name of the file to log to
- * @param maxLogSize maximum size of the log file.
- *
- * @return the new logger (null in this implementation).
- */
- public Logger getNamedLogger(String name,
- String logFileName, long maxLogSize)
- throws java.io.IOException
- {
- return null;
- }
-
- /**
- * set the file name and max file size for logging to a file
- */
- public void setDefaultLogFile(String fileName, long maxLogSize)
- throws java.io.IOException
- {
- // not implemented
- }
-
-}
Copied: branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java (from rev 90712, branches/dml-log-service-integration/iiop/src/main/org/jboss/util/JacorbLoggerFactory.java)
===================================================================
--- branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java (rev 0)
+++ branches/dml-log-service-integration/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java 2009-06-30 21:40:58 UTC (rev 90714)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.util;
+
+import org.jacorb.config.LoggerFactory;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+
+import java.io.IOException;
+
+/**
+ * A stub logger factory which delegates to the JBoss common logging system. Despite its name it has nothing to
+ * do with log4j; it's so named due to external deps which will hopefully be changed some time soon (jacorb:resources).
+ */
+public final class Log4jLoggerFactory implements LoggerFactory
+{
+ public String getLoggingBackendName()
+ {
+ return "jboss";
+ }
+
+ public Logger getNamedLogger(String s)
+ {
+ return new AvalonLogger(s);
+ }
+
+ public Logger getNamedRootLogger(String s)
+ {
+ return getNamedLogger(s);
+ }
+
+ public Logger getNamedLogger(String s, String s1, long l) throws IOException
+ {
+ return null;
+ }
+
+ public void setDefaultLogFile(String s, long l) throws IOException
+ {
+ // ignore
+ }
+
+ public void configure(Configuration configuration) throws ConfigurationException
+ {
+ // ignore
+ }
+
+ /**
+ * A stub Avalon logger implementation which delegates to the JBoss logger system.
+ */
+ static final class AvalonLogger implements Logger
+ {
+ private static final String FQCN = AvalonLogger.class.getName();
+
+ private final org.jboss.logging.Logger logger;
+ private final String name;
+
+ public AvalonLogger(String name)
+ {
+ this.name = name;
+ logger = org.jboss.logging.Logger.getLogger(name);
+ }
+
+ public void debug(String s)
+ {
+ logger.debug(FQCN, s, null);
+ }
+
+ public void debug(String s, Throwable throwable)
+ {
+ logger.debug(FQCN, s, throwable);
+ }
+
+ @Deprecated
+ public boolean isDebugEnabled()
+ {
+ return logger.isDebugEnabled();
+ }
+
+ public void info(String s)
+ {
+ logger.info(FQCN, s, null);
+ }
+
+ public void info(String s, Throwable throwable)
+ {
+ logger.info(FQCN, s, throwable);
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return logger.isInfoEnabled();
+ }
+
+ public void warn(String s)
+ {
+ logger.warn(FQCN, s, null);
+ }
+
+ public void warn(String s, Throwable throwable)
+ {
+ logger.warn(FQCN, s, throwable);
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return true;
+ }
+
+ public void error(String s)
+ {
+ logger.error(FQCN, s, null);
+ }
+
+ public void error(String s, Throwable throwable)
+ {
+ logger.error(FQCN, s, throwable);
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return true;
+ }
+
+ public void fatalError(String s)
+ {
+ logger.fatal(FQCN, s, null);
+ }
+
+ public void fatalError(String s, Throwable throwable)
+ {
+ logger.fatal(FQCN, s, throwable);
+ }
+
+ public boolean isFatalErrorEnabled()
+ {
+ return true;
+ }
+
+ public Logger getChildLogger(String s)
+ {
+ final String name = this.name;
+ return new AvalonLogger(name == null || name.length() == 0 ? s : name + "." + s);
+ }
+ }
+}
Modified: branches/dml-log-service-integration/testsuite/build.xml
===================================================================
--- branches/dml-log-service-integration/testsuite/build.xml 2009-06-30 21:20:40 UTC (rev 90713)
+++ branches/dml-log-service-integration/testsuite/build.xml 2009-06-30 21:40:58 UTC (rev 90714)
@@ -2413,7 +2413,7 @@
<jvmarg value="-Djacorb.orb.print_version=off"/>
<jvmarg value="-Djacorb.log.default.verbosity=0"/>
<jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.JacorbLoggerFactory"/>
+ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
<jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
<jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
<jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
@@ -3185,7 +3185,7 @@
<jvmarg value="-Djacorb.orb.print_version=off"/>
<jvmarg value="-Djacorb.log.default.verbosity=0"/>
<jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.JacorbLoggerFactory"/>
+ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
<jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
<jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
<jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
@@ -3388,7 +3388,7 @@
<jvmarg value="-Djacorb.orb.print_version=off"/>
<jvmarg value="-Djacorb.log.default.verbosity=0"/>
<jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/>
- <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.JacorbLoggerFactory"/>
+ <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
<jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
<jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
<jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
More information about the jboss-cvs-commits
mailing list