[Hyperic-hq-discuss] hq r12338 - in trunk: build_util installer/src/org/hyperic/hq/install

[<cl...@hy...>]

Author: clee
Date: 2009-01-23 15:19:28 -0800 (Fri, 23 Jan 2009)
New Revision: 12338
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=12338

Modified:
   trunk/build_util/dbsetup-build.xml
   trunk/installer/src/org/hyperic/hq/install/ServerConfig.java
Log:
Change installer option to Oracle 10g/11g


Modified: trunk/build_util/dbsetup-build.xml
===================================================================
--- trunk/build_util/dbsetup-build.xml	2009-01-23 22:34:34 UTC (rev 12337)
+++ trunk/build_util/dbsetup-build.xml	2009-01-23 23:19:28 UTC (rev 12338)
@@ -11,7 +11,7 @@
         <property name="quartz.delegate" value="org.quartz.impl.jdbcjobstore.oracle.OracleDelegate"/>
       </case>
       <case value="Oracle9i">
-        <echo>dbsetup-init: Oracle9i</echo>
+        <echo>dbsetup-init: Oracle</echo>
         <property name="using.oracle8.db" value="true"/>
         <property name="quartz.delegate" value="org.quartz.impl.jdbcjobstore.oracle.OracleDelegate"/>
       </case>

Modified: trunk/installer/src/org/hyperic/hq/install/ServerConfig.java
===================================================================
--- trunk/installer/src/org/hyperic/hq/install/ServerConfig.java	2009-01-23 22:34:34 UTC (rev 12337)
+++ trunk/installer/src/org/hyperic/hq/install/ServerConfig.java	2009-01-23 23:19:28 UTC (rev 12338)
@@ -59,7 +59,7 @@
     public static final String PN = PRODUCT;
 
     // database names that appear in the select list
-    public static final String DBC_ORA9    = "Oracle 9i/10g";
+    public static final String DBC_ORA10    = "Oracle 10g/11g";
     public static final String DBC_PGSQL   = "PostgreSQL";
     public static final String DBC_BUILTIN = "HQ Built-in Database";
     public static final String DBC_MYSQL   = "MySQL 5.x";
@@ -301,7 +301,7 @@
             if (installMode.isOracle()) {
                 schema.addOption(
                     new HiddenConfigOption("server.database.choice",
-                                           DBC_ORA9));
+                                           DBC_ORA10));
             } else if (installMode.isPostgres()) {
                 schema.addOption(
                     new HiddenConfigOption("server.database.choice",
@@ -315,11 +315,11 @@
                     new HiddenConfigOption("server.database.choice",
                                            DBC_BUILTIN));
             } else {
-                String defaultDB = haveBuiltinDB ? DBC_BUILTIN : DBC_ORA9;
+                String defaultDB = haveBuiltinDB ? DBC_BUILTIN : DBC_ORA10;
                 String[] dbs = haveBuiltinDB
-                    ? new String[] { DBC_BUILTIN, DBC_ORA9, 
+                    ? new String[] { DBC_BUILTIN, DBC_ORA10, 
                                      DBC_PGSQL, DBC_MYSQL }
-                    : new String[] { DBC_ORA9, DBC_PGSQL, DBC_MYSQL };
+                    : new String[] { DBC_ORA10, DBC_PGSQL, DBC_MYSQL };
                 schema.addOption(
                     new EnumerationConfigOption("server.database.choice",
                                                 Q_DATABASE,
@@ -331,7 +331,7 @@
         case 6:
             // determine server.database from server.database.choice...
             dbChoiceStr = previous.getValue("server.database.choice");
-            if (dbChoiceStr.equals(DBC_ORA9))
+            if (dbChoiceStr.equals(DBC_ORA10))
                 dbChoice = DB_ORA9;
             else if (dbChoiceStr.startsWith(DBC_PGSQL))
                 dbChoice = DB_PGSQL;