henning 2002/12/08 07:45:58
Modified: conf TurbineResources.properties
src/java/org/apache/turbine TurbineConstants.java
src/java/org/apache/turbine/services/resources
TurbineResources.java
Log:
- Removed some constants which went to Torque.
- Removed sql logging facility as Torque does not use the LogService anyway.
- Removed the example from the TurbineResources.properties
Revision Changes Path
1.17 +1 -7 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineResources.properties 11 Oct 2002 10:27:29 -0000 1.16
+++ TurbineResources.properties 8 Dec 2002 15:45:57 -0000 1.17
@@ -41,12 +41,6 @@
services.LoggingService.debug.className=org.apache.turbine.services.logging.FileLogger
services.LoggingService.debug.level=INFO
-# A facility for SQL query logging
-# To enable SQL query logging, set the system and sql log level to DEBUG
-services.LoggingService.sql.destination.file=/logs/turbine.log
-services.LoggingService.sql.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.sql.level=ERROR
-
# A facility for security audit. NOTE! As of 23 Jan 2001
# Turbine does not have any standard security auditing
# functionality. It's up to your application.
1.7 +2 -58
jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java
Index: TurbineConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineConstants.java 8 Dec 2002 13:50:04 -0000 1.6
+++ TurbineConstants.java 8 Dec 2002 15:45:57 -0000 1.7
@@ -65,11 +65,6 @@
public interface TurbineConstants
{
/**
- * The logging facility which captures output from Peers.
- */
- String SQL_LOG_FACILITY = "sql";
-
- /**
* The logging facility which captures output from the SchedulerService.
*/
String SCHEDULER_LOG_FACILITY = "scheduler";
@@ -114,64 +109,13 @@
* The size of the actions cache if module caching is on.
*/
String SCHEDULED_JOB_CACHE_SIZE =
- "scheduledjob.cache.size";
+ "scheduledjob.cache.size";
/**
* The packages where Turbine will look for modules.
* This is effectively Turbine's classpath.
*/
String MODULE_PACKAGES = "module.packages";
-
- /**
- * JDBC database driver.
- */
- String DB_DRIVER = "database.default.driver";
-
- /**
- * JDBC database URL.
- */
- String DB_URL = "database.default.url";
-
- /**
- * JDBC username.
- */
- String DB_USERNAME = "database.default.username";
-
- /**
- * JDBC password.
- */
- String DB_PASSWORD = "database.default.password";
-
- /**
- * Maximum number of connections to pool.
- */
- String DB_MAXCONNECTIONS = "database.maxConnections";
-
- /**
- * Expiry time of database connections.
- */
- String DB_EXPIRYTIME = "database.expiryTime";
-
- /**
- * How long a connection request will wait before giving up.
- */
- String DB_CONNECTION_WAIT_TIMEOUT = "database.connectionWaitTimeout";
-
- /**
- * How often the PoolBrokerServer logs the status of the pool.
- */
- String DB_CONNECTION_LOG_INTERVAL = "database.logInterval";
-
- /**
- * Database adaptor.
- */
- String DB_ADAPTOR = "database.adaptor";
-
- /**
- * Indicates that the id broker will generate more ids
- * if the demand is high.
- */
- String DB_IDBROKER_CLEVERQUANTITY = "database.idbroker.cleverquantity";
/**
* Home page template.
1.7 +1 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResources.java
Index: TurbineResources.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/resources/TurbineResources.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineResources.java 14 Aug 2002 16:54:59 -0000 1.6
+++ TurbineResources.java 8 Dec 2002 15:45:58 -0000 1.7
@@ -84,19 +84,11 @@
public static final String SCREEN_CACHE_SIZE_KEY = "screen.cache.size";
public static final String USER_CLASS_KEY = "user.class";
public static final String MAX_FILE_SIZE_KEY = "max.file.size.bytes";
- public static final String DB_DRIVER_KEY = "database.default.driver";
- public static final String DB_URL_KEY = "database.default.url";
- public static final String DB_USERNAME_KEY = "database.default.username";
- public static final String DB_PASSWORD_KEY = "database.default.password";
- public static final String DB_MAXCONNECTIONS_KEY = "database.maxConnections";
- public static final String DB_EXPIRYTIME_KEY = "database.expiryTime";
public static final String FILE_SERVER = "file.server";
public static final String LOGIN_MESSAGE = "login.message";
public static final String LOGIN_ERROR = "login.error";
public static final String LOGIN_MESSAGE_NOSCREEN = "login.message.noscreen";
public static final String LOGOUT_MESSAGE = "logout.message";
- public static final String DB_IDBROKER_CLEVERQUANTITY =
"database.idbroker.cleverquantity";
- public static final String DB_IDBROKER_PREFETCH = "database.idbroker.prefetch";
/**
* Utility method for accessing the service
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
