Author: rwatler
Date: Sat Mar 20 05:21:25 2010
New Revision: 925552
URL: http://svn.apache.org/viewvc?rev=925552&view=rev
Log:
JS2-1041: correct installer database type name for postgresql
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml?rev=925552&r1=925551&r2=925552&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
Sat Mar 20 05:21:25 2010
@@ -102,7 +102,7 @@
<option text="Derby" value="derby" />
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
- <option text="PostgreSQL" value="postgres" />
+ <option text="PostgreSQL" value="postgresql" />
<option text="Oracle 9" value="oracle9" />
<option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
@@ -121,7 +121,7 @@
<option text="DB2" value="db2" />
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
- <option text="PostgreSQL" value="postgres" />
+ <option text="PostgreSQL" value="postgresql" />
<option text="Oracle 9" value="oracle9" />
<option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
@@ -146,8 +146,8 @@
displayText="JDBC driver" checkExists="true" />
</page>
- <page type="input" name="postgres" displayText="PostgreSQL Database
connection parameters"
- ifProperty="${dbName}=postgres">
+ <page type="input" name="postgresql" displayText="PostgreSQL Database
connection parameters"
+ ifProperty="${dbName}=postgresql">
<hidden property="checkdb" value="true" />
<hidden property="dbvalid" value="false" />
<hidden property="dbDisplayName" value="PostgreSQL"/>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=925552&r1=925551&r2=925552&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/antinstall-config.xml
Sat Mar 20 05:21:25 2010
@@ -105,7 +105,7 @@
<option text="Derby" value="derby" />
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
- <option text="PostgreSQL" value="postgres" />
+ <option text="PostgreSQL" value="postgresql" />
<option text="Oracle 9" value="oracle9" />
<option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
@@ -124,7 +124,7 @@
<option text="DB2" value="db2" />
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
- <option text="PostgreSQL" value="postgres" />
+ <option text="PostgreSQL" value="postgresql" />
<option text="Oracle 9" value="oracle9" />
<option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
@@ -149,8 +149,8 @@
displayText="JDBC driver" checkExists="true" />
</page>
- <page type="input" name="postgres" displayText="PostgreSQL Database
connection parameters"
- ifProperty="${dbName}=postgres">
+ <page type="input" name="postgresql" displayText="PostgreSQL Database
connection parameters"
+ ifProperty="${dbName}=postgresql">
<hidden property="checkdb" value="true" />
<hidden property="dbvalid" value="false" />
<hidden property="dbDisplayName" value="PostgreSQL"/>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template?rev=925552&r1=925551&r2=925552&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/database/database.properties.template
Sat Mar 20 05:21:25 2010
@@ -15,7 +15,7 @@
; Jetspeed Enterprise Portal 2.2.1-SNAPSHOT Database setup configuration
-; db.type supported values: db2, derby, mssql, mysql, oracle, postgres, sapdb
+; db.type supported values: db2, derby, mssql, mysql, oracle, postgresql, sapdb
[email protected]@
: for db.type other than derby, the properties below need to be specified
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
