jvanzyl 01/10/12 13:32:18 Modified: conf TurbineResources.properties build.xml Log: - @DATABASE_DEFAULT@ token wasn't being filled in. Revision Changes Path 1.5 +9 -9 jakarta-turbine-2/conf/TurbineResources.properties Index: TurbineResources.properties =================================================================== RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TurbineResources.properties 2001/09/27 04:48:27 1.4 +++ TurbineResources.properties 2001/10/12 20:32:18 1.5 @@ -1,5 +1,5 @@ # ------------------------------------------------------------------- -# $Id: TurbineResources.properties,v 1.4 2001/09/27 04:48:27 jvanzyl Exp $ +# $Id: TurbineResources.properties,v 1.5 2001/10/12 20:32:18 jvanzyl Exp $ # # This is the configuration file for Turbine. # @@ -167,22 +167,22 @@ # configure these properly. # ------------------------------------------------------------------- -database.@[email protected]=org.gjt.mm.mysql.Driver -database.@[email protected]=jdbc:mysql://localhost:3306/Turbine -database.@[email protected]=username -database.@[email protected]=password +database.default.driver=org.gjt.mm.mysql.Driver +database.default.url=jdbc:mysql://localhost:3306/Turbine +database.default.username=username +database.default.password=password # The number of database connections to cache per ConnectionPool # instance (specified per database). -database.@[email protected]=3 +database.default.maxConnections=3 # The amount of time (in milliseconds) that database connections will be # cached (specified per database). # # Default: one hour = 60 * 60 * 1000 -database.@[email protected]=3600000 +database.default.expiryTime=3600000 # The amount of time (in milliseconds) a connection request will have to wait # before a time out occurs and an error is thrown. @@ -442,8 +442,8 @@ # Default value: default # ------------------------------------------------------------------- -services.PoolBrokerService.defaultPool = @DATABASE_DEFAULT@ -services.MapBrokerService.defaultMap = @DATABASE_DEFAULT@ +services.PoolBrokerService.defaultPool = default +services.MapBrokerService.defaultMap = default # ------------------------------------------------------------------- # 1.4 +1 -0 jakarta-turbine-2/conf/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-turbine-2/conf/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 2001/09/27 15:32:57 1.3 +++ build.xml 2001/10/12 20:32:18 1.4 @@ -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="DATABASE_DEFAULT" value="default"/> <filter token="PROJECT" value="${project}"/> </target>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
