jvanzyl 01/06/25 00:19:47
Modified: src/java/org/apache/turbine/services/db/adapter
DBDB2App.java DBDB2Net.java DBFactory.java
DBOdbc.java DBPostgres.java
Log:
- getting of ties to the Log class in turbine.
Revision Changes Path
1.2 +1 -13
jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBDB2App.java
Index: DBDB2App.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBDB2App.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBDB2App.java 2001/06/25 05:10:32 1.1
+++ DBDB2App.java 2001/06/25 07:19:38 1.2
@@ -57,8 +57,6 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.turbine.util.Log;
-
/**
* This is used to connect via the Application-Driver to DB2
* databases.
@@ -68,7 +66,7 @@
* </a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBDB2App.java,v 1.1 2001/06/25 05:10:32 jvanzyl Exp $
+ * @version $Id: DBDB2App.java,v 1.2 2001/06/25 07:19:38 jvanzyl Exp $
*/
public class DBDB2App
extends DB
@@ -91,8 +89,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBDB2App.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -107,8 +103,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBDB2App.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -119,8 +113,6 @@
*/
public char getStringDelimiter()
{
- Log.info("DBDB2App.getStringDelimiter()");
-
return '\'';
}
@@ -133,8 +125,6 @@
*/
public String getIdSqlForAutoIncrement(Object obj)
{
- Log.info("DBDB2App.getIdSqlForAutoIncrement(), not implemented yet");
-
return null;
}
@@ -147,8 +137,6 @@
*/
public String getSequenceSql(Object obj)
{
- Log.info("DBDB2App.getSequenceSql(" + obj + "), not implemented yet");
-
return null;
}
1.2 +1 -12
jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBDB2Net.java
Index: DBDB2Net.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBDB2Net.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBDB2Net.java 2001/06/25 05:10:32 1.1
+++ DBDB2Net.java 2001/06/25 07:19:39 1.2
@@ -56,7 +56,6 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.turbine.util.Log;
/**
* This is used to connect via the NET-Driver to DB2 databases.
@@ -67,7 +66,7 @@
* </a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBDB2Net.java,v 1.1 2001/06/25 05:10:32 jvanzyl Exp $
+ * @version $Id: DBDB2Net.java,v 1.2 2001/06/25 07:19:39 jvanzyl Exp $
*/
public class DBDB2Net
extends DB
@@ -90,8 +89,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBDB2Net.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -106,8 +103,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBDB2Net.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -118,8 +113,6 @@
*/
public char getStringDelimiter()
{
- Log.info("DBDB2Net.getStringDelimiter()");
-
return '\'';
}
@@ -132,8 +125,6 @@
*/
public String getIdSqlForAutoIncrement(Object obj)
{
- Log.info("DBDB2Net.getIdSqlForAutoIncrement(), not implemented yet");
-
return null;
}
@@ -146,8 +137,6 @@
*/
public String getSequenceSql(Object obj)
{
- Log.info("DBDB2Net.getSequenceSql(" + obj + "), not implemented yet");
-
return null;
}
1.3 +10 -4
jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBFactory.java
Index: DBFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DBFactory.java 2001/06/25 07:01:14 1.2
+++ DBFactory.java 2001/06/25 07:19:40 1.3
@@ -58,8 +58,7 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.turbine.util.Log;
-
+import org.apache.log4j.Category;
import org.apache.velocity.runtime.configuration.Configuration;
//!!
@@ -79,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stranzenbach</a>
- * @version $Id: DBFactory.java,v 1.2 2001/06/25 07:01:14 jvanzyl Exp $
+ * @version $Id: DBFactory.java,v 1.3 2001/06/25 07:19:40 jvanzyl Exp $
*/
public class DBFactory
{
@@ -88,11 +87,18 @@
private static Configuration configuration;
+ private static Category category;
+
public static void setConfiguration(Configuration c)
{
configuration = c;
}
+ public static void setCategory(Category c)
+ {
+ category = c;
+ }
+
// This static code creates the list of possible drivers and adds
// the "NO DATABASE" adaptor to this list. After all the
// configuration is queried to get a list of JDBC drivers and
@@ -129,7 +135,7 @@
}
catch (ClassNotFoundException ign2)
{
- Log.error(ign2);
+ category.error(ign2);
}
}
if ((c != null) && (driver != null))
1.2 +1 -5
jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBOdbc.java
Index: DBOdbc.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBOdbc.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBOdbc.java 2001/06/25 05:10:33 1.1
+++ DBOdbc.java 2001/06/25 07:19:41 1.2
@@ -57,14 +57,12 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.turbine.util.Log;
-
/**
* This is used to connect to ODBC Bridged databases on Win32
* Platforms.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Cameron Riley</a>
- * @version $Id: DBOdbc.java,v 1.1 2001/06/25 05:10:33 jvanzyl Exp $
+ * @version $Id: DBOdbc.java,v 1.2 2001/06/25 07:19:41 jvanzyl Exp $
*/
public class DBOdbc
extends DB
@@ -120,7 +118,6 @@
*/
public String getIdSqlForAutoIncrement(Object obj)
{
- Log.info("DBOdbc.getIdSqlForAutoIncrement(), not implemented");
return null;
}
@@ -135,7 +132,6 @@
*/
public String getSequenceSql(Object obj)
{
- Log.info("DBOdbc.getSequenceSql(" + obj + "), not implemented");
return null;
}
1.2 +2 -10
jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBPostgres.java
Index: DBPostgres.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/adapter/DBPostgres.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBPostgres.java 2001/06/25 05:10:33 1.1
+++ DBPostgres.java 2001/06/25 07:19:42 1.2
@@ -57,15 +57,13 @@
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.turbine.util.Log;
-
/**
* This is used to connect to PostgresQL databases.
*
* <a href="http://www.pgsql.org";>http://www.pgsql.org</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBPostgres.java,v 1.1 2001/06/25 05:10:33 jvanzyl Exp $
+ * @version $Id: DBPostgres.java,v 1.2 2001/06/25 07:19:42 jvanzyl Exp $
*/
public class DBPostgres
extends DB
@@ -88,8 +86,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBPostgres.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -104,8 +100,6 @@
String s =
new StringBuffer("UPPER(").append(in).append(")").toString();
- Log.info("DBPostgres.toUpperCase(" + in + "), returning " + s);
-
return s;
}
@@ -116,8 +110,6 @@
*/
public char getStringDelimiter()
{
- Log.info("DBPostgres.getStringDelimiter()");
-
return '\'';
}
@@ -134,7 +126,7 @@
sb.append("select currval(\'");
sb.append((String)obj);
sb.append("\')");
- // Log.info(sb.toString());
+ // DBFactory.getCategory().info(sb.toString());
return sb.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
