User: starksm
Date: 01/11/20 01:42:51
Modified: src/main/org/jboss/ejb/plugins/jaws/jdbc Tag: Branch_2_4
JDBCCommand.java JDBCCommandFactory.java
JDBCFindByCommand.java JDBCFindEntitiesCommand.java
JDBCInitCommand.java JDBCLoadEntitiesCommand.java
JDBCQueryCommand.java
Log:
Change to the unified log4j based org.jboss.logging.Logger class.
Revision Changes Path
No revision
No revision
1.33.2.4 +6 -7 jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommand.java
Index: JDBCCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommand.java,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -u -r1.33.2.3 -r1.33.2.4
--- JDBCCommand.java 2001/11/05 22:50:28 1.33.2.3
+++ JDBCCommand.java 2001/11/20 09:42:51 1.33.2.4
@@ -43,7 +43,6 @@
import org.jboss.ejb.plugins.jaws.metadata.JawsEntityMetaData;
import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
-import org.jboss.logging.Log;
import org.jboss.logging.Logger;
/**
@@ -54,7 +53,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
- * @version $Revision: 1.33.2.3 $
+ * @version $Revision: 1.33.2.4 $
*/
public abstract class JDBCCommand
{
@@ -92,7 +91,7 @@
protected JDBCCommandFactory factory;
protected JawsEntityMetaData jawsEntity;
- protected Log log;
+ protected Logger log;
protected String name; // Command name, used for debug trace
private String sql;
@@ -167,7 +166,7 @@
stmt.close();
} catch (SQLException e)
{
- Logger.debug(e);
+ log.debug("SQL error", e);
}
}
if (con != null)
@@ -177,7 +176,7 @@
con.close();
} catch (SQLException e)
{
- Logger.debug(e);
+ log.debug("SQL error", e);
}
}
}
@@ -523,7 +522,7 @@
} catch (Exception e)
{
// JF: Dubious - better to throw a meaningful exception
- Logger.debug(e);
+ log.debug("JDBC type error", e);
return Types.OTHER;
}
}
@@ -688,7 +687,7 @@
jdbcTypeNames.put(fieldValue, fieldName);
} catch (IllegalAccessException e) {
// Should never happen
- Logger.debug(e);
+ log.error("Unexected error", e);
}
}
}
1.10.2.2 +9 -9
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommandFactory.java
Index: JDBCCommandFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCommandFactory.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- JDBCCommandFactory.java 2001/11/02 08:42:33 1.10.2.1
+++ JDBCCommandFactory.java 2001/11/20 09:42:51 1.10.2.2
@@ -48,7 +48,7 @@
import org.jboss.ejb.plugins.jaws.metadata.JawsApplicationMetaData;
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
-import org.jboss.logging.Log;
+import org.jboss.logging.Logger;
import org.jboss.util.FinderResults;
import org.jboss.util.TimerTask;
import org.jboss.util.TimerQueue;
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="[EMAIL PROTECTED]">danch (Dan Christopherson</a>
- * @version $Revision: 1.10.2.1 $
+ * @version $Revision: 1.10.2.2 $
*/
public class JDBCCommandFactory implements JPMCommandFactory
{
@@ -77,7 +77,7 @@
private EntityContainer container;
private Context javaCtx;
private JawsEntityMetaData metadata;
- private Log log;
+ private Logger log;
private boolean debug = false;
/** Timer queue used to time polls on the preloadRefQueue on all JAWS
@@ -115,7 +115,7 @@
// Constructors --------------------------------------------------
public JDBCCommandFactory(EntityContainer container,
- Log log)
+ Logger log)
throws Exception
{
this.container = container;
@@ -162,7 +162,7 @@
return metadata;
}
- public Log getLog()
+ public Logger getLog()
{
return log;
}
@@ -294,7 +294,7 @@
try {
trans = tm.getTransaction();
} catch (javax.transaction.SystemException sysE) {
- log.warning("System exception getting transaction for preload - can't
preload data for "+entityKey);
+ log.warn("System exception getting transaction for preload - can't preload
data for "+entityKey);
return;
}
//log.debug("PRELOAD: adding preload for "+entityKey+" in transaction "+(trans !=
null ? trans.toString() : "NONE")+" entityData="+entityData);
@@ -306,10 +306,10 @@
try {
trans.registerSynchronization(new PreloadClearSynch(trans));
} catch (javax.transaction.SystemException se) {
- log.warning("System exception getting transaction for preload -
can't get preloaded data for "+entityKey);
+ log.warn("System exception getting transaction for preload -
can't get preloaded data for "+entityKey);
return;
} catch (javax.transaction.RollbackException re) {
- log.warning("Rollback exception getting transaction for preload -
can't get preloaded data for "+entityKey);
+ log.warn("Rollback exception getting transaction for preload -
can't get preloaded data for "+entityKey);
return;
}
entitiesInTransaction = new HashMap();
@@ -335,7 +335,7 @@
try {
trans = tm.getTransaction();
} catch (javax.transaction.SystemException sysE) {
- log.warning("System exception getting transaction for preload - not
preloading "+entityKey);
+ log.warn("System exception getting transaction for preload - not
preloading "+entityKey);
return null;
}
1.10.2.3 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindByCommand.java
Index: JDBCFindByCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindByCommand.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- JDBCFindByCommand.java 2001/07/14 21:43:24 1.10.2.2
+++ JDBCFindByCommand.java 2001/11/20 09:42:51 1.10.2.3
@@ -28,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson)</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Torben J�ger</a>
- * @version $Revision: 1.10.2.2 $
+ * @version $Revision: 1.10.2.3 $
*/
public class JDBCFindByCommand extends JDBCFinderCommand
{
@@ -45,7 +45,7 @@
super(factory, md);
String cmpFieldName = finderMethod.getName().substring(6).toLowerCase();
- Logger.debug("Finder:"+cmpFieldName);
+ log.debug("Finder:"+cmpFieldName);
// Find the meta-info for the field we want to find by
1.10.2.3 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindEntitiesCommand.java
Index: JDBCFindEntitiesCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFindEntitiesCommand.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- JDBCFindEntitiesCommand.java 2001/10/29 00:03:06 1.10.2.2
+++ JDBCFindEntitiesCommand.java 2001/11/20 09:42:51 1.10.2.3
@@ -33,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.10.2.2 $
+ * @version $Revision: 1.10.2.3 $
*
* <p><b>Revisions:</b>
*
@@ -83,7 +83,7 @@
}
} catch (Exception e) {
// for some reason, this failed; try to use defined or automatic instead
- factory.getLog().warning("Error initializing custom finder
"+e.getMessage());
+ factory.getLog().warn("Error initializing custom finder ", e);
}
// Make commands for the defined finders
1.12.6.4 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java
Index: JDBCInitCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java,v
retrieving revision 1.12.6.3
retrieving revision 1.12.6.4
diff -u -r1.12.6.3 -r1.12.6.4
--- JDBCInitCommand.java 2001/07/14 21:43:24 1.12.6.3
+++ JDBCInitCommand.java 2001/11/20 09:42:51 1.12.6.4
@@ -31,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michel de Groot</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson</a>
- * @version $Revision: 1.12.6.3 $
+ * @version $Revision: 1.12.6.4 $
*
* Revision:
* 20010621 danch: fixed bug where mapping a PK field to a different column name
@@ -118,7 +118,7 @@
// Try to create it
if(created) {
- log.log("Table '"+jawsEntity.getTableName()+"' already exists");
+ log.info("Table '"+jawsEntity.getTableName()+"' already exists");
} else {
try
{
@@ -129,7 +129,7 @@
factory.getContainer().getTransactionManager().commit ();
// Create successful, log this
- log.log("Created table '"+jawsEntity.getTableName()+"'
successfully.");
+ log.info("Created table '"+jawsEntity.getTableName()+"'
successfully.");
log.debug("Primary key of table '"+jawsEntity.getTableName()+"' is
'"
+jawsEntity.getPrimKeyField()+"'.");
} catch (Exception e)
1.4.2.3 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCLoadEntitiesCommand.java
Index: JDBCLoadEntitiesCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCLoadEntitiesCommand.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JDBCLoadEntitiesCommand.java 2001/07/14 21:43:24 1.4.2.2
+++ JDBCLoadEntitiesCommand.java 2001/11/20 09:42:51 1.4.2.3
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson)</a>
- * @version $Revision: 1.4.2.2 $
+ * @version $Revision: 1.4.2.3 $
*/
public class JDBCLoadEntitiesCommand
extends JDBCLoadEntityCommand
@@ -116,7 +116,7 @@
}
factory.addPreloadData(key, allValues);
} catch (SQLException sqle) {
- log.warning("SQL Error preloading data for key "+key);
+ log.warn("SQL Error preloading data for key "+key);
}
}
1.5.6.1 +2 -2
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCQueryCommand.java
Index: JDBCQueryCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCQueryCommand.java,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -r1.5 -r1.5.6.1
--- JDBCQueryCommand.java 2000/12/07 15:44:37 1.5
+++ JDBCQueryCommand.java 2001/11/20 09:42:51 1.5.6.1
@@ -19,7 +19,7 @@
* Provides a Template Method implementation for
* <code>executeStatementAndHandleResult</code>.
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.6.1 $
*/
public abstract class JDBCQueryCommand extends JDBCCommand
{
@@ -66,7 +66,7 @@
rs.close();
} catch (SQLException e)
{
- Logger.debug(e);
+ log.debug("SQL error", e);
}
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
