User: starksm
Date: 01/09/11 11:35:04
Modified: src/main/org/jboss/web WebServer.java WebService.java
Log:
Convert all logging to org.jboss.logging.Logger which is a subclass of
org.apache.log4j.Category.
Revision Changes Path
1.13 +17 -17 jboss/src/main/org/jboss/web/WebServer.java
Index: WebServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/WebServer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebServer.java 2001/08/06 16:08:35 1.12
+++ WebServer.java 2001/09/11 18:35:04 1.13
@@ -23,7 +23,7 @@
import java.util.HashMap;
import java.util.Properties;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
/**
* A mini webserver that should be embedded in another application. It can server
any file that is available from
@@ -38,7 +38,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*
* Revisions:
*
@@ -54,7 +54,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- private static JBossCategory category =
(JBossCategory)JBossCategory.getInstance(WebServer.class);
+ private static Logger log = Logger.create(WebServer.class);
/** The port the web server listens on */
private int port = 8083;
@@ -112,7 +112,7 @@
catch(UnknownHostException e)
{
String msg = "Invalid host address specified: " + host;
- category.error(msg, e);
+ log.error(msg, e);
}
}
@@ -158,7 +158,7 @@
try
{
server = new ServerSocket(port, backlog, bindAddress);
- category.debug("Started server: "+server);
+ log.debug("Started server: "+server);
listen();
}
catch (IOException e)
@@ -213,7 +213,7 @@
e.printStackTrace();
}
}
- category.trace("Added ClassLoader: "+cl+" URL: "+loaderURL);
+ log.trace("Added ClassLoader: "+cl+" URL: "+loaderURL);
return loaderURL;
}
@@ -247,7 +247,7 @@
{
// If the server is not null meaning we were not stopped report the err
if( server != null )
- category.error("Failed to accept connection", e);
+ log.error("Failed to accept connection", e);
return;
}
@@ -267,8 +267,8 @@
int separator = rawPath.indexOf('/');
String filePath = rawPath.substring(separator+1);
String loaderKey = rawPath.substring(0, separator+1);
- category.trace("loaderKey = "+loaderKey);
- category.trace("filePath = "+filePath);
+ log.trace("loaderKey = "+loaderKey);
+ log.trace("filePath = "+filePath);
ClassLoader loader = (ClassLoader) loaderMap.get(loaderKey);
/* If we did not find a class loader check to see if the raw path
begins with className + '@' + cl.hashCode() + '/' by looking for
@@ -278,19 +278,19 @@
if( loader == null && rawPath.indexOf('@') < 0 )
{
filePath = rawPath;
- category.trace("No loader, reset filePath = "+filePath);
+ log.trace("No loader, reset filePath = "+filePath);
loader = Thread.currentThread().getContextClassLoader();
}
- category.trace("loader = "+loader);
+ log.trace("loader = "+loader);
byte[] bytes;
if( filePath.endsWith(".class") )
{
// A request for a class file
String className = filePath.substring(0,
filePath.length()-6).replace('/','.');
- category.trace("loading className = "+className);
+ log.trace("loading className = "+className);
Class clazz = loader.loadClass(className);
URL clazzUrl =
clazz.getProtectionDomain().getCodeSource().getLocation();
- category.trace("clazzUrl = "+clazzUrl);
+ log.trace("clazzUrl = "+clazzUrl);
if (clazzUrl.getFile().endsWith(".jar"))
clazzUrl = new URL("jar:"+clazzUrl+"!/"+filePath);
else
@@ -304,7 +304,7 @@
else // Resource
{
// Try getting resource
- category.trace("loading resource = "+filePath);
+ log.trace("loading resource = "+filePath);
URL resourceUrl = loader.getResource(filePath);
if (resourceUrl == null)
throw new FileNotFoundException("Resource not
found:"+filePath);
@@ -348,7 +348,7 @@
{
// eat exception (could log error to log file, but
// write out to stdout for now).
- category.debug("error writing response: " + ex.getMessage());
+ log.debug("error writing response: " + ex.getMessage());
ex.printStackTrace();
}
finally
@@ -388,7 +388,7 @@
protected String getPath(BufferedReader in) throws IOException
{
String line = in.readLine();
- category.trace("raw request="+line);
+ log.trace("raw request="+line);
// Find the request path by parsing the 'REQUEST_TYPE filePath
HTTP_VERSION' string
int start = line.indexOf(' ')+1;
int end = line.indexOf(' ', start+1);
@@ -402,7 +402,7 @@
protected byte[] getBytes(URL url) throws IOException
{
InputStream in = new BufferedInputStream(url.openStream());
- category.debug("Retrieving "+url.toString());
+ log.debug("Retrieving "+url.toString());
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[] tmp = new byte[1024];
int bytes;
1.11 +5 -5 jboss/src/main/org/jboss/web/WebService.java
Index: WebService.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/WebService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebService.java 2001/08/30 04:13:42 1.10
+++ WebService.java 2001/09/11 18:35:04 1.11
@@ -24,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>.
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class WebService
extends ServiceMBeanSupport
@@ -59,7 +59,7 @@
}
catch (IOException e)
{
- category.error("Failed to load mime.types", e);
+ log.error("Failed to load mime.types", e);
}
// Get the public host name
try
@@ -76,7 +76,7 @@
}
catch(IOException e)
{
- category.error("Failed to get localhost name", e);
+ log.error("Failed to get localhost name", e);
}
}
@@ -101,7 +101,7 @@
{
// Start the WebServer running
server.start();
- category.info("Started webserver with address: " + server.getBindAddress() +
" port: "+server.getPort());
+ log.info("Started webserver with address: " + server.getBindAddress() + "
port: "+server.getPort());
// Set the rmi codebase if it is not already set
String codebase = System.getProperty("java.rmi.server.codebase");
@@ -110,7 +110,7 @@
codebase = "http://"+host+":"+getPort()+"/";
System.setProperty("java.rmi.server.codebase", codebase);
}
- category.info("Codebase set to: "+codebase);
+ log.info("Codebase set to: "+codebase);
}
public void stopService()
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
