User: starksm
Date: 01/09/11 11:35:01
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata
JDBCApplicationMetaData.java
JDBCMappingMetaData.java JDBCXmlFileLoader.java
Log:
Convert all logging to org.jboss.logging.Logger which is a subclass of
org.apache.log4j.Category.
Revision Changes Path
1.11 +6 -7
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCApplicationMetaData.java
Index: JDBCApplicationMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCApplicationMetaData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JDBCApplicationMetaData.java 2001/09/01 22:03:17 1.10
+++ JDBCApplicationMetaData.java 2001/09/11 18:35:00 1.11
@@ -16,8 +16,6 @@
import javax.naming.NamingException;
import javax.sql.DataSource;
import org.jboss.ejb.DeploymentException;
-
-// TODO this needs to be replaced with the log4j logging
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -33,11 +31,12 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
-public final class JDBCApplicationMetaData {
+public final class JDBCApplicationMetaData
+{
public final static String JDBC_PM =
"org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager";
-
+ static Logger log = Logger.create(JDBCApplicationMetaData.class);
/**
* The class loader for this application. The class loader is used to load all
classes
* used by this application.
@@ -189,7 +188,7 @@
entities.put(entityMetaData.getName(), entityMetaData);
entitiesByAbstractSchemaName.put(entityMetaData.getAbstractSchemaName(),
entityMetaData);
} else {
- Logger.warning("Warning: data found in jbosscmp-jdbc.xml for entity
" + ejbName + " but bean is not a jbosscmp-jdbc-managed cmp entity in ejb-jar.xml");
+ log.warn("Warning: data found in jbosscmp-jdbc.xml for entity " +
ejbName + " but bean is not a jbosscmp-jdbc-managed cmp entity in ejb-jar.xml");
}
}
}
@@ -236,7 +235,7 @@
Map rightEntityRoles =
(Map)entityRoles.get(right.getEntity().getName());
rightEntityRoles.put(right.getRelationshipRoleName(), right);
} else {
- Logger.warning("Warning: data found in jbosscmp-jdbc.xml for
relation " + relationName + " but relation is not a jbosscmp-jdbc-managed relation in
ejb-jar.xml");
+ log.warn("Warning: data found in jbosscmp-jdbc.xml for relation " +
relationName + " but relation is not a jbosscmp-jdbc-managed relation in ejb-jar.xml");
}
}
}
1.6 +5 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCMappingMetaData.java
Index: JDBCMappingMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCMappingMetaData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCMappingMetaData.java 2001/09/01 22:03:17 1.5
+++ JDBCMappingMetaData.java 2001/09/11 18:35:00 1.6
@@ -8,8 +8,6 @@
import java.sql.Types;
import org.jboss.ejb.DeploymentException;
-
-// TODO this needs to be replaced with the log4j logging
import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
@@ -21,9 +19,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
-public final class JDBCMappingMetaData {
+public final class JDBCMappingMetaData
+{
+ static Logger log = Logger.create(JDBCMappingMetaData.class);
/**
* Gets the JDBC type constant int for the name. The mapping from name to jdbc
* type is contained in java.sql.Types.
@@ -42,7 +42,7 @@
return constant.intValue();
} catch (Exception e) {
- Logger.warning("Unrecognized jdbc-type: " + name + ", using Types.OTHER");
+ log.warn("Unrecognized jdbc-type: " + name + ", using Types.OTHER", e);
return Types.OTHER;
}
}
1.5 +4 -4
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java
Index: JDBCXmlFileLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCXmlFileLoader.java 2001/09/01 22:03:17 1.4
+++ JDBCXmlFileLoader.java 2001/09/11 18:35:00 1.5
@@ -9,7 +9,7 @@
import java.net.URL;
import org.jboss.ejb.DeploymentException;
-import org.jboss.logging.Log;
+import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.XmlFileLoader;
import org.w3c.dom.Element;
@@ -19,13 +19,13 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public final class JDBCXmlFileLoader {
private final ApplicationMetaData application;
private final ClassLoader classLoader;
private final ClassLoader localClassLoader;
- private final Log log;
+ private final Logger log;
/**
* Constructs a JDBC XML file loader, which loads the JDBC application meta data
from
@@ -36,7 +36,7 @@
* @param localClassLoader the classLoader used to load the jbosscmp-jdbc.xml
file from the jar
* @param log the log for this application
*/
- public JDBCXmlFileLoader(ApplicationMetaData application, ClassLoader
classLoader, ClassLoader localClassLoader, Log log) {
+ public JDBCXmlFileLoader(ApplicationMetaData application, ClassLoader
classLoader, ClassLoader localClassLoader, Logger log) {
this.application = application;
this.classLoader = classLoader;
this.localClassLoader = localClassLoader;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
