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/09/27 06:48:27 UTC
cvs commit: jakarta-turbine-2/conf/master TurbineResources.master turbine-schema.xml
jvanzyl 01/09/26 21:48:27
Modified: conf TurbineResources.properties build.xml
conf/master TurbineResources.master turbine-schema.xml
Log:
- use the @DEFAULT_DATABASE@ token and not @PROJECT@ for the default
database name. ya.
Revision Changes Path
1.4 +12 -1 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineResources.properties 2001/09/15 15:43:18 1.3
+++ TurbineResources.properties 2001/09/27 04:48:27 1.4
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.3 2001/09/15 15:43:18 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.4 2001/09/27 04:48:27 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -433,6 +433,17 @@
# Turn on the appropriate template service.
services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
+
+# -------------------------------------------------------------------
+#
+# P O O L / M A P B R O K E R
+#
+# -------------------------------------------------------------------
+# Default value: default
+# -------------------------------------------------------------------
+
+services.PoolBrokerService.defaultPool = @DATABASE_DEFAULT@
+services.MapBrokerService.defaultMap = @DATABASE_DEFAULT@
# -------------------------------------------------------------------
#
1.2 +2 -0 jakarta-turbine-2/conf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/08/16 05:06:56 1.1
+++ build.xml 2001/09/27 04:48:27 1.2
@@ -78,6 +78,7 @@
<filter token="DATABASE_USER" value="${database.user}"/>
<filter token="DATABASE_PASSWORD" value="${database.password}"/>
<filter token="DATABASE_NAME" value="${database.name}"/>
+ <filter token="PROJECT" value="${project}"/>
</target>
@@ -129,6 +130,7 @@
<filter token="LOCALE_DEFAULT_COUNTRY" value="${locale.default.country}"/>
<filter token="INCLUDE_FILE" value="${include.file}"/>
+
</target>
</project>
1.5 +12 -1 jakarta-turbine-2/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/TurbineResources.master,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineResources.master 2001/09/15 15:43:18 1.4
+++ TurbineResources.master 2001/09/27 04:48:27 1.5
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.4 2001/09/15 15:43:18 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.5 2001/09/27 04:48:27 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -433,6 +433,17 @@
# Turn on the appropriate template service.
@TEMPLATE_SERVICE@
+
+# -------------------------------------------------------------------
+#
+# P O O L / M A P B R O K E R
+#
+# -------------------------------------------------------------------
+# Default value: default
+# -------------------------------------------------------------------
+
+services.PoolBrokerService.defaultPool = @DATABASE_DEFAULT@
+services.MapBrokerService.defaultMap = @DATABASE_DEFAULT@
# -------------------------------------------------------------------
#
1.3 +2 -2 jakarta-turbine-2/conf/master/turbine-schema.xml
Index: turbine-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/turbine-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-schema.xml 2001/09/27 04:15:58 1.2
+++ turbine-schema.xml 2001/09/27 04:48:27 1.3
@@ -14,10 +14,10 @@
<!-- users, security, and job scheduling. -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a> -->
-<!-- @version $Id: turbine-schema.xml,v 1.2 2001/09/27 04:15:58 jvanzyl Exp $ -->
+<!-- @version $Id: turbine-schema.xml,v 1.3 2001/09/27 04:48:27 jvanzyl Exp $ -->
<!-- ==================================================================== -->
-<database name="@PROJECT@">
+<database name="@DEFAULT_DATABASE@">
<table name="TURBINE_PERMISSION" idMethod="idbroker">
<column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org