User: ejort
Date: 02/01/12 13:14:27
Modified: src/main/org/jboss/ejb/plugins/jaws/jdbc
JDBCBeanExistsCommand.java JDBCCommand.java
JDBCCommandFactory.java
JDBCCreateEntityCommand.java
JDBCDefinedFinderCommand.java
JDBCDestroyCommand.java JDBCFindByCommand.java
JDBCFindEntitiesCommand.java JDBCFinderCommand.java
JDBCInitCommand.java JDBCLoadEntitiesCommand.java
JDBCLoadEntityCommand.java
JDBCPreloadFinderCommand.java JDBCQueryCommand.java
JDBCUpdateCommand.java
Log:
Remove directory reference to log4j Category in preparation for log4j 1.2
Revision Changes Path
1.11 +3 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCBeanExistsCommand.java
Index: JDBCBeanExistsCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCBeanExistsCommand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JDBCBeanExistsCommand.java 2001/11/24 20:43:25 1.10
+++ JDBCBeanExistsCommand.java 2002/01/12 21:14:27 1.11
@@ -11,16 +11,15 @@
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.jboss.logging.Logger;
-import org.apache.log4j.Category;
-
/**
* JDBCBeanExistsCommand
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*
* <p><b>Revisions:</b>
*
@@ -34,7 +33,7 @@
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCBeanExistsCommand.class);
+ private final Logger log = Logger.getLogger(JDBCBeanExistsCommand.class);
// Constructors --------------------------------------------------
1.41 +4 -5 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JDBCCommand.java 2001/11/24 20:43:25 1.40
+++ JDBCCommand.java 2002/01/12 21:14:27 1.41
@@ -45,9 +45,8 @@
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.Logger;
-import org.apache.log4j.Category;
-
/**
* Abstract superclass for all JAWS Commands that use JDBC directly.
* Provides a Template Method for jdbcExecute(), default implementations
@@ -57,7 +56,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.40 $
+ * @version $Revision: 1.41 $
*
* <p><b>Revisions:</b>
*
@@ -105,7 +104,7 @@
rsTypes.put(java.lang.Short.class.getName(),
ResultSet.class.getMethod("getShort", arg));
rsTypes.put(Short.TYPE.getName(),
ResultSet.class.getMethod("getShort", arg));
} catch(NoSuchMethodException e) {
- Category.getInstance(JDBCCommand.class).error("NoSuchMethodException",
e);
+ Logger.getLogger(JDBCCommand.class).error("NoSuchMethodException", e);
}
}
@@ -115,7 +114,7 @@
protected JawsEntityMetaData jawsEntity;
protected String name; // Command name, used for debug trace
- private Category log = Category.getInstance(JDBCCommand.class);
+ private Logger log = Logger.getLogger(JDBCCommand.class);
private String sql;
private static Map jdbcTypeNames;
1.17 +20 -24
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JDBCCommandFactory.java 2001/11/26 03:12:27 1.16
+++ JDBCCommandFactory.java 2002/01/12 21:14:27 1.17
@@ -34,19 +34,15 @@
import org.jboss.ejb.plugins.jaws.JPMStoreEntityCommand;
import org.jboss.ejb.plugins.jaws.JPMActivateEntityCommand;
import org.jboss.ejb.plugins.jaws.JPMPassivateEntityCommand;
-
-import org.jboss.metadata.ApplicationMetaData;
-
import org.jboss.ejb.plugins.jaws.metadata.JawsXmlFileLoader;
import org.jboss.ejb.plugins.jaws.metadata.JawsEntityMetaData;
import org.jboss.ejb.plugins.jaws.metadata.JawsApplicationMetaData;
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
-
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ApplicationMetaData;
import org.jboss.util.TimerTask;
import org.jboss.util.TimerQueue;
-import org.apache.log4j.Category;
-
/**
* Command factory for the JAWS JDBC layer. This class is primarily responsible
* for creating instances of the JDBC implementations for the various JPM
@@ -63,7 +59,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
* @author <a href="[EMAIL PROTECTED]">danch (Dan Christopherson)</a>
* @author <a href="[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*
* <p><b>Revisions:</b>
*
@@ -92,50 +88,50 @@
private EntityContainer container;
private Context javaCtx;
private JawsEntityMetaData metadata;
- private Category log;
+ private final Logger log = Logger.getLogger(this.getClass());
- /** Timer queue used to time polls on the preloadRefQueue on all JAWS
+ /** Timer queue used to time polls on the preloadRefQueue on all JAWS
* handled entities
*/
private static TimerQueue softRefHandler;
-
+
/** Timer queue used to get references to preload data who've been GC'ed */
private ReferenceQueue preloadRefQueue = new ReferenceQueue();
-
+
/** a map of data preloaded within some transaction for some entity. This map
* is keyed by Transaction and the data are hashmaps with key = entityKey and
* data = Object[] containing the entity data. */
private Map preloadedData = new HashMap();
- /** A map of data preloaded without a transaction context. key=entityKey,
+ /** A map of data preloaded without a transaction context. key=entityKey,
* data = Object[] containing entity data
*/
private Map nonTransactionalPreloadData = new HashMap();
-
+
/** a Transaction manager so that we can link preloaded data to a transaction */
private TransactionManager tm;
-
+
// These support singletons (within the scope of this factory)
private JDBCBeanExistsCommand beanExistsCommand;
private JPMFindEntitiesCommand findEntitiesCommand;
- //static initializer to kick off our softRefhandler
+ //static initializer to kick off our softRefhandler
static {
softRefHandler = new TimerQueue("JAWS Preload reference handler");
softRefHandler.start();
}
-
+
// Constructors --------------------------------------------------
-
+
public JDBCCommandFactory(EntityContainer container)
throws Exception
{
this.container = container;
this.javaCtx = (Context)new InitialContext().lookup("java:comp/env");
-
+
String ejbName = container.getBeanMetaData().getEjbName();
ApplicationMetaData amd =
container.getBeanMetaData().getApplicationMetaData();
JawsApplicationMetaData jamd =
(JawsApplicationMetaData)amd.getPluginData("JAWS");
-
+
if (jamd == null) {
// we are the first cmp entity to need jaws. Load jaws.xml for the whole
application
JawsXmlFileLoader jfl = new JawsXmlFileLoader(amd,
container.getClassLoader(), container.getLocalClassLoader());
@@ -147,19 +143,19 @@
if (metadata == null) {
throw new DeploymentException("No metadata found for bean " + ejbName);
}
-
+
tm = (TransactionManager) container.getTransactionManager();
-
+
softRefHandler.schedule(new PreloadRefQueueHandlerTask());
}
-
+
// Public --------------------------------------------------------
-
+
public EntityContainer getContainer()
{
return container;
}
-
+
public Context getJavaCtx()
{
return javaCtx;
1.11 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCreateEntityCommand.java
Index: JDBCCreateEntityCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCCreateEntityCommand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JDBCCreateEntityCommand.java 2002/01/05 12:08:51 1.10
+++ JDBCCreateEntityCommand.java 2002/01/12 21:14:27 1.11
@@ -27,7 +27,7 @@
import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JAWSPersistenceManager JDBCCreateEntityCommand
@@ -37,7 +37,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 $
+ * @version $Revision: 1.11 $
*
* <p><b>Revisions:</b>
*
@@ -54,7 +54,7 @@
// Attributes ----------------------------------------------------
private JDBCBeanExistsCommand beanExistsCommand;
- private Category log = Category.getInstance(JDBCCreateEntityCommand.class);
+ private Logger log = Logger.getLogger(JDBCCreateEntityCommand.class);
// Constructors --------------------------------------------------
1.21 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDefinedFinderCommand.java
Index: JDBCDefinedFinderCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDefinedFinderCommand.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JDBCDefinedFinderCommand.java 2001/11/14 12:18:19 1.20
+++ JDBCDefinedFinderCommand.java 2002/01/12 21:14:27 1.21
@@ -17,7 +17,7 @@
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
import org.jboss.ejb.plugins.jaws.metadata.TypeMappingMetaData;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JAWSPersistenceManager JDBCDefinedFinderCommand
@@ -32,7 +32,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">danch (Dan Christopherson)</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Lennart Petersson</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*
* <p><b>Revisions:</b>
*
@@ -51,7 +51,7 @@
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCDefinedFinderCommand.class);
+ private Logger log = Logger.getLogger(JDBCDefinedFinderCommand.class);
private int[] parameterArray;
private TypeMappingMetaData typeMapping;
1.11 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDestroyCommand.java
Index: JDBCDestroyCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDestroyCommand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JDBCDestroyCommand.java 2002/01/05 12:08:51 1.10
+++ JDBCDestroyCommand.java 2002/01/12 21:14:27 1.11
@@ -10,7 +10,7 @@
import org.jboss.ejb.plugins.jaws.JPMDestroyCommand;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JAWSPersistenceManager JDBCDestroyCommand
@@ -20,7 +20,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 $
+ * @version $Revision: 1.11 $
*
* <p><b>Revisions:</b>
*
@@ -36,7 +36,7 @@
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCDestroyCommand.class);
+ private Logger log = Logger.getLogger(JDBCDestroyCommand.class);
// Constructors --------------------------------------------------
1.14 +4 -4
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JDBCFindByCommand.java 2001/08/14 20:26:27 1.13
+++ JDBCFindByCommand.java 2002/01/12 21:14:27 1.14
@@ -12,11 +12,11 @@
import java.sql.PreparedStatement;
import java.util.Iterator;
-import org.apache.log4j.Category;
-
import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
+import org.jboss.logging.Logger;
+
/**
* JAWSPersistenceManager JDBCFindByCommand
*
@@ -26,7 +26,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Dan Christopherson</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Torben J�ger</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class JDBCFindByCommand
extends JDBCFinderCommand
@@ -35,7 +35,7 @@
// The meta-info for the field we are finding by
private CMPFieldMetaData cmpField;
- private Category log = Category.getInstance(JDBCFindByCommand.class);
+ private Logger log = Logger.getLogger(JDBCFindByCommand.class);
// Constructors --------------------------------------------------
1.16 +4 -4
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JDBCFindEntitiesCommand.java 2002/01/05 12:08:51 1.15
+++ JDBCFindEntitiesCommand.java 2002/01/12 21:14:27 1.16
@@ -18,9 +18,9 @@
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
import org.jboss.ejb.plugins.jaws.bmp.CustomFindByEntitiesCommand;
-import org.jboss.util.FinderResults;
+import org.jboss.logging.Logger;
-import org.apache.log4j.Category;
+import org.jboss.util.FinderResults;
/**
* Keeps a map from finder name to specific finder command, and
@@ -31,7 +31,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.15 $
+ * @version $Revision: 1.16 $
*
* <p><b>Revisions:</b>
*
@@ -49,7 +49,7 @@
private JDBCCommandFactory factory;
private HashMap knownFinderCommands = new HashMap();
- private Category log = Category.getInstance(this.getClass());
+ private Logger log = Logger.getLogger(this.getClass());
// Constructors --------------------------------------------------
1.16 +3 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFinderCommand.java
Index: JDBCFinderCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCFinderCommand.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JDBCFinderCommand.java 2001/08/16 22:23:30 1.15
+++ JDBCFinderCommand.java 2002/01/12 21:14:27 1.16
@@ -25,10 +25,9 @@
import org.jboss.ejb.plugins.jaws.JPMFindEntitiesCommand;
import org.jboss.ejb.plugins.jaws.metadata.FinderMetaData;
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
+import org.jboss.logging.Logger;
import org.jboss.util.FinderResults;
-import org.apache.log4j.Category;
-
/**
* Abstract superclass of finder commands that return collections.
* Provides the handleResult() implementation that these all need.
@@ -38,7 +37,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*
* <p><b>Revisions:</b>
*
@@ -59,7 +58,7 @@
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCFinderCommand.class);
+ private Logger log = Logger.getLogger(JDBCFinderCommand.class);
protected FinderMetaData finderMetaData = null;
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JDBCInitCommand.java 2002/01/05 12:08:52 1.17
+++ JDBCInitCommand.java 2002/01/12 21:14:27 1.18
@@ -19,7 +19,7 @@
import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JAWSPersistenceManager JDBCInitCommand
@@ -33,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]">danch (Dan Christopherson</a>
*
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*
* <p><b>Revisions:</b>
*
@@ -56,7 +56,7 @@
implements JPMInitCommand
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCInitCommand.class);
+ private Logger log = Logger.getLogger(JDBCInitCommand.class);
// Constructors --------------------------------------------------
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDBCLoadEntitiesCommand.java 2001/12/05 05:07:42 1.9
+++ JDBCLoadEntitiesCommand.java 2002/01/12 21:14:27 1.10
@@ -25,7 +25,7 @@
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
import org.jboss.util.FinderResults;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Implementation of the LoadEntitiesCommand added in JBoss 2.3. This preloads
@@ -38,7 +38,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]">Dan Christopherson</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
* <p><b>Revisions:</b>
*
@@ -53,7 +53,7 @@
implements JPMLoadEntitiesCommand
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCLoadEntitiesCommand.class);
+ private Logger log = Logger.getLogger(JDBCLoadEntitiesCommand.class);
String selectClause;
// Constructors --------------------------------------------------
1.18 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCLoadEntityCommand.java
Index: JDBCLoadEntityCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCLoadEntityCommand.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JDBCLoadEntityCommand.java 2001/12/05 05:07:42 1.17
+++ JDBCLoadEntityCommand.java 2002/01/12 21:14:27 1.18
@@ -25,7 +25,7 @@
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
import org.jboss.ejb.plugins.jaws.metadata.JawsEntityMetaData;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* JAWSPersistenceManager JDBCLoadEntityCommand
@@ -37,7 +37,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]">Dan Christopherson</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*
* <p><b>Revisions:</b>
*
@@ -66,7 +66,7 @@
* damn thing in the languase starts at 0, the way God intended!
*/
private static final int JDBC_WART_OFFSET = 1;
- private Category log = Category.getInstance(JDBCLoadEntityCommand.class);
+ private Logger log = Logger.getLogger(JDBCLoadEntityCommand.class);
// Constructors --------------------------------------------------
1.7 +3 -3
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCPreloadFinderCommand.java
Index: JDBCPreloadFinderCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCPreloadFinderCommand.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCPreloadFinderCommand.java 2001/12/05 05:07:42 1.6
+++ JDBCPreloadFinderCommand.java 2002/01/12 21:14:27 1.7
@@ -22,7 +22,7 @@
import org.jboss.ejb.plugins.jaws.metadata.JawsEntityMetaData;
import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Preloads data for all entities in where clause
@@ -30,7 +30,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">danch (Dan Christopherson)</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*
* <p><b>Revisions:</b>
*
@@ -55,7 +55,7 @@
/** The load command we delegate to for our column list */
protected JDBCLoadEntityCommand loadCommand;
- private Category log = Category.getInstance(JDBCPreloadFinderCommand.class);
+ private Logger log = Logger.getLogger(JDBCPreloadFinderCommand.class);
// Constructors --------------------------------------------------
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCQueryCommand.java 2001/08/14 20:26:27 1.7
+++ JDBCQueryCommand.java 2002/01/12 21:14:27 1.8
@@ -11,7 +11,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.log4j.Category;
+import org.jboss.logging.Logger;
/**
* Abstract superclass for all JAWS Commands that issue JDBC queries
@@ -20,14 +20,14 @@
* <code>executeStatementAndHandleResult</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public abstract class JDBCQueryCommand
extends JDBCCommand
{
// Constructors --------------------------------------------------
- private Category log = Category.getInstance(JDBCFindByCommand.class);
+ private Logger log = Logger.getLogger(JDBCFindByCommand.class);
/**
* Pass the arguments on to the superclass constructor.
1.8 +4 -4
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCUpdateCommand.java
Index: JDBCUpdateCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCUpdateCommand.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCUpdateCommand.java 2001/11/24 20:43:25 1.7
+++ JDBCUpdateCommand.java 2002/01/12 21:14:27 1.8
@@ -7,17 +7,17 @@
package org.jboss.ejb.plugins.jaws.jdbc;
-import org.apache.log4j.Category;
-
import java.sql.PreparedStatement;
+import org.jboss.logging.Logger;
+
/**
* Abstract superclass for all JAWS Commands that issue JDBC updates
* directly.
* Provides a Template Method implementation for
* <code>executeStatementAndHandleResult</code>.
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*
* <p><b>Revisions:</b>
*
@@ -30,7 +30,7 @@
public abstract class JDBCUpdateCommand extends JDBCCommand
{
// Attributes ----------------------------------------------------
- private Category log = Category.getInstance(JDBCUpdateCommand.class);
+ private Logger log = Logger.getLogger(JDBCUpdateCommand.class);
// Constructors --------------------------------------------------
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development