You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/25 09:34:21 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/db/util IDBroker.java IdGenerator.java LargeSelect.java
jvanzyl 01/06/25 00:34:21
Modified: src/java/org/apache/turbine/services/db
TurbineDatabaseService.java
src/java/org/apache/turbine/services/db/util IDBroker.java
IdGenerator.java LargeSelect.java
Log:
- more decoupling, notes for decoupling
Revision Changes Path
1.4 +4 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineDatabaseService.java 2001/06/25 04:59:16 1.3
+++ TurbineDatabaseService.java 2001/06/25 07:34:15 1.4
@@ -81,7 +81,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineDatabaseService.java,v 1.3 2001/06/25 04:59:16 jvanzyl Exp $
+ * @version $Id: TurbineDatabaseService.java,v 1.4 2001/06/25 07:34:15 jvanzyl Exp $
*/
public class TurbineDatabaseService
extends BaseService
@@ -127,6 +127,9 @@
monitor.start();
DBFactory.setConfiguration(getConfiguration());
+ DBFactory.setCategory(getCategory(getConfiguration()
+ .getString(CATEGORY, DEFAULT_CATEGORY)));
+
DBFactory.init();
BasePeer.setCategory(getCategory(getConfiguration()
1.2 +3 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java
Index: IDBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDBroker.java 2001/06/25 05:13:09 1.1
+++ IDBroker.java 2001/06/25 07:34:17 1.2
@@ -69,13 +69,14 @@
import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.services.db.TurbineDB;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.services.db.map.DatabaseMap;
import org.apache.turbine.services.db.map.TableMap;
import org.apache.turbine.services.db.pool.DBConnection;
+//!! these two have to be removed.
+import org.apache.turbine.util.Log;
import org.apache.velocity.runtime.configuration.Configuration;
//!!
@@ -117,7 +118,7 @@
*
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: IDBroker.java,v 1.1 2001/06/25 05:13:09 jvanzyl Exp $
+ * @version $Id: IDBroker.java,v 1.2 2001/06/25 07:34:17 jvanzyl Exp $
*/
public class IDBroker
implements Runnable, IdGenerator
1.2 +1 -8 jakarta-turbine/src/java/org/apache/turbine/services/db/util/IdGenerator.java
Index: IdGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/IdGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdGenerator.java 2001/06/25 05:13:09 1.1
+++ IdGenerator.java 2001/06/25 07:34:18 1.2
@@ -70,7 +70,7 @@
* Connection pool service only when needed.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: IdGenerator.java,v 1.1 2001/06/25 05:13:09 jvanzyl Exp $
+ * @version $Id: IdGenerator.java,v 1.2 2001/06/25 07:34:18 jvanzyl Exp $
*/
public interface IdGenerator
{
@@ -141,11 +141,4 @@
* @return a <code>boolean</code> value
*/
public boolean isConnectionRequired();
-
-
}
-
-
-
-
-
1.2 +5 -4 jakarta-turbine/src/java/org/apache/turbine/services/db/util/LargeSelect.java
Index: LargeSelect.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/LargeSelect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LargeSelect.java 2001/06/25 05:13:09 1.1
+++ LargeSelect.java 2001/06/25 07:34:18 1.2
@@ -61,7 +61,6 @@
import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.services.db.TurbineDB;
import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.util.Log;
import com.workingdogs.village.QueryDataSet;
@@ -80,7 +79,7 @@
* untested and in all likelihood contains several bugs.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: LargeSelect.java,v 1.1 2001/06/25 05:13:09 jvanzyl Exp $
+ * @version $Id: LargeSelect.java,v 1.2 2001/06/25 07:34:18 jvanzyl Exp $
*/
public class LargeSelect
implements Runnable
@@ -358,7 +357,8 @@
}
catch (Exception e)
{
- Log.error(e);
+ //Log.error(e);
+ e.printStackTrace();
}
finally
{
@@ -370,7 +370,8 @@
}
catch(Exception e)
{
- Log.error(e);
+ //Log.error(e);
+ e.printStackTrace();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org