You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@apache.org on 2001/04/09 16:00:23 UTC
cvs commit: xml-cocoon/webapp/docs/samples/xsp esql.xsp
dims 01/04/09 07:00:23
Modified: . Tag: xml-cocoon2 build.xml
webapp Tag: xml-cocoon2 cocoon.xconf
webapp/docs/samples/xsp Tag: xml-cocoon2 esql.xsp
Added: . Tag: xml-cocoon2 database.properties
Log:
Externalized the database properties into a separate file
aptly named "database.properties".
The build procedure will pick up the entries from this file and modify
cocoon.xconf and esql.xsp.
Revision Changes Path
No revision
No revision
1.6.2.66 +9 -2 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.65
retrieving revision 1.6.2.66
diff -u -r1.6.2.65 -r1.6.2.66
--- build.xml 2001/04/02 16:35:49 1.6.2.65
+++ build.xml 2001/04/09 14:00:19 1.6.2.66
@@ -116,7 +116,7 @@
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="classic"/>
<property name="target.vm" value="1.2"/>
<property name="src.dir" value="./src"/>
@@ -148,13 +148,20 @@
<property name="dist.target" value="${dist.root}"/>
<property name="site" value="../xml-site/targets/${name}"/>
-
+
<filter token="name" value="${fullname}"/>
<filter token="year" value="${year}"/>
<filter token="version" value="${version}"/>
<filter token="date" value="${TODAY}"/>
<filter token="log" value="true"/>
<filter token="verbose" value="true"/>
+
+ <!-- Add filters for loading database information from database.properties file -->
+ <property file="database.properties"/>
+ <filter token="database-driver" value="${database-driver}"/>
+ <filter token="database-url" value="${database-url}"/>
+ <filter token="database-user" value="${database-user}"/>
+ <filter token="database-password" value="${database-password}"/>
<available property="servlet.present" classname="javax.servlet.http.HttpServlet">
<classpath refid="classpath"/>
No revision
No revision
1.1.2.1 +11 -0 xml-cocoon/Attic/database.properties
No revision
No revision
1.1.2.32 +3 -3 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- cocoon.xconf 2001/04/05 20:15:38 1.1.2.31
+++ cocoon.xconf 2001/04/09 14:00:21 1.1.2.32
@@ -82,9 +82,9 @@
<jdbc name="personnel">
<pool-controller min="5" max="10"/>
- <dburl>jdbc:postgresql://localhost/test</dburl>
- <user>test</user>
- <password>test</password>
+ <dburl>@database-url@</dburl>
+ <user>@database-user@</user>
+ <password>@database-password@</password>
</jdbc>
</datasources>
No revision
No revision
1.1.2.7 +4 -4 xml-cocoon/webapp/docs/samples/xsp/Attic/esql.xsp
Index: esql.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/xsp/Attic/esql.xsp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- esql.xsp 2001/01/17 22:04:24 1.1.2.6
+++ esql.xsp 2001/04/09 14:00:21 1.1.2.7
@@ -13,10 +13,10 @@
<content>
<esql:connection>
- <esql:driver>org.postgresql.Driver</esql:driver>
- <esql:dburl>jdbc:postgresql://localhost/test</esql:dburl>
- <esql:username>test</esql:username>
- <esql:password>test</esql:password>
+ <esql:driver>@database-driver@</esql:driver>
+ <esql:dburl>@database-url@</esql:dburl>
+ <esql:username>@database-user@</esql:username>
+ <esql:password>@database-password@</esql:password>
<esql:execute-query>
<esql:query>select * from department_table</esql:query>
<esql:results>
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org