Merged jpt_2_0_exp branch into Head.v20080202_Merged

13 files changed, 86 insertions, 12 deletions

diff --git a/jpa/tests/org.eclipse.jpt.db.tests/.classpath b/jpa/tests/org.eclipse.jpt.db.tests/.classpath
index a3d0c948aa..52f3036201 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/.classpath
+++ b/jpa/tests/org.eclipse.jpt.db.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/db/**"/>
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/.settings/org.eclipse.core.resources.prefs b/jpa/tests/org.eclipse.jpt.db.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..b23d0c7038
--- /dev/null
+++ b/jpa/tests/org.eclipse.jpt.db.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Tue Jan 15 11:11:11 EST 2008
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.db.tests/META-INF/MANIFEST.MF
index c56b65e31a..de87ac8d1b 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.db.tests/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jpt.db
 Export-Package: org.eclipse.jpt.db.tests.internal;x-internal:=true,
  org.eclipse.jpt.db.tests.internal.platforms;x-internal:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/JptDbTestsPlugin.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/JptDbTestsPlugin.java
index dfced34598..a5fe382da0 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/JptDbTestsPlugin.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/JptDbTestsPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0, which accompanies this distribution and is available at
  * http://www.eclipse.org/legal/epl-v10.html.
@@ -40,6 +40,7 @@ public class JptDbTestsPlugin extends Plugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -47,6 +48,7 @@ public class JptDbTestsPlugin extends Plugin {
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/DTPPlatformTests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/DTPPlatformTests.java
index c92c3f826f..11622031bb 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/DTPPlatformTests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/DTPPlatformTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -78,6 +78,7 @@ public abstract class DTPPlatformTests extends TestCase {
         this.connectionRepository = ConnectionProfileRepository.instance();
     }
 
+    @Override
 	protected void setUp() throws Exception {
         super.setUp();
         this.connectionRepository.start();
@@ -93,6 +94,7 @@ public abstract class DTPPlatformTests extends TestCase {
         this.verifyProfileNamed( this.profileName());
 	}
 
+    @Override
 	protected void tearDown() throws Exception {
        
         this.connectionRepository.stop();
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Derby101Tests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Derby101Tests.java
index be39252f85..2244b0e623 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Derby101Tests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Derby101Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,35 +19,44 @@ public class Derby101Tests extends DTPPlatformTests {
         super( name);
     }
     
-    protected String databaseVendor() {
+    @Override
+	protected String databaseVendor() {
         return "Derby";
     }
 
+    @Override
     protected String databaseVersion() {
         return "10.1";
     }
 	
+    @Override
     protected String providerId() {
         return "org.eclipse.datatools.connectivity.db.derby.embedded.connectionProfile";
     }
     
+    @Override
     protected String driverName() {
         return "Derby Embedded JDBC Driver";
     }
     
+    @Override
     protected String driverDefinitionType() {
         return "org.eclipse.datatools.connectivity.db.derby101.genericDriverTemplate";
     }
     
+    @Override
     protected String driverDefinitionId() {
         return "DriverDefn.Derby Embedded JDBC Driver";
     }
     
+    @Override
     protected String driverClass() {
         return "org.apache.derby.jdbc.EmbeddedDriver";
     }
 	
+    @Override
     protected String getConfigName() {
     	return "derby101.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/MySQL41Tests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/MySQL41Tests.java
index 2f1f28dfe7..37c190f113 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/MySQL41Tests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/MySQL41Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class MySQL41Tests extends DTPPlatformTests {
         super( name);
     }
     
+    @Override
     protected String databaseVendor() {
         return "MySql";
     }
 
+    @Override
     protected String databaseVersion() {
         return "4.1";
     }
 
+    @Override
 	protected String driverClass() {
 		return "com.mysql.jdbc.Driver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.MySQL JDBC Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.mysql.4_1.driverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "MySQL JDBC Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "mysql41.properties";
     }
+
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gTests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gTests.java
index 1db6d36faa..4fa85b4db8 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gTests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class Oracle10gTests extends DTPPlatformTests {
         super( name);
     }
 
+    @Override
 	protected String databaseVendor() {
 		return "Oracle";
 	}
 
+    @Override
 	protected String databaseVersion() {
 		return "10";
 	}
 
+    @Override
 	protected String driverClass() {
 		return "oracle.jdbc.OracleDriver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.Oracle Thin Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.oracle.10.driverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "Oracle 10g Thin Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "oracle10g.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gXETests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gXETests.java
index a05642b38e..78e0548b1b 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gXETests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle10gXETests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class Oracle10gXETests extends DTPPlatformTests {
         super( name);
     }
 
+    @Override
 	protected String databaseVendor() {
 		return "Oracle";
 	}
 
+    @Override
 	protected String databaseVersion() {
 		return "10";
 	}
 
+    @Override
 	protected String driverClass() {
 		return "oracle.jdbc.OracleDriver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.Oracle Thin Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.oracle.10.driverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "Oracle 10g Thin Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "oracle10gXE.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle9iTests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle9iTests.java
index f750079ccf..8e1795dc24 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle9iTests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Oracle9iTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class Oracle9iTests extends DTPPlatformTests {
         super( name);
     }
 
+    @Override
 	protected String databaseVendor() {
 		return "Oracle";
 	}
 
+    @Override
 	protected String databaseVersion() {
 		return "9";
 	}
 
+    @Override
 	protected String driverClass() {
 		return "oracle.jdbc.OracleDriver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.Oracle Thin Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.oracle.9.driverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "Oracle 9i Thin Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "oracle9i.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQL824Tests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQL824Tests.java
index dc9a75f42b..8e011ad987 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQL824Tests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQL824Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class PostgreSQL824Tests extends DTPPlatformTests {
         super( name);
     }
 
+    @Override
 	protected String databaseVendor() {
 		return "postgres";
 	}
 
+    @Override
 	protected String databaseVersion() {
 		return "8.x";
 	}
 
+    @Override
 	protected String driverClass() {
 		return "org.postgresql.Driver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.PostgreSQL JDBC Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.postgresql.postgresqlDriverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "PostgreSQL JDBC Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "postgresql824.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/SQLServer2005Tests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/SQLServer2005Tests.java
index 6014aa0ee4..350d844d56 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/SQLServer2005Tests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/SQLServer2005Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,35 +19,44 @@ public class SQLServer2005Tests extends DTPPlatformTests {
         super( name);
     }
     
+    @Override
     protected String databaseVendor() {
         return "SQLServer";
     }
 
+    @Override
     protected String databaseVersion() {
         return "2005";
     }
 	
+    @Override
     protected String providerId() {
         return "org.eclipse.datatools.connectivity.db.generic.connectionProfile";
     }
     
+    @Override
     protected String driverName() {
         return "Microsoft SQL Server 2005 JDBC Driver";
     }
     
+    @Override
     protected String driverDefinitionType() {
         return "org.eclipse.datatools.enablement.msft.sqlserver.2005.driverTemplate";
     }
     
+    @Override
     protected String driverDefinitionId() {
         return "DriverDefn.Microsoft SQL Server 2005 JDBC Driver";
     }
     
+    @Override
     protected String driverClass() {
         return "com.microsoft.sqlserver.jdbc.SQLServerDriver";
     }
 	
+    @Override
     protected String getConfigName() {
     	return "sqlserver2005.properties";
     }
+
 }
diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Sybase12Tests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Sybase12Tests.java
index a6230a6b67..c6c7eb3e89 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Sybase12Tests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/Sybase12Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,31 +19,39 @@ public class Sybase12Tests extends DTPPlatformTests {
         super( name);
     }
 
+    @Override
 	protected String databaseVendor() {
 		return "Sybase";
 	}
 
+    @Override
 	protected String databaseVersion() {
 		return "12.x";
 	}
 
+    @Override
 	protected String driverClass() {
 		return "com.sybase.jdbc3.jdbc.SybDriver";
 	}
 
+    @Override
 	protected String driverDefinitionId() {
 		return "DriverDefn.Sybase JDBC Driver";
 	}
 
+    @Override
 	protected String driverDefinitionType() {
 		return "org.eclipse.datatools.enablement.sybase.ase.12_x.driverTemplate";
 	}
 
+    @Override
 	protected String driverName() {
 		return "Sybase JDBC Driver";
 	}
 	
+    @Override
     protected String getConfigName() {
     	return "sybase12.properties";
     }
+
 }