jvanzyl 01/06/24 21:59:18
Modified: src/java/org/apache/turbine/services/db DatabaseService.java
TurbineDB.java TurbineDatabaseService.java
Log:
- more decoupling
Revision Changes Path
1.3 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/db/DatabaseService.java
Index: DatabaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/DatabaseService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseService.java 2001/06/19 21:51:48 1.2
+++ DatabaseService.java 2001/06/25 04:59:15 1.3
@@ -56,9 +56,9 @@
import org.apache.turbine.services.Service;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.db.map.DatabaseMap;
-import org.apache.turbine.util.db.pool.DBConnection;
-import org.apache.turbine.util.db.adapter.DB;
+import org.apache.turbine.services.db.map.DatabaseMap;
+import org.apache.turbine.services.db.pool.DBConnection;
+import org.apache.turbine.services.db.adapter.DB;
/**
* This service provides database connection pooling and manages
@@ -84,7 +84,7 @@
* to the pool.<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: DatabaseService.java,v 1.2 2001/06/19 21:51:48 mpoeschl Exp $
+ * @version $Id: DatabaseService.java,v 1.3 2001/06/25 04:59:15 jvanzyl Exp $
*/
public interface DatabaseService extends Service
{
1.11 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDB.java
Index: TurbineDB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDB.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineDB.java 2001/06/19 21:51:49 1.10
+++ TurbineDB.java 2001/06/25 04:59:16 1.11
@@ -55,9 +55,9 @@
*/
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.db.adapter.DB;
-import org.apache.turbine.util.db.map.DatabaseMap;
-import org.apache.turbine.util.db.pool.DBConnection;
+import org.apache.turbine.services.db.adapter.DB;
+import org.apache.turbine.services.db.map.DatabaseMap;
+import org.apache.turbine.services.db.pool.DBConnection;
import org.apache.turbine.services.TurbineServices;
/**
@@ -93,7 +93,7 @@
* </pre></code></blockquote>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineDB.java,v 1.10 2001/06/19 21:51:49 mpoeschl Exp $
+ * @version $Id: TurbineDB.java,v 1.11 2001/06/25 04:59:16 jvanzyl Exp $
*/
public abstract class TurbineDB
{
1.3 +27 -11
jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDatabaseService.java
Index: TurbineDatabaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDatabaseService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineDatabaseService.java 2001/06/19 21:51:48 1.2
+++ TurbineDatabaseService.java 2001/06/25 04:59:16 1.3
@@ -60,15 +60,16 @@
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.db.AutoIncrementIdGenerator;
-import org.apache.turbine.util.db.SequenceIdGenerator;
-import org.apache.turbine.util.db.IDBroker;
-import org.apache.turbine.util.db.adapter.DB;
-import org.apache.turbine.util.db.adapter.DBFactory;
-import org.apache.turbine.util.db.map.DatabaseMap;
-import org.apache.turbine.util.db.map.TableMap;
-import org.apache.turbine.util.db.pool.ConnectionPool;
-import org.apache.turbine.util.db.pool.DBConnection;
+import org.apache.turbine.services.db.util.AutoIncrementIdGenerator;
+import org.apache.turbine.services.db.util.SequenceIdGenerator;
+import org.apache.turbine.services.db.util.IDBroker;
+import org.apache.turbine.services.db.adapter.DB;
+import org.apache.turbine.services.db.adapter.DBFactory;
+import org.apache.turbine.services.db.map.DatabaseMap;
+import org.apache.turbine.services.db.map.TableMap;
+import org.apache.turbine.services.db.pool.ConnectionPool;
+import org.apache.turbine.services.db.pool.DBConnection;
+import org.apache.turbine.services.db.om.peer.BasePeer;
/**
* Turbine's default implementation of {@link DatabaseService}.
@@ -80,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Magn�s ��r Torfason</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineDatabaseService.java,v 1.2 2001/06/19 21:51:48 mpoeschl Exp
$
+ * @version $Id: TurbineDatabaseService.java,v 1.3 2001/06/25 04:59:16 jvanzyl Exp $
*/
public class TurbineDatabaseService
extends BaseService
@@ -96,6 +97,18 @@
private Map pools;
/**
+ * The property tag which specifies which
+ * log4j category to use for logging in BasePeer.
+ */
+ private static final String CATEGORY = "log4j.category";
+
+ /**
+ * The default log4j category to use if the
+ * the log4j.category property isn't set.
+ */
+ private static final String DEFAULT_CATEGORY = "sql";
+
+ /**
* Initializes the service.
*/
public void init()
@@ -116,6 +129,9 @@
DBFactory.setConfiguration(getConfiguration());
DBFactory.init();
+ BasePeer.setCategory(getCategory(getConfiguration()
+ .getString(CATEGORY, DEFAULT_CATEGORY)));
+
// indicate that the service initialized correctly
setInit(true);
}
@@ -184,7 +200,7 @@
public DatabaseMap getDatabaseMap(String name)
throws TurbineException
{
- if ( name == null )
+ if ( name == null )
{
throw new TurbineException ("DatabaseMap name was null!");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
