255906 - Mistakes in eclipselink persistence.xml target-database property support

3 files changed, 22 insertions, 6 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java
index 6317d9a8cc..96045fe053 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/persistence/options/TargetDatabase.java
@@ -24,8 +24,12 @@ public enum TargetDatabase {
 			hsql,
 			informix,
 			javadb,
-			mysqlplatform,
+			mysql,
 			oracle,
+			oracle11,
+			oracle10,
+			oracle9,
+			oracle8,
 			pointbase,
 			postgresql,
 			sqlanywhere,
@@ -45,11 +49,15 @@ public enum TargetDatabase {
     static final String HSQL = "HSQL";
     static final String INFORMIX = "Informix";
     static final String JAVADB = "JavaDB";
-    static final String MYSQLPLATFORM = "MySQLPlatform";
+    static final String MYSQL = "MySQL";
     static final String ORACLE = "Oracle";
+    static final String ORACLE11 = "Oracle11";
+    static final String ORACLE10 = "Oracle10";
+    static final String ORACLE9 = "Oracle9";
+    static final String ORACLE8 = "Oracle8";
     static final String POINTBASE = "PointBase";
     static final String POSTGRESQL = "PostgreSQL";
-    static final String SQLANYWHERE = "SQLAnyWhere";
+    static final String SQLANYWHERE = "SQLAnywhere";
     static final String SQLSERVER = "SQLServer";
     static final String SYBASE = "Sybase";
     static final String TIMESTEN = "TimesTen";
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
index 14028c69b1..82f4e4076d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
@@ -287,11 +287,15 @@ TargetDatabaseComposite_derby = Derby
 TargetDatabaseComposite_hsql = HSQL
 TargetDatabaseComposite_informix = Informix
 TargetDatabaseComposite_javadb = JavaDB
-TargetDatabaseComposite_mysqlplatform = MySQLPlatform
+TargetDatabaseComposite_mysql = MySQL
 TargetDatabaseComposite_oracle = Oracle
+TargetDatabaseComposite_oracle11 = Oracle11
+TargetDatabaseComposite_oracle10 = Oracle10g
+TargetDatabaseComposite_oracle9 = Oracle9i
+TargetDatabaseComposite_oracle8 = Oracle8i
 TargetDatabaseComposite_pointbase = PointBase
 TargetDatabaseComposite_postgresql = PostgreSQL
-TargetDatabaseComposite_sqlanywhere = SQLAnyWhere
+TargetDatabaseComposite_sqlanywhere = SQLAnywhere
 TargetDatabaseComposite_sqlserver = SQLServer
 TargetDatabaseComposite_sybase = Sybase
 TargetDatabaseComposite_timesten = TimesTen
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
index 1a16dac4e8..6ba9199f3e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
@@ -302,8 +302,12 @@ public class EclipseLinkUiMessages extends NLS
 	public static String TargetDatabaseComposite_hsql;
 	public static String TargetDatabaseComposite_informix;
 	public static String TargetDatabaseComposite_javadb;
-	public static String TargetDatabaseComposite_mysqlplatform;
+	public static String TargetDatabaseComposite_mysql;
 	public static String TargetDatabaseComposite_oracle;
+	public static String TargetDatabaseComposite_oracle11;
+	public static String TargetDatabaseComposite_oracle10;
+	public static String TargetDatabaseComposite_oracle9;
+	public static String TargetDatabaseComposite_oracle8;
 	public static String TargetDatabaseComposite_pointbase;
 	public static String TargetDatabaseComposite_postgresql;
 	public static String TargetDatabaseComposite_sqlanywhere;