shuber 2005/06/23 11:12:36 CEST
Modified files:
core/src/conf/metadata jahia-tomcat5.xml jahia.xml
Log:
Add variables used by Configuration Wizard to subsistute real database
configuration values.
Revision Changes Path
1.2 +7 -7 jahia/core/src/conf/metadata/jahia-tomcat5.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/metadata/jahia-tomcat5.xml.diff?r1=1.1&r2=1.2&f=h
1.3 +7 -7 jahia/core/src/conf/metadata/jahia.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/metadata/jahia.xml.diff?r1=1.2&r2=1.3&f=h
Index: jahia-tomcat5.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/metadata/jahia-tomcat5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jahia-tomcat5.xml 2 Jun 2005 09:36:26 -0000 1.1
+++ jahia-tomcat5.xml 23 Jun 2005 09:12:36 -0000 1.2
@@ -31,26 +31,26 @@
<value>10000</value>
</parameter>
- <!-- HSQL dB username and password for dB connections -->
+ <!-- DB username and password for dB connections -->
<parameter>
<name>username</name>
- <value>sa</value>
+ <value>@USERNAME@</value>
</parameter>
<parameter>
<name>password</name>
- <value></value>
+ <value>@PASSWORD@</value>
</parameter>
- <!-- Class name for HSQL JDBC driver -->
+ <!-- Class name for JDBC driver -->
<parameter>
<name>driverClassName</name>
- <value>org.hsqldb.jdbcDriver</value>
+ <value>@DRIVER@</value>
</parameter>
- <!-- The JDBC connection url for connecting to your HSQL dB. -->
+ <!-- The JDBC connection url for connecting to your DB -->
<parameter>
<name>url</name>
- <value>jdbc:hsqldb:hsql://localhost</value>
+ <value>@URL@</value>
</parameter>
</ResourceParams>
Index: jahia.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/conf/metadata/jahia.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jahia.xml 2 Apr 2004 10:31:25 -0000 1.2
+++ jahia.xml 23 Jun 2005 09:12:36 -0000 1.3
@@ -31,26 +31,26 @@
<value>10000</value>
</parameter>
- <!-- HSQL dB username and password for dB connections -->
+ <!-- DB username and password for dB connections -->
<parameter>
<name>username</name>
- <value>sa</value>
+ <value>@USERNAME@</value>
</parameter>
<parameter>
<name>password</name>
- <value></value>
+ <value>@PASSWORD@</value>
</parameter>
- <!-- Class name for HSQL JDBC driver -->
+ <!-- Class name for JDBC driver -->
<parameter>
<name>driverClassName</name>
- <value>org.hsqldb.jdbcDriver</value>
+ <value>@DRIVER@</value>
</parameter>
- <!-- The JDBC connection url for connecting to your HSQL dB. -->
+ <!-- The JDBC connection url for connecting to your DB. -->
<parameter>
<name>url</name>
- <value>jdbc:hsqldb:hsql://localhost</value>
+ <value>@URL@</value>
</parameter>
</ResourceParams>
