User: starksm
Date: 01/11/20 01:42:58
Modified: src/main/org/jboss/web Tag: Branch_2_4
AbstractWebContainer.java WebServer.java
WebService.java
Log:
Change to the unified log4j based org.jboss.logging.Logger class.
Revision Changes Path
No revision
No revision
1.4.4.8 +17 -19 jboss/src/main/org/jboss/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
retrieving revision 1.4.4.7
retrieving revision 1.4.4.8
diff -u -r1.4.4.7 -r1.4.4.8
--- AbstractWebContainer.java 2001/11/12 19:32:56 1.4.4.7
+++ AbstractWebContainer.java 2001/11/20 09:42:58 1.4.4.8
@@ -14,8 +14,6 @@
import org.w3c.dom.Element;
-import org.apache.log4j.Category;
-
import org.jboss.deployment.DeploymentException;
import org.jboss.metadata.EjbRefMetaData;
import org.jboss.metadata.EnvEntryMetaData;
@@ -115,7 +113,7 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.4.4.7 $
+@version $Revision: 1.4.4.8 $
*/
public abstract class AbstractWebContainer extends ServiceMBeanSupport implements
AbstractWebContainerMBean
{
@@ -294,7 +292,7 @@
*/
protected void parseWebAppDescriptors(ClassLoader loader, Element webApp,
Element jbossWeb) throws Exception
{
- category.debug("AbstractWebContainer.parseWebAppDescriptors, Begin");
+ log.debug("AbstractWebContainer.parseWebAppDescriptors, Begin");
WebMetaData metaData = new WebMetaData();
metaData.importXml(webApp);
if( jbossWeb != null )
@@ -310,7 +308,7 @@
envCtx = (Context) iniCtx.lookup("java:comp");
// Add a link to the global transaction manager
envCtx.bind("UserTransaction", new LinkRef("UserTransaction"));
- category.debug("Linking java:comp/UserTransaction to JNDI name:
UserTransaction");
+ log.debug("Linking java:comp/UserTransaction to JNDI name:
UserTransaction");
envCtx = envCtx.createSubcontext("env");
}
finally
@@ -319,21 +317,21 @@
}
Iterator envEntries = metaData.getEnvironmentEntries();
- category.debug("addEnvEntries");
+ log.debug("addEnvEntries");
addEnvEntries(envEntries, envCtx);
Iterator resourceEnvRefs = metaData.getResourceEnvReferences();
- category.debug("linkResourceEnvRefs");
+ log.debug("linkResourceEnvRefs");
linkResourceEnvRefs(resourceEnvRefs, envCtx);
Iterator resourceRefs = metaData.getResourceReferences();
- category.debug("linkResourceRefs");
+ log.debug("linkResourceRefs");
linkResourceRefs(resourceRefs, envCtx);
Iterator ejbRefs = metaData.getEjbReferences();
- category.debug("linkEjbRefs");
+ log.debug("linkEjbRefs");
linkEjbRefs(ejbRefs, envCtx);
String securityDomain = metaData.getSecurityDomain();
- category.debug("linkSecurityDomain");
+ log.debug("linkSecurityDomain");
linkSecurityDomain(securityDomain, envCtx);
- category.debug("AbstractWebContainer.parseWebAppDescriptors, End");
+ log.debug("AbstractWebContainer.parseWebAppDescriptors, End");
}
protected void addEnvEntries(Iterator envEntries, Context envCtx)
@@ -342,7 +340,7 @@
while( envEntries.hasNext() )
{
EnvEntryMetaData entry = (EnvEntryMetaData) envEntries.next();
- category.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
+ log.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
EnvEntryMetaData.bindEnvEntry(envCtx, entry);
}
}
@@ -359,7 +357,7 @@
{
try
{
- category.debug("Binding '"+refName+"' to URL: "+resourceName);
+ log.debug("Binding '"+refName+"' to URL: "+resourceName);
URL url = new URL(resourceName);
Util.bind(envCtx, refName, url);
}
@@ -370,7 +368,7 @@
}
else
{
- category.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
+ log.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
Util.bind(envCtx, refName, new LinkRef(resourceName));
}
}
@@ -388,7 +386,7 @@
{
try
{
- category.debug("Binding '"+refName+"' to URL: "+jndiName);
+ log.debug("Binding '"+refName+"' to URL: "+jndiName);
URL url = new URL(jndiName);
Util.bind(envCtx, refName, url);
}
@@ -399,7 +397,7 @@
}
else
{
- category.debug("Linking '"+refName+"' to JNDI name: "+jndiName);
+ log.debug("Linking '"+refName+"' to JNDI name: "+jndiName);
Util.bind(envCtx, refName, new LinkRef(jndiName));
}
}
@@ -416,7 +414,7 @@
String linkName = ejb.getLink();
if( jndiName == null )
jndiName = linkName;
- category.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
+ log.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
if( jndiName == null )
throw new NamingException("ejb-ref: "+name+", expected jndi-name
in jboss-web.xml");
Util.bind(envCtx, name, new LinkRef(jndiName));
@@ -437,7 +435,7 @@
{
if( securityDomain == null )
{
- category.debug("Binding security/securityMgr to NullSecurityManager");
+ log.debug("Binding security/securityMgr to NullSecurityManager");
Object securityMgr = new NullSecurityManager("java:/jaas/null");
Util.bind(envCtx, "security/securityMgr", securityMgr);
Util.bind(envCtx, "security/realmMapping", securityMgr);
@@ -446,7 +444,7 @@
}
else
{
- category.debug("Linking security/securityMgr to JNDI name:
"+securityDomain);
+ log.debug("Linking security/securityMgr to JNDI name: "+securityDomain);
Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain));
Util.bind(envCtx, "security/security-domain", new
LinkRef(securityDomain));
1.5.4.6 +20 -20 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.5.4.5
retrieving revision 1.5.4.6
diff -u -r1.5.4.5 -r1.5.4.6
--- WebServer.java 2001/09/20 17:53:43 1.5.4.5
+++ WebServer.java 2001/11/20 09:42:58 1.5.4.6
@@ -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.5.4.5 $
+ * @version $Revision: 1.5.4.6 $
*
* Revisions:
*
@@ -54,7 +54,7 @@
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- private static JBossCategory category =
(JBossCategory)JBossCategory.getInstance(WebServer.class);
+ private static Logger log = Logger.getLogger(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;
}
@@ -268,8 +268,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
@@ -279,19 +279,19 @@
if( loader == null && rawPath.indexOf('@') < 0 &&
downloadServerClasses )
{
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( loader != null && 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
@@ -305,14 +305,14 @@
else if( loader != null && filePath.length() > 0 &&
downloadServerClasses )
{
// Try getting resource
- category.trace("loading resource = "+filePath);
+ log.trace("loading resource = "+filePath);
URL resourceURL = loader.getResource(filePath);
if (resourceURL == null)
httpCode = "404 Resource not found:"+filePath;
else
{
// Retrieve bytes
- category.trace("resourceURL = "+resourceURL);
+ log.trace("resourceURL = "+resourceURL);
bytes = getBytes(resourceURL);
}
}
@@ -324,7 +324,7 @@
// Send bytecodes/resource data in response (assumes HTTP/1.0 or
later)
try
{
- category.trace("HTTP code="+httpCode+", Content-Length: " +
bytes.length);
+ log.trace("HTTP code="+httpCode+", Content-Length: " +
bytes.length);
// The HTTP 1.0 header
out.writeBytes("HTTP/1.0 "+httpCode+"\r\n");
out.writeBytes("Content-Length: " + bytes.length + "\r\n");
@@ -343,7 +343,7 @@
{
try
{
- category.trace("HTTP code=404 " + e.getMessage());
+ log.trace("HTTP code=404 " + e.getMessage());
// Write out error response
out.writeBytes("HTTP/1.0 404 " + e.getMessage() + "\r\n");
out.writeBytes("Content-Type: text/html\r\n\r\n");
@@ -358,7 +358,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
@@ -398,7 +398,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);
@@ -412,7 +412,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.4.4.3 +12 -12 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.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- WebService.java 2001/08/20 22:12:53 1.4.4.2
+++ WebService.java 2001/11/20 09:42:58 1.4.4.3
@@ -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.4.4.2 $
+ * @version $Revision: 1.4.4.3 $
*/
public class WebService
extends ServiceMBeanSupport
@@ -49,17 +49,17 @@
{
mimeTypes.load(getClass().getResourceAsStream("mime.types"));
- Enumeration keys = mimeTypes.keys();
- while (keys.hasMoreElements())
- {
- String extension = (String)keys.nextElement();
- String type = mimeTypes.getProperty(extension);
- server.addMimeType(extension, type);
- }
+ Enumeration keys = mimeTypes.keys();
+ while (keys.hasMoreElements())
+ {
+ String extension = (String)keys.nextElement();
+ String type = mimeTypes.getProperty(extension);
+ server.addMimeType(extension, type);
+ }
}
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
