Menu
▾
▴
[jboss-cvs] jmx/src/main/org/jboss/mx/loading MLetParser.java UnifiedClassLoader.java UnifiedLoaderRepository.java
|
From: Adrian B. <ej...@us...> - 2002-05-05 12:02:19
|
User: ejort
Date: 02/05/05 05:02:19
Modified: src/main/org/jboss/mx/loading MLetParser.java
UnifiedClassLoader.java
UnifiedLoaderRepository.java
Log:
Fix System.out logging - Make log4j the default logging when the log4j classes are available
Revision Changes Path
1.4 +9 -5 jmx/src/main/org/jboss/mx/loading/MLetParser.java
Index: MLetParser.java
===================================================================
RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/loading/MLetParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MLetParser.java 13 Mar 2002 14:44:53 -0000 1.3
+++ MLetParser.java 5 May 2002 12:02:19 -0000 1.4
@@ -21,6 +21,8 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import org.jboss.mx.logging.Logger;
+
/**
* Parses an MLet text file confirming to spec format.
*
@@ -28,12 +30,16 @@
* @see javax.management.MBeanFileParser
*
* @author <a href="mailto:ju...@jb...">Juha Lindfors</a>.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class MLetParser
implements MBeanFileParser
{
+ // Static --------------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(MLetParser.class);
+
// MBeanFileParser implementation --------------------------------
/**
@@ -149,8 +155,7 @@
// couldn't find a valid attribute, value pair
// ignore and move to next one
- // FIXME: log this somewhere
- System.out.println("No value found for attribute '" + attributeName);
+ log.warn("No value found for attribute '" + attributeName);
}
}
@@ -193,8 +198,7 @@
// malformed ARG tag means the MBean can't be instantiated
element = null;
- // FIXME: log this
- System.out.println("Malformed element: <" + buf.toString() + ">");
+ log.warn("Malformed element: <" + buf.toString() + ">");
}
}
} // end of if (c == '<')
1.5 +8 -3 jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java
Index: UnifiedClassLoader.java
===================================================================
RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/loading/UnifiedClassLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnifiedClassLoader.java 24 Apr 2002 14:35:23 -0000 1.4
+++ UnifiedClassLoader.java 5 May 2002 12:02:19 -0000 1.5
@@ -20,6 +20,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.mx.logging.Logger;
+
/**
* A ClassLoader which loads classes from a single URL in conjunction with
* the {@link UnifiedLoaderRepository}. Notice that this classloader does
@@ -31,7 +33,7 @@
* @author <a href="chr...@jb...">Christoph G. Jung</a>
* @author <a href="sco...@jb...">Scott Stark</a>
* @author <a href="ju...@jb...">Juha Lindfors</a>
-* @version <tt>$Revision: 1.4 $</tt>
+* @version <tt>$Revision: 1.5 $</tt>
*
* <p><b>20010830 marc fleury:</b>
* <ul>
@@ -66,6 +68,10 @@
/** Class definitions */
private Map classes = new ConcurrentReaderHashMap();
+ // Static --------------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(UnifiedClassLoader.class);
+
// Constructors --------------------------------------------------
/**
* Construct a <tt>UnifiedClassLoader</tt> without registering it to the
@@ -77,8 +83,7 @@
{
super(new URL[] {url}, UnifiedClassLoader.class.getClassLoader());
- // FIXME: log it
- //System.out.println("New jmx UCL with url " + url);
+ log.debug("New jmx UCL with url " + url);
this.url = url;
}
1.6 +11 -9 jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository.java
Index: UnifiedLoaderRepository.java
===================================================================
RCS file: /cvsroot/jboss/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnifiedLoaderRepository.java 24 Apr 2002 02:37:31 -0000 1.5
+++ UnifiedLoaderRepository.java 5 May 2002 12:02:19 -0000 1.6
@@ -28,6 +28,7 @@
import javax.management.ObjectName;
import javax.management.NotificationBroadcaster;
+import org.jboss.mx.logging.Logger;
/**
* <description>
@@ -37,7 +38,7 @@
* @author <a href="mailto:ma...@jb...">Marc Fleury</a>
* @author <a href="mailto:os...@sp...">Ole Husgaard</a>
* @author <a href="mailto:ju...@jb...">Juha Lindfors</a>.
-* @version $Revision: 1.5 $
+* @version $Revision: 1.6 $
* just a hint... xdoclet not really used
* @jmx.name="JMImplementation:service=UnifiedLoaderRepository,name=Default"
*
@@ -131,7 +132,11 @@
// keep track of CLs with sleeping threads
private Set clsWithWaitingThreads = new HashSet();
-
+
+ // Static --------------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(UnifiedLoaderRepository.class);
+
// Public --------------------------------------------------------
/**
* Add a class to this repository. Allows a class to be added in
@@ -448,8 +453,7 @@
}
catch(ClassNotFoundException e)
{
- System.out.println("Failed to load class: "+name+ "\n" +e.toString());
- //log.debug("Failed to load class: "+name, e);
+ log.debug("Failed to load class: "+name, e);
}
}
}
@@ -541,7 +545,7 @@
{
// addNonDelegatingClassLoader(loader);
//throw new RuntimeException("ULR only allows UCL to be added");
- System.out.println("Tried to add non- URLClassLoader. Ignored");
+ log.warn("Tried to add non- URLClassLoader. Ignored");
} // end of else
}
@@ -558,13 +562,11 @@
classLoaders.add(cl);
- // FIXME: log it
- //System.out.println("UnifiedLoaderRepository adding UnifiedClassLoader " + cl.hashCode() + " key URL " + cl.getURL());
+ log.debug("UnifiedLoaderRepository adding UnifiedClassLoader " + cl.hashCode() + " key URL " + cl.getURL());
}
else
{
- // FIXME: log it
- System.out.println("UnifiedLoaderRepository skipping duplicate UnifiedClassLoader for key URL " + cl.getURL());
+ log.debug("UnifiedLoaderRepository skipping duplicate UnifiedClassLoader for key URL " + cl.getURL());
}
}
|