[jboss-cvs] JBoss Profiler SVN: r583 - in branches/JBossProfiler2: src/main/org/jboss/profiler/as and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 27 09:53:44 EST 2010
Author: jesper.pedersen
Date: 2010-11-27 09:53:43 -0500 (Sat, 27 Nov 2010)
New Revision: 583
Modified:
branches/JBossProfiler2/build.xml
branches/JBossProfiler2/ivy.xml
branches/JBossProfiler2/src/main/org/jboss/profiler/as/Communicator.java
branches/JBossProfiler2/src/main/org/jboss/profiler/as/Profiler.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/DifferenceUtil.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/HTMLUtil.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/SnapshotUtil.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/Util.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/cmd/Client.java
branches/JBossProfiler2/src/main/org/jboss/profiler/client/precompiler/Precompiler.java
branches/JBossProfiler2/src/main/org/jboss/profiler/embedded/Profiler.java
Log:
[JBPROFILER-112] Switch to java.util.logging
Modified: branches/JBossProfiler2/build.xml
===================================================================
--- branches/JBossProfiler2/build.xml 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/build.xml 2010-11-27 14:53:43 UTC (rev 583)
@@ -50,12 +50,10 @@
<property name="version.javassist" value="3.14.0-GA"/>
<property name="version.jboss.remoting" value="2.5.3.SP1"/>
<property name="version.concurrent" value="1.3.4"/>
- <property name="version.apache-log4j" value="1.2.16"/>
<property name="version.jsf-api" value="1.2_12"/>
<property name="version.jsf-impl" value="1.2_12"/>
<property name="version.jsf-facelets" value="1.1.15"/>
<property name="version.servlet" value="2.5"/>
- <property name="version.jboss.logging" value="2.2.0.CR1"/>
<property name="version.commons-io" value="1.4"/>
<property name="version.richfaces" value="3.3.2.SR1"/>
<property name="version.richfaces.ui" value="3.2.2.SR1"/>
Modified: branches/JBossProfiler2/ivy.xml
===================================================================
--- branches/JBossProfiler2/ivy.xml 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/ivy.xml 2010-11-27 14:53:43 UTC (rev 583)
@@ -45,10 +45,7 @@
<dependency org="javax.persistence" name="persistence-api" rev="${version.jpa}" conf="test"/>
<dependency org="javax.servlet" name="servlet-api" rev="${version.servlet}" conf="core"/>
<dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
- <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="core"/>
<dependency org="org.javassist" name="javassist" rev="${version.javassist}" conf="core"/>
- <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="core"/>
- <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="core"/>
<dependency org="org.jboss.remoting" name="jboss-remoting" rev="${version.jboss.remoting}" conf="core"/>
<dependency org="org.richfaces.framework" name="richfaces-api" rev="${version.richfaces}" conf="core"/>
<dependency org="org.richfaces.framework" name="richfaces-impl" rev="${version.richfaces}" conf="core"/>
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/as/Communicator.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/as/Communicator.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/as/Communicator.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -27,8 +27,9 @@
import org.jboss.profiler.shared.Version;
import java.net.InetAddress;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.transport.Connector;
@@ -39,7 +40,7 @@
public class Communicator implements CommunicatorMBean
{
/** The logger */
- private static Logger log = Logger.getLogger(Communicator.class);
+ private static Logger log = Logger.getLogger(Communicator.class.getName());
/** Host */
private String host;
@@ -147,7 +148,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
socket = b;
@@ -181,7 +182,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
}
@@ -215,7 +216,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
rmi = b;
@@ -249,7 +250,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
}
@@ -283,7 +284,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
http = b;
@@ -317,7 +318,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
}
}
@@ -347,7 +348,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ log.log(Level.SEVERE, e.getMessage(), e);
throw e;
}
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/as/Profiler.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/as/Profiler.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/as/Profiler.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -27,7 +27,7 @@
import org.jboss.profiler.shared.CommandType;
import org.jboss.profiler.shared.Visibility;
-import org.jboss.logging.Logger;
+import java.util.logging.Logger;
/**
* The profiler mbean class
@@ -36,7 +36,7 @@
public class Profiler implements ProfilerMBean
{
/** The logger */
- private static Logger log = Logger.getLogger(Profiler.class);
+ private static Logger log = Logger.getLogger(Profiler.class.getName());
/**
* Constructor
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/DifferenceUtil.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/DifferenceUtil.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/DifferenceUtil.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -39,17 +39,12 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.logging.Logger;
-
/**
* The difference utility class
* @author Jesper Pedersen <jesper.pedersen at jboss.org>
*/
public class DifferenceUtil extends SnapshotUtil
{
- /** The logger */
- private static Logger log = Logger.getLogger(DifferenceUtil.class);
-
/**
* Constructor
*/
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/HTMLUtil.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/HTMLUtil.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/HTMLUtil.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -25,17 +25,12 @@
import java.io.BufferedWriter;
-import org.jboss.logging.Logger;
-
/**
* The HTML utility class
* @author Jesper Pedersen <jesper.pedersen at jboss.org>
*/
public class HTMLUtil
{
- /** The logger */
- private static Logger log = Logger.getLogger(HTMLUtil.class);
-
/** New line character */
protected static final String NEW_LINE = System.getProperty("line.separator");
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/SnapshotUtil.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/SnapshotUtil.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/SnapshotUtil.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -52,17 +52,12 @@
import java.util.List;
import java.util.Map;
-import org.jboss.logging.Logger;
-
/**
* The snapshot utility class
* @author Jesper Pedersen <jesper.pedersen at jboss.org>
*/
public class SnapshotUtil
{
- /** The logger */
- private static Logger log = Logger.getLogger(SnapshotUtil.class);
-
/** New line character */
protected static final String NEW_LINE = System.getProperty("line.separator");
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/Util.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/Util.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/Util.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -28,17 +28,12 @@
import java.util.List;
-import org.jboss.logging.Logger;
-
/**
* The utility class
* @author Jesper Pedersen <jesper.pedersen at jboss.org>
*/
public class Util
{
- /** The logger */
- private static Logger log = Logger.getLogger(Util.class);
-
/** The plugins */
private static List<Plugin> plugins;
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/cmd/Client.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/cmd/Client.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/cmd/Client.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -38,8 +38,9 @@
import java.io.InputStream;
import java.util.List;
import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
/**
@@ -49,7 +50,7 @@
public class Client
{
/** The logger */
- private static Logger log = Logger.getLogger(Client.class);
+ private static Logger log = Logger.getLogger(Client.class.getName());
/**
* The usage method
@@ -528,7 +529,7 @@
}
catch (Throwable t)
{
- log.error(t.getMessage(), t);
+ log.log(Level.SEVERE, t.getMessage(), t);
}
}
else
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/client/precompiler/Precompiler.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/client/precompiler/Precompiler.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/client/precompiler/Precompiler.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -39,9 +39,9 @@
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-import org.jboss.logging.Logger;
-
import javassist.ClassPool;
import javassist.CtClass;
@@ -52,7 +52,7 @@
public class Precompiler
{
/** The logger */
- private static Logger log = Logger.getLogger(Precompiler.class);
+ private static Logger log = Logger.getLogger(Precompiler.class.getName());
/** Include all */
private static boolean includeAll = false;
@@ -157,7 +157,7 @@
}
catch (Exception e)
{
- log.error("Couldn't move " +
+ log.log(Level.SEVERE, "Couldn't move " +
newJarFile.getAbsolutePath() + " to " + jarFile.getAbsolutePath(), e);
}
}
@@ -205,7 +205,7 @@
}
catch (Exception e)
{
- log.error("Couldn't move " +
+ log.log(Level.SEVERE, "Couldn't move " +
newJarFile.getAbsolutePath() + " to " + f.getAbsolutePath(), e);
}
}
@@ -271,8 +271,7 @@
}
}
- log.debug("Instrumented: " +
- ctClass.getName());
+ log.fine("Instrumented: " + ctClass.getName());
instrumented++;
return true;
@@ -280,8 +279,7 @@
}
catch (Throwable t)
{
- log.warn("Can't precompile: " +
- ctClass.getName());
+ log.warning("Can't precompile: " + ctClass.getName());
}
}
return false;
@@ -337,8 +335,7 @@
*/
private static Visibility parseVisibility(String vs)
{
- log.debug("Visibility=" +
- vs);
+ log.fine("Visibility=" + vs);
if (vs != null)
{
@@ -365,10 +362,8 @@
*/
private static void initIncludeExclude(String include, String exclude)
{
- log.debug("Includes=" +
- include);
- log.debug("Excludes=" +
- exclude);
+ log.fine("Includes=" + include);
+ log.fine("Excludes=" + exclude);
if (include != null)
{
@@ -598,8 +593,7 @@
}
else
{
- log.fatal("Can't locate " +
- f.getAbsolutePath());
+ log.log(Level.SEVERE, "Can't locate " + f.getAbsolutePath());
}
}
Modified: branches/JBossProfiler2/src/main/org/jboss/profiler/embedded/Profiler.java
===================================================================
--- branches/JBossProfiler2/src/main/org/jboss/profiler/embedded/Profiler.java 2010-11-27 14:20:05 UTC (rev 582)
+++ branches/JBossProfiler2/src/main/org/jboss/profiler/embedded/Profiler.java 2010-11-27 14:53:43 UTC (rev 583)
@@ -27,17 +27,12 @@
import java.util.List;
-import org.jboss.logging.Logger;
-
/**
* The client that will handle an embedded agent
* @author Jesper Pedersen <jesper.pedersen at jboss.org>
*/
public class Profiler
{
- /** The logger */
- private static Logger log = Logger.getLogger(Profiler.class);
-
/**
* Constructor
*/
More information about the jboss-cvs-commits
mailing list