Author: woonsan
Date: Mon Jul 27 16:14:47 2009
New Revision: 798199
URL: http://svn.apache.org/viewvc?rev=798199&view=rev
Log:
JS2-1047: fixing the wrong database name, 'oracle', to 'oracle9' during
installation. Also adding 'oracle10'.
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
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=798199&r1=798198&r2=798199&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
Mon Jul 27 16:14:47 2009
@@ -103,7 +103,8 @@
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
<option text="PostgreSQL" value="postgres" />
- <option text="Oracle (9i or higher)" value="oracle" />
+ <option text="Oracle 9" value="oracle9" />
+ <option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
<option text="Manual database setup" value="manual" />
</select>
@@ -121,7 +122,8 @@
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
<option text="PostgreSQL" value="postgres" />
- <option text="Oracle (9i or higher)" value="oracle" />
+ <option text="Oracle 9" value="oracle9" />
+ <option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
</select>
</page>
@@ -180,10 +182,10 @@
displayText="JDBC driver" checkExists="true" />
</page>
- <page type="input" name="oracle" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle">
+ <page type="input" name="oracle9" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle9">
<hidden property="checkdb" value="true" />
<hidden property="dbvalid" value="false" />
- <hidden property="dbDisplayName" value="Oracle"/>
+ <hidden property="dbDisplayName" value="Oracle 9"/>
<comment displayText="Please fill in the fields below for connecting to
the Oracle database." />
@@ -197,7 +199,25 @@
<file property="jdbcDriverJar"
defaultValue="${java.user.home}${java.file.separator}ojdbc14.jar"
displayText="JDBC driver" checkExists="true" />
</page>
+
+ <page type="input" name="oracle10" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle10">
+ <hidden property="checkdb" value="true" />
+ <hidden property="dbvalid" value="false" />
+ <hidden property="dbDisplayName" value="Oracle 10"/>
+
+ <comment displayText="Please fill in the fields below for connecting to
the Oracle database." />
+
+ <text property="dbUser" displayText="Database User Name" defaultValue="" />
+ <text property="dbPassword" displayText="Database Password"
defaultValue="" />
+ <text property="jdbcUrl" displayText="JDBC Connection String"
+ defaultValue="jdbc:oracle:thin:@localhost:1521:<instance>" />
+ <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
defaultValue="oracle.jdbc.driver.OracleDriver" />
+
+ <file property="jdbcDriverJar"
defaultValue="${java.user.home}${java.file.separator}ojdbc14.jar"
+ displayText="JDBC driver" checkExists="true" />
+ </page>
+
<page type="input" name="mssql" displayText="Microsoft SQL Server connection
parameters"
ifProperty="${dbName}=mssql">
<hidden property="checkdb" value="true" />
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=798199&r1=798198&r2=798199&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
Mon Jul 27 16:14:47 2009
@@ -106,7 +106,8 @@
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
<option text="PostgreSQL" value="postgres" />
- <option text="Oracle (9i or higher)" value="oracle" />
+ <option text="Oracle 9" value="oracle9" />
+ <option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
<option text="Manual database setup" value="manual" />
</select>
@@ -124,7 +125,8 @@
<option text="MSSQL" value="mssql" />
<option text="MySql" value="mysql" />
<option text="PostgreSQL" value="postgres" />
- <option text="Oracle (9i or higher)" value="oracle" />
+ <option text="Oracle 9" value="oracle9" />
+ <option text="Oracle 10 or higher" value="oracle10" />
<option text="SapDB" value="sapdb" />
</select>
</page>
@@ -183,10 +185,10 @@
displayText="JDBC driver" checkExists="true" />
</page>
- <page type="input" name="oracle" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle">
+ <page type="input" name="oracle9" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle9">
<hidden property="checkdb" value="true" />
<hidden property="dbvalid" value="false" />
- <hidden property="dbDisplayName" value="Oracle"/>
+ <hidden property="dbDisplayName" value="Oracle 9"/>
<comment displayText="Please fill in the fields below for connecting to
the Oracle database." />
@@ -200,7 +202,25 @@
<file property="jdbcDriverJar"
defaultValue="${java.user.home}${java.file.separator}ojdbc14.jar"
displayText="JDBC driver" checkExists="true" />
</page>
+
+ <page type="input" name="oracle10" displayText="Oracle Database connection
parameters" ifProperty="${dbName}=oracle10">
+ <hidden property="checkdb" value="true" />
+ <hidden property="dbvalid" value="false" />
+ <hidden property="dbDisplayName" value="Oracle 10 or higher"/>
+
+ <comment displayText="Please fill in the fields below for connecting to
the Oracle database." />
+
+ <text property="dbUser" displayText="Database User Name" defaultValue="" />
+ <text property="dbPassword" displayText="Database Password"
defaultValue="" />
+ <text property="jdbcUrl" displayText="JDBC Connection String"
+ defaultValue="jdbc:oracle:thin:@localhost:1521:<instance>" />
+ <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
defaultValue="oracle.jdbc.driver.OracleDriver" />
+
+ <file property="jdbcDriverJar"
defaultValue="${java.user.home}${java.file.separator}ojdbc14.jar"
+ displayText="JDBC driver" checkExists="true" />
+ </page>
+
<page type="input" name="mssql" displayText="Microsoft SQL Server connection
parameters"
ifProperty="${dbName}=mssql">
<hidden property="checkdb" value="true" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
