[jbossws-commits] JBossWS SVN: r3600 - in branches/maeste_palin/integration/sunri: src/main/java/org/jboss/wsf/stack/sunri/log and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 15 12:27:34 EDT 2007
Author: maeste
Date: 2007-06-15 12:27:34 -0400 (Fri, 15 Jun 2007)
New Revision: 3600
Modified:
branches/maeste_palin/integration/sunri/.classpath
branches/maeste_palin/integration/sunri/build.xml
branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java
branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java
branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml
Log:
Added a microkernel configurable mapping for JDK-->JBoss Log Level. We can consider fixed JBWS-1675
Modified: branches/maeste_palin/integration/sunri/.classpath
===================================================================
--- branches/maeste_palin/integration/sunri/.classpath 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/.classpath 2007-06-15 16:27:34 UTC (rev 3600)
@@ -24,5 +24,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
+ <classpathentry kind="lib" path="/dati/jboss-4.2.0.CR2/lib/jboss-common.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: branches/maeste_palin/integration/sunri/build.xml
===================================================================
--- branches/maeste_palin/integration/sunri/build.xml 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/build.xml 2007-06-15 16:27:34 UTC (rev 3600)
@@ -118,7 +118,8 @@
<exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/>
<include name="org/jboss/wsf/stack/sunri50/**"/>
<include name="org/jboss/wsf/stack/sunri/metadata/**"/>
- <include name="org/jboss/wsf/stack/sunri/*"/>
+ <include name="org/jboss/wsf/stack/sunri/log/**"/>
+ <include name="org/jboss/wsf/stack/sunri/*"/>
</fileset>
</jar>
Modified: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java
===================================================================
--- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-06-15 16:27:34 UTC (rev 3600)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.stack.sunri.log;
+import java.util.Map;
import java.util.logging.ErrorManager;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -40,10 +41,14 @@
*/
public class JBossLogHandler extends Handler
{
+ private Map<String, String> levelMap;
+ private String defaultLevel;
- public JBossLogHandler()
+ public JBossLogHandler(Map<String, String> levelMap, String defaultLevel)
{
super.setFormatter(new SimpleFormatter());
+ this.levelMap = levelMap;
+ this.defaultLevel = defaultLevel;
}
@Override
@@ -65,29 +70,56 @@
reportError(null, ex, ErrorManager.FORMAT_FAILURE);
return;
}
- if (record.getLevel() == Level.INFO)
+
+ String level = levelMap.get(record.getLevel().getName());
+ level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level;
+ msg = msg + "**" + record.getLevel().getName() + "==" + level + ";";
+ level = level == null ? defaultLevel : level;
+ if ("info".equalsIgnoreCase(level))
{
- Logger.getLogger(record.getSourceClassName()).info(msg);
+ if (Logger.getLogger(record.getSourceClassName()).isInfoEnabled())
+ {
+ Logger.getLogger(record.getSourceClassName()).info(msg);
+ }
+ else
+ {
+ Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
+ }
+
}
- else if (record.getLevel() == Level.SEVERE)
+ else if ("error".equalsIgnoreCase(level))
{
Logger.getLogger(record.getSourceClassName()).error(msg);
}
- else if (record.getLevel() == Level.WARNING)
+ else if ("warn".equalsIgnoreCase(level))
{
Logger.getLogger(record.getSourceClassName()).warn(msg);
}
- else if (record.getLevel() == Level.FINE)
+ else if ("debug".equalsIgnoreCase(level))
{
- Logger.getLogger(record.getSourceClassName()).debug(msg);
+ if (Logger.getLogger(record.getSourceClassName()).isDebugEnabled())
+ {
+ Logger.getLogger(record.getSourceClassName()).debug(msg);
+ }
+ else
+ {
+ Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
+ }
}
- else if (record.getLevel() == Level.FINER || record.getLevel() == Level.FINEST)
+ else if ("trace".equalsIgnoreCase(level))
{
- Logger.getLogger(record.getSourceClassName()).trace(msg);
+ if (Logger.getLogger(record.getSourceClassName()).isTraceEnabled())
+ {
+ Logger.getLogger(record.getSourceClassName()).trace(msg);
+ }
+ else
+ {
+ Logger.getLogger(record.getSourceClassName()).warn("[WAS-INFO]" + msg);
+ }
}
else
{
- Logger.getLogger(record.getSourceClassName()).debug(msg);
+ Logger.getLogger(record.getSourceClassName()).warn("[WAS-UNKNOWN]" + msg);
}
}
Modified: branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java
===================================================================
--- branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JDKLogRedirector.java 2007-06-15 16:27:34 UTC (rev 3600)
@@ -21,8 +21,10 @@
*/
package org.jboss.wsf.stack.sunri.log;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.logging.Filter;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -40,6 +42,8 @@
public class JDKLogRedirector
{
private List<String> namespaces = new LinkedList<String>();
+ private Map<String, String> levelMapping = new HashMap<String, String>();
+ private String defaultLevel;
private static Logger myLogger = Logger.getLogger(JDKLogRedirector.class);
public JDKLogRedirector()
@@ -48,6 +52,12 @@
public void changeHandlers()
{
+ for (String entry : levelMapping.keySet())
+ {
+ Logger.getLogger(this.getClass()).info("key:" + entry);
+ Logger.getLogger(this.getClass()).info("value:" + levelMapping.get(entry));
+
+ }
for (String ns : namespaces)
{
changeHandler(ns);
@@ -90,7 +100,7 @@
}
}
myLogger.debug("Adding JBossLogHandler to log records with namespace " + ns);
- Handler jbossLogHandler = new JBossLogHandler();
+ Handler jbossLogHandler = new JBossLogHandler(levelMapping,defaultLevel);
jbossLogHandler.setLevel(Level.ALL);
java.util.logging.Logger.getLogger(ns).addHandler(jbossLogHandler);
}
@@ -109,6 +119,31 @@
public void setNamespaces(List<String> namespaces)
{
this.namespaces = namespaces;
+ }
+
+ public String getDefaultLevel()
+ {
+ return defaultLevel;
+ }
+
+ public void setDefaultLevel(String defaultLevel)
+ {
+ this.defaultLevel = defaultLevel;
changeHandlers();
}
+
+ public Map<String, String> getLevelMapping()
+ {
+ return levelMapping;
+ }
+
+ public void setLevelMapping(Map<String, String> levelMapping)
+ {
+ this.levelMapping = levelMapping;
+ }
+
+ public String putLevelMappingEntry(String key, String value)
+ {
+ return levelMapping.put(key, value);
+ }
}
Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-15 16:27:34 UTC (rev 3600)
@@ -221,6 +221,17 @@
<value>com.sun</value>
</list>
</property>
+ <property name="levelMapping">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>INFO</key><value>info</value></entry>
+ <entry><key>SEVERE</key><value>error</value></entry>
+ <entry><key>WARNING</key><value>warn</value></entry>
+ <entry><key>FINE</key><value>debug</value></entry>
+ <entry><key>FINER</key><value>trace</value></entry>
+ <entry><key>FINEST</key><value>trace</value></entry>
+ </map>
+ </property>
+ <property name="defaultLevel">debug</property>
</bean>
</deployment>
\ No newline at end of file
Modified: branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 14:36:18 UTC (rev 3599)
+++ branches/maeste_palin/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-06-15 16:27:34 UTC (rev 3600)
@@ -252,6 +252,17 @@
<value>com.sun</value>
</list>
</property>
+ <property name="levelMapping">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>INFO</key><value>info</value></entry>
+ <entry><key>SEVERE</key><value>error</value></entry>
+ <entry><key>WARNING</key><value>warn</value></entry>
+ <entry><key>FINE</key><value>debug</value></entry>
+ <entry><key>FINER</key><value>trace</value></entry>
+ <entry><key>FINEST</key><value>trace</value></entry>
+ </map>
+ </property>
+ <property name="defaultLevel">debug</property>
</bean>
</deployment>
More information about the jbossws-commits
mailing list