User: starksm
Date: 01/09/11 11:35:03
Modified: src/main/org/jboss/naming ExternalContext.java JNDIView.java
NamingService.java
Log:
Convert all logging to org.jboss.logging.Logger which is a subclass of
org.apache.log4j.Category.
Revision Changes Path
1.10 +3 -6 jboss/src/main/org/jboss/naming/ExternalContext.java
Index: ExternalContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/naming/ExternalContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExternalContext.java 2001/08/30 03:31:21 1.9
+++ ExternalContext.java 2001/09/11 18:35:03 1.10
@@ -33,9 +33,6 @@
import javax.naming.ldap.Control;
import javax.naming.spi.ObjectFactory;
-import org.jnp.server.Main;
-
-import org.jboss.logging.Log;
import org.jboss.system.ServiceMBeanSupport;
/** A MBean that binds an arbitrary InitialContext into the JBoss default
@@ -46,8 +43,8 @@
@see org.jboss.naming.NonSerializableFactory
-@author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
-@version $Revision: 1.9 $
+@author [EMAIL PROTECTED]
+@version $Revision: 1.10 $
*/
public class ExternalContext extends ServiceMBeanSupport implements
ExternalContextMBean
{
@@ -259,7 +256,7 @@
}
catch(NamingException e)
{
- log.exception(e);
+ log.error("unbind failed", e);
}
}
1.10 +7 -8 jboss/src/main/org/jboss/naming/JNDIView.java
Index: JNDIView.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/naming/JNDIView.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JNDIView.java 2001/08/30 03:31:21 1.9
+++ JNDIView.java 2001/09/11 18:35:03 1.10
@@ -25,7 +25,6 @@
import org.jboss.ejb.Application;
import org.jboss.ejb.Container;
import org.jboss.ejb.ContainerFactoryMBean;
-import org.jboss.logging.Log;
import org.jboss.system.ServiceMBeanSupport;
/** A simple utlity mbean that allows one to recursively list the default
@@ -37,7 +36,7 @@
@author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
@author Vladimir Blagojevic <[EMAIL PROTECTED]>
-@version $Revision: 1.9 $
+@version $Revision: 1.10 $
*/
public class JNDIView extends ServiceMBeanSupport implements JNDIViewMBean
{
@@ -78,7 +77,7 @@
}
catch(Exception e)
{
- log.exception(e);
+ log.error("getDeployedApplications failed", e);
buffer.append("Failed to getDeployedApplications\n");
formatException(buffer, e);
buffer.insert(0, "<pre>");
@@ -133,7 +132,7 @@
}
catch(NamingException e)
{
- log.exception(e);
+ log.error("lookup for java: failed", e);
buffer.append("Failed to get InitialContext, "+e.toString(true));
formatException(buffer, e);
}
@@ -149,7 +148,7 @@
}
catch(NamingException e)
{
- log.exception(e);
+ log.error("Failed to get InitialContext", e);
buffer.append("Failed to get InitialContext, "+e.toString(true));
formatException(buffer, e);
}
@@ -182,7 +181,7 @@
}
catch(Exception e)
{
- log.exception(e);
+ log.error("getDeployedApplications failed", e);
buffer.append( "<jndi>" );
buffer.append( "<error>" );
buffer.append( '\n' );
@@ -260,7 +259,7 @@
}
catch(NamingException e)
{
- log.exception(e);
+ log.error("Failed to get InitialContext", e);
buffer.append( "<error>" );
buffer.append( '\n' );
buffer.append( "<message>" + "Failed to get InitialContext, " +
e.toString( true ) + "</message>" );
@@ -283,7 +282,7 @@
}
catch(NamingException e)
{
- log.exception(e);
+ log.error("Failed to get InitialContext", e);
buffer.append( "<error>" );
buffer.append( '\n' );
buffer.append( "<message>" + "Failed to get InitialContext, " +
e.toString( true ) + "</message>" );
1.17 +8 -9 jboss/src/main/org/jboss/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/naming/NamingService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NamingService.java 2001/08/30 03:31:21 1.16
+++ NamingService.java 2001/09/11 18:35:03 1.17
@@ -22,14 +22,13 @@
import org.jnp.server.Main;
-import org.jboss.logging.Log;
import org.jboss.system.ServiceMBeanSupport;
/** A JBoss service that starts the jnp JNDI server.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rickard �berg</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*
* Revisions:
* 20010622 scott.stark: Report IntialContext env for problem tracing
@@ -48,7 +47,7 @@
// Constructors --------------------------------------------------
public NamingService()
{
- String categoryName = category.getName();
+ String categoryName = log.getName();
naming = new Main(categoryName);
}
@@ -138,7 +137,7 @@
{
String key = (String) keys.nextElement();
String value = props.getProperty(key);
- category.debug("System.setProperty, key="+key+", value="+value);
+ log.debug("System.setProperty, key="+key+", value="+value);
System.setProperty(key, value);
}
}
@@ -154,32 +153,32 @@
InitialContext iniCtx = new InitialContext();
Hashtable env = iniCtx.getEnvironment();
Enumeration keys = env.keys();
- category.info("InitialContext Environment:");
+ log.info("InitialContext Environment:");
String providerURL = null;
while( keys.hasMoreElements() )
{
String key = (String) keys.nextElement();
String value = (String) env.get(key);
- category.info("key="+key+", value="+value);
+ log.info("key="+key+", value="+value);
if( key.equals(Context.PROVIDER_URL) )
providerURL = value;
}
// Warn if there was a Context.PROVIDER_URL
if( providerURL != null )
- category.warn("Saw Context.PROVIDER_URL in server jndi.properties,
url="+providerURL);
+ log.warn("Saw Context.PROVIDER_URL in server jndi.properties,
url="+providerURL);
// Create "java:comp/env"
RefAddr refAddr = new StringRefAddr("nns", "ENC");
Reference envRef = new Reference("javax.naming.Context", refAddr,
ENCFactory.class.getName(), null);
Context ctx = (Context)iniCtx.lookup("java:");
ctx.rebind("comp", envRef);
- category.info("Naming started on port "+naming.getPort());
+ log.info("Naming started on port "+naming.getPort());
}
public void stopService()
{
naming.stop();
- category.info("JNP server stopped");
+ log.info("JNP server stopped");
}
// Protected -----------------------------------------------------
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
