User: starksm
Date: 01/09/11 11:38:58
Modified: src/main/org/jboss/resource ConnectionFactoryLoader.java
ConnectionManagerFactoryLoader.java
JBossConnectionListenerImpl.java
JBossResourceSubjectFactory.java RARDeployer.java
RARMetaData.java
Log:
Convert all logging to org.jboss.logging.Logger which is a subclass of
org.apache.log4j.Category.
Revision Changes Path
1.11 +44 -43 jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java
Index: ConnectionFactoryLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConnectionFactoryLoader.java 2001/09/08 19:32:20 1.10
+++ ConnectionFactoryLoader.java 2001/09/11 18:38:57 1.11
@@ -43,8 +43,8 @@
import javax.transaction.TransactionManager;
+import org.jboss.logging.Logger;
import org.jboss.logging.log4j.CategoryWriter;
-import org.jboss.logging.log4j.JBossCategory;
import org.jboss.resource.security.PrincipalMapping;
import org.jboss.system.ServiceMBeanSupport;
@@ -61,7 +61,7 @@
* @author <a href="[EMAIL PROTECTED]">Toby Allsopp</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @see RARDeployer
- * @version $Revision: 1.10 $ <p>
+ * @version $Revision: 1.11 $ <p>
*
* <b>Revisions:</b> <p>
*
@@ -352,7 +352,7 @@
Hashtable environment)
{
// Return the connection factory with the requested name
- category.debug("ConnectionFactoryLoader.getObjectInstance, name = '" +
+ log.debug("ConnectionFactoryLoader.getObjectInstance, name = '" +
name + "'");
synchronized (cfs)
{
@@ -372,7 +372,7 @@
public ObjectName preRegister(MBeanServer server, ObjectName name)
throws java.lang.Exception
{
- category.trace("in preRegister");
+ log.trace("in preRegister");
return super.preRegister(server, name);
}
@@ -384,7 +384,7 @@
public void postRegister(java.lang.Boolean registrationDone)
{
- category.trace("in postRegister");
+ log.trace("in postRegister");
super.postRegister(registrationDone);
}
@@ -399,7 +399,7 @@
*/
public void handleNotification(Notification n, Object handback)
{
- category.debug("Received notification '" + n + "'");
+ log.debug("Received notification '" + n + "'");
// We know that this is relevent to us because of the filter
String type = n.getType();
@@ -415,12 +415,12 @@
}
else
{
- category.error("Unknown notification type: " + type);
+ log.error("Unknown notification type: " + type);
}
}
catch (Exception e)
{
- category.error("Problem loading or unloading connection factory", e);
+ log.error("Problem loading or unloading connection factory", e);
}
}
@@ -436,7 +436,7 @@
}
catch (MalformedObjectNameException mone)
{
- category.error("The name '" + nameStr + "' is malformed", mone);
+ log.error("The name '" + nameStr + "' is malformed", mone);
}
}
return name;
@@ -445,11 +445,12 @@
protected void initService()
throws Exception
{
- //add the factory name to the category:
- category = (JBossCategory)JBossCategory.getInstance(getClass().getName() +
"." + jndiName);
+ //add the factory name to the log:
+ String name = getClass().getName() + "." + jndiName;
+ log = Logger.create(name);
rarDeployerObjectName = new ObjectName(rarDeployerName);
server.addNotificationListener(rarDeployerObjectName, this,
- new RAFilter(category), null);
+ new RAFilter(log), null);
}
protected void startService()
@@ -503,7 +504,7 @@
}
catch (Exception e)
{
- category.error("Problem stopping ConnectionFactoryLoader service:", e);
+ log.error("Problem stopping ConnectionFactoryLoader service:", e);
}
}
}
@@ -534,7 +535,7 @@
}
catch (NamingException ne)
{
- category.error("Unable to obtain initial context", ne);
+ log.error("Unable to obtain initial context", ne);
return;
}
@@ -555,7 +556,7 @@
}
catch (ClassNotFoundException cnfe)
{
- category.error("Unable to load managed connection factory class '" +
+ log.error("Unable to load managed connection factory class '" +
mcfClassName + "'", cnfe);
return;
}
@@ -565,7 +566,7 @@
}
catch (Exception e)
{
- category.error("Unable to instantiate manageed connection factory class '"
+
+ log.error("Unable to instantiate manageed connection factory class '" +
mcfClass + "'", e);
return;
}
@@ -582,7 +583,7 @@
catch (IOException ioe)
{
// This shouldn't happen, so we try to carry on as if it didn't
- category.error("Problem converting properties string '" + mcfProperties +
+ log.error("Problem converting properties string '" + mcfProperties +
"' to Properties", ioe);
}
@@ -597,10 +598,10 @@
{
if (ddProp.value == null)
{
- category.warn("Not setting config property '" + ddProp.name + "'");
+ log.warn("Not setting config property '" + ddProp.name + "'");
continue;
}
- category.warn("Using default value '" + ddProp.value + "' for " +
+ log.warn("Using default value '" + ddProp.value + "' for " +
"config property '" + ddProp.name + "'");
value = ddProp.value;
}
@@ -614,14 +615,14 @@
}
catch (ClassNotFoundException cnfe)
{
- category.warn("Unable to find class '" + ddProp.type + "' for " +
+ log.warn("Unable to find class '" + ddProp.type + "' for " +
"property '" + ddProp.name + "' - skipping property.");
continue;
}
PropertyEditor pe = PropertyEditorManager.findEditor(clazz);
if (pe == null)
{
- category.warn("Unable to find a PropertyEditor for class '" +
+ log.warn("Unable to find a PropertyEditor for class '" +
clazz + "' of property '" + ddProp.name + "' - " +
"skipping property");
continue;
@@ -632,7 +633,7 @@
}
catch (IllegalArgumentException iae)
{
- category.warn("Value '" + value + "' is not valid for property '" +
+ log.warn("Value '" + value + "' is not valid for property '" +
ddProp.name + "' of class '" + clazz + "' - skipping " +
"property");
continue;
@@ -645,34 +646,34 @@
}
catch (NoSuchMethodException nsme)
{
- category.warn("The class '" + mcfClass.toString() + "' has no " +
+ log.warn("The class '" + mcfClass.toString() + "' has no " +
"setter for config property '" + ddProp.name + "'");
continue;
}
try
{
setter.invoke(mcf, new Object[]{v});
- category.debug("set property " + ddProp.name + " to value " + value);
+ log.debug("set property " + ddProp.name + " to value " + value);
}
catch (Exception e)
{
- category.warn("Unable to invoke setter method '" + setter + "' " +
+ log.warn("Unable to invoke setter method '" + setter + "' " +
"on object '" + mcf + "'", e);
}
}
// Give it somewhere to tell people things
- PrintWriter logWriter = new
CategoryWriter(JBossCategory.getInstance(mcf.getClass().getName() + "." + jndiName));
+ PrintWriter logWriter = new
CategoryWriter(Logger.create(mcf.getClass().getName() + "." + jndiName));
try
{
mcf.setLogWriter(logWriter);
}
catch (ResourceException re)
{
- category.warn("Unable to set log writer '" + logWriter + "' on " +
+ log.warn("Unable to set log writer '" + logWriter + "' on " +
"managed connection factory", re);
- category.warn("Linked exception:", re.getLinkedException());
+ log.warn("Linked exception:", re.getLinkedException());
}
// Find the transaction manager
@@ -684,7 +685,7 @@
}
catch (NamingException ne)
{
- category.error("Unable to locate the transaction manager at '" + tmName +
+ log.error("Unable to locate the transaction manager at '" + tmName +
"'", ne);
}
@@ -698,7 +699,7 @@
}
catch (Exception e)
{
- category.error("Unable to instantiate principal mapping class '" +
+ log.error("Unable to instantiate principal mapping class '" +
princMapClass + "'", e);
return;
}
@@ -717,7 +718,7 @@
}
catch (Exception e)
{
- category.error("Unable to find connection manager factory at 'java:/" +
+ log.error("Unable to find connection manager factory at 'java:/" +
cmfName + "'", e);
return;
}
@@ -742,7 +743,7 @@
}
catch (IOException ioe)
{
- category.error("Couldn't convert properties string '" + cmProps + "' to " +
+ log.error("Couldn't convert properties string '" + cmProps + "' to " +
"Properties", ioe);
}
@@ -752,7 +753,7 @@
}
catch (ResourceException re)
{
- category.error("Error initialising connection manager", re);
+ log.error("Error initialising connection manager", re);
return;
}
@@ -768,14 +769,14 @@
}
catch (ResourceException re)
{
- category.error("Unable to create connection factory", re);
+ log.error("Unable to create connection factory", re);
return;
}
// Bind it into JNDI
bindName = "java:/" + jndiName;
- category.debug("Binding object '" + cf + "' into JNDI at '" + bindName + "'");
+ log.debug("Binding object '" + cf + "' into JNDI at '" + bindName + "'");
synchronized (cfs)
{
cfs.put(jndiName, cf);
@@ -786,12 +787,12 @@
try
{
ctx.bind(bindName, cf);
- category.info("Bound connection factory for resource adapter '" +
+ log.info("Bound connection factory for resource adapter '" +
resourceAdapterName + "' to JNDI name '" + bindName + "'");
}
catch (NamingException ne)
{
- category.error("Unable to bind connection factory to JNDI name '" +
+ log.error("Unable to bind connection factory to JNDI name '" +
bindName + "'", ne);
}
}
@@ -807,7 +808,7 @@
cm.shutDown();
cfs.remove(jndiName);
- category.info("Connection factory '" + jndiName + "' shut down.");
+ log.info("Connection factory '" + jndiName + "' shut down.");
// Unbind from JNDI
@@ -817,7 +818,7 @@
}
catch (NamingException ne)
{
- category.error("Unable to unbind connection factory at JNDI location '" +
+ log.error("Unable to unbind connection factory at JNDI location '" +
bindName + "'", ne);
}
}
@@ -863,11 +864,11 @@
*/
private class RAFilter implements NotificationFilter
{
- private JBossCategory category;
+ private Logger log;
- private RAFilter(JBossCategory category)
+ private RAFilter(Logger log)
{
- this.category = category;
+ this.log = log;
}
/**
@@ -878,7 +879,7 @@
*/
public boolean isNotificationEnabled(Notification n)
{
- category.debug("Evaluating notification type='" + n.getType() + "', " +
+ log.debug("Evaluating notification type='" + n.getType() + "', " +
"message='" + n.getMessage() + "'");
return
n.getType().startsWith(DEPLOYMENT_NOTIFICATION) &&
1.6 +8 -7
jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java
Index: ConnectionManagerFactoryLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionManagerFactoryLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConnectionManagerFactoryLoader.java 2001/08/30 02:19:22 1.5
+++ ConnectionManagerFactoryLoader.java 2001/09/11 18:38:58 1.6
@@ -27,7 +27,7 @@
import javax.transaction.TransactionManager;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBeanSupport;
/**
@@ -36,7 +36,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ConnectionManagerFactoryLoader
extends ServiceMBeanSupport
@@ -188,7 +188,7 @@
Hashtable environment)
{
// Return the connection factory with the requested name
- category.debug("ConnectionManagerLoader.getObjectInstance, name = '" +
+ log.debug("ConnectionManagerLoader.getObjectInstance, name = '" +
name + "'");
synchronized (cmfs)
{
@@ -227,7 +227,7 @@
bind(ctx, "java:/" + factoryName,
new Reference(cmf.getClass().getName(), getClass().getName(), null));
- category.info("Connection manager factory '" + factoryName + " bound to " +
+ log.info("Connection manager factory '" + factoryName + " bound to " +
"'java:/" + factoryName + "'");
}
@@ -240,7 +240,7 @@
try
{
new InitialContext().unbind("java:/" + factoryName);
- category.info("Connection manager factory '" + factoryName +
+ log.info("Connection manager factory '" + factoryName +
"' removed from JNDI");
}
catch (NamingException e)
@@ -259,7 +259,7 @@
}
catch (MalformedObjectNameException mone)
{
- category.error("The name '" + nameStr + "' is malformed", mone);
+ log.error("The name '" + nameStr + "' is malformed", mone);
}
}
return name;
@@ -268,7 +268,8 @@
protected void initService()
throws Exception
{
- category = (JBossCategory)JBossCategory.getInstance(getClass().getName() +
"." + factoryName);
+ String name = getClass().getName() + "." + factoryName;
+ log = Logger.create(name);
}
// Package protected ---------------------------------------------
1.4 +4 -4
jbosscx/src/main/org/jboss/resource/JBossConnectionListenerImpl.java
Index: JBossConnectionListenerImpl.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/JBossConnectionListenerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JBossConnectionListenerImpl.java 2001/08/21 03:27:20 1.3
+++ JBossConnectionListenerImpl.java 2001/09/11 18:38:58 1.4
@@ -8,7 +8,7 @@
import javax.resource.spi.ManagedConnectionFactory;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
/**
* There exists one instance of this class for each connection factory. This
@@ -19,7 +19,7 @@
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @see ConnectionManagerFactory
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JBossConnectionListenerImpl
implements JBossConnectionListener
@@ -30,7 +30,7 @@
private ManagedConnectionFactory mcf;
private JBossConnectionManager cm;
- private JBossCategory category;
+ private Logger category;
// Static --------------------------------------------------------
@@ -39,7 +39,7 @@
JBossConnectionListenerImpl(ManagedConnectionFactory mcf, String factoryName)
{
this.mcf = mcf;
- category = (JBossCategory)JBossCategory.getInstance(getClass().getName() +
"." + factoryName);
+ category = Logger.create(getClass().getName() + "." + factoryName);
}
// Public --------------------------------------------------------
1.4 +3 -3
jbosscx/src/main/org/jboss/resource/JBossResourceSubjectFactory.java
Index: JBossResourceSubjectFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/JBossResourceSubjectFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JBossResourceSubjectFactory.java 2001/08/21 03:27:20 1.3
+++ JBossResourceSubjectFactory.java 2001/09/11 18:38:58 1.4
@@ -13,7 +13,7 @@
import javax.security.auth.Subject;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
import org.jboss.resource.security.PrincipalMapping;
@@ -25,7 +25,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JBossResourceSubjectFactory
implements ResourceSubjectFactory
@@ -33,7 +33,7 @@
// Static --------------------------------------------------------
- private static JBossCategory category =
(JBossCategory)JBossCategory.getInstance("org.jboss.resource.JBossResourceSubjectFactory");
+ private static Logger category =
Logger.create("org.jboss.resource.JBossResourceSubjectFactory");
private static Method getPrincipalMethod;
private final static Object[] noArgs = new Object[0];
1.10 +3 -3 jbosscx/src/main/org/jboss/resource/RARDeployer.java
Index: RARDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARDeployer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RARDeployer.java 2001/09/08 19:32:20 1.9
+++ RARDeployer.java 2001/09/11 18:38:58 1.10
@@ -31,7 +31,7 @@
import org.jboss.deployment.DeployerMBeanSupport;
import org.jboss.deployment.DeploymentException;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
import org.jboss.metadata.XmlFileLoader;
import org.w3c.dom.Document;
@@ -46,7 +46,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
-* @version $Revision: 1.9 $
+* @version $Revision: 1.10 $
* @see org.jboss.resource.ConnectionFactoryLoader <p>
*
* <b>Revisions:</b> <p>
@@ -77,7 +77,7 @@
/*
* log4j Category for logging
*/
- private JBossCategory category =
(JBossCategory)JBossCategory.getInstance(RARDeployer.class);
+ private Logger category = Logger.create(RARDeployer.class);
/**
* The directory that will contain local copies of deployed RARs
1.9 +3 -3 jbosscx/src/main/org/jboss/resource/RARMetaData.java
Index: RARMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARMetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RARMetaData.java 2001/08/21 03:27:20 1.8
+++ RARMetaData.java 2001/09/11 18:38:58 1.9
@@ -13,7 +13,7 @@
import java.util.Map;
import org.jboss.deployment.DeploymentException;
-import org.jboss.logging.log4j.JBossCategory;
+import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlLoadable;
import org.w3c.dom.Element;
@@ -25,7 +25,7 @@
*
* @author Toby Allsopp ([EMAIL PROTECTED])
* @see RARDeployer
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class RARMetaData
// extends Y
@@ -38,7 +38,7 @@
// Attributes ----------------------------------------------------
- private JBossCategory category =
(JBossCategory)JBossCategory.getInstance(RARMetaData.class);
+ private Logger category = Logger.create(RARMetaData.class);
private ClassLoader classLoader;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
