[jboss-cvs] JBossAS SVN: r103547 - in trunk: ejb3/src/resources/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 5 21:40:56 EDT 2010
Author: david.lloyd at jboss.com
Date: 2010-04-05 21:40:55 -0400 (Mon, 05 Apr 2010)
New Revision: 103547
Modified:
trunk/aspects/src/resources/test/log4j.xml
trunk/ejb3/src/resources/test/log4j.xml
trunk/system/src/resources/tests/conf/test-log4j.xml
trunk/tomcat/src/resources/test/log4j.xml
trunk/varia/src/test/org/jboss/test/SRPProtocolTestCase.java
trunk/varia/src/test/org/jboss/test/TestJCEIntegration.java
trunk/varia/src/test/org/jboss/test/TestProtocol.java
trunk/varia/src/test/org/jboss/test/TstClient.java
Log:
Some more: Remove stuff referring to the now-defunct XLevel class
Modified: trunk/aspects/src/resources/test/log4j.xml
===================================================================
--- trunk/aspects/src/resources/test/log4j.xml 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/aspects/src/resources/test/log4j.xml 2010-04-06 01:40:55 UTC (rev 103547)
@@ -114,7 +114,7 @@
<!-- Limit JBoss categories to INFO
<category name="org.jboss">
- <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ <priority value="INFO"/>
</category>
-->
@@ -136,12 +136,12 @@
| turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
| subpackages. This will produce A LOT of logging output.
<category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
-->
<category name="org.jboss.tm">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: trunk/ejb3/src/resources/test/log4j.xml
===================================================================
--- trunk/ejb3/src/resources/test/log4j.xml 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/ejb3/src/resources/test/log4j.xml 2010-04-06 01:40:55 UTC (rev 103547)
@@ -114,7 +114,7 @@
<!-- Limit JBoss categories to INFO
<category name="org.jboss">
- <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ <priority value="INFO"/>
</category>
-->
@@ -136,16 +136,16 @@
| turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
| subpackages. This will produce A LOT of logging output.
<category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
-->
<category name="org.jboss.security">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<category name="org.jboss.tm">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: trunk/system/src/resources/tests/conf/test-log4j.xml
===================================================================
--- trunk/system/src/resources/tests/conf/test-log4j.xml 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/system/src/resources/tests/conf/test-log4j.xml 2010-04-06 01:40:55 UTC (rev 103547)
@@ -37,7 +37,7 @@
<!--
<category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
-->
Modified: trunk/tomcat/src/resources/test/log4j.xml
===================================================================
--- trunk/tomcat/src/resources/test/log4j.xml 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/tomcat/src/resources/test/log4j.xml 2010-04-06 01:40:55 UTC (rev 103547)
@@ -114,7 +114,7 @@
<!-- Limit JBoss categories to INFO
<category name="org.jboss">
- <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ <priority value="INFO"/>
</category>
-->
@@ -136,12 +136,12 @@
| turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
| subpackages. This will produce A LOT of logging output.
<category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
-->
<category name="org.jboss.tm">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: trunk/varia/src/test/org/jboss/test/SRPProtocolTestCase.java
===================================================================
--- trunk/varia/src/test/org/jboss/test/SRPProtocolTestCase.java 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/varia/src/test/org/jboss/test/SRPProtocolTestCase.java 2010-04-06 01:40:55 UTC (rev 103547)
@@ -27,12 +27,12 @@
import java.security.KeyException;
import java.security.MessageDigest;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
-import org.jboss.logging.XLevel;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPServerInterface;
@@ -65,8 +65,8 @@
protected void setUp() throws Exception
{
// Set up a simple configuration that logs on the console.
- Logger root = Logger.getRoot();
- root.setLevel(XLevel.TRACE);
+ Logger root = Logger.getRootLogger();
+ root.setLevel(Level.TRACE);
root.addAppender(new WriterAppender(new PatternLayout("%x%m%n"), System.out));
Util.init();
NDC.push("S,");
Modified: trunk/varia/src/test/org/jboss/test/TestJCEIntegration.java
===================================================================
--- trunk/varia/src/test/org/jboss/test/TestJCEIntegration.java 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/varia/src/test/org/jboss/test/TestJCEIntegration.java 2010-04-06 01:40:55 UTC (rev 103547)
@@ -35,12 +35,12 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.apache.log4j.WriterAppender;
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
-import org.jboss.logging.XLevel;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPParameters;
@@ -61,8 +61,8 @@
TestJCEIntegration() throws Exception
{
// Set up a simple configuration that logs on the console.
- Logger root = Logger.getRoot();
- root.setLevel(XLevel.TRACE);
+ Logger root = Logger.getRootLogger();
+ root.setLevel(Level.TRACE);
root.addAppender(new WriterAppender(new PatternLayout("%x%m%n"), System.out));
Util.init();
NDC.push("S,");
Modified: trunk/varia/src/test/org/jboss/test/TestProtocol.java
===================================================================
--- trunk/varia/src/test/org/jboss/test/TestProtocol.java 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/varia/src/test/org/jboss/test/TestProtocol.java 2010-04-06 01:40:55 UTC (rev 103547)
@@ -28,13 +28,12 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.jboss.logging.Logger;
import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.apache.log4j.NDC;
import org.apache.log4j.PatternLayout;
-import org.jboss.logging.XLevel;
-import org.jboss.logging.Logger;
import org.jboss.security.Util;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPServerInterface;
@@ -157,8 +156,8 @@
protected void setUp() throws Exception
{
// Set up a simple configuration that logs on the console.
- Logger root = Logger.getRoot();
- root.setLevel(XLevel.TRACE);
+ Logger root = Logger.getRootLogger();
+ root.setLevel(Level.TRACE);
root.addAppender(new ConsoleAppender(new PatternLayout("%x%m%n")));
Util.init();
NDC.push("S,");
Modified: trunk/varia/src/test/org/jboss/test/TstClient.java
===================================================================
--- trunk/varia/src/test/org/jboss/test/TstClient.java 2010-04-06 01:32:06 UTC (rev 103546)
+++ trunk/varia/src/test/org/jboss/test/TstClient.java 2010-04-06 01:40:55 UTC (rev 103547)
@@ -24,14 +24,14 @@
import java.io.IOException;
import javax.naming.InitialContext;
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PatternLayout;
import org.jboss.security.srp.SRPClientSession;
import org.jboss.security.srp.SRPServerInterface;
import org.jboss.security.srp.SRPParameters;
-import org.jboss.logging.XLevel;
/** A simple test client that looks up the SimpleSRPServer in the RMI
registry and attempts to validate the username and password passed
@@ -49,8 +49,8 @@
String serviceName = args.length == 3 ? args[2] : "srp-test/SRPServerInterface";
// Set up a simple configuration that logs on the console.
- Logger root = Logger.getRoot();
- root.setLevel(XLevel.TRACE);
+ Logger root = Logger.getRootLogger();
+ root.setLevel(Level.TRACE);
root.addAppender(new ConsoleAppender(new PatternLayout("%x%m%n")));
InitialContext ctx = new InitialContext();
More information about the jboss-cvs-commits
mailing list