Bug 566900 - Remove derby from releng scripts and tools
Get rid of DB from buildtools.
Change-Id: If10e8cba233cad11f0a79b80356b7d919c9b565a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
index 37584ce..620e4dd 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/DB_Results.java
@@ -28,7 +28,6 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.test.internal.performance.PerformanceTestPlugin;
import org.eclipse.test.internal.performance.data.Dim;
-import org.eclipse.test.internal.performance.db.DB;
import org.eclipse.test.internal.performance.results.utils.IPerformancesConstants;
import org.eclipse.test.internal.performance.results.utils.Util;
import org.eclipse.test.performance.Dimension;
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ImportDataMain.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ImportDataMain.java
index 79e63e2..99defa1 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ImportDataMain.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ImportDataMain.java
@@ -26,7 +26,6 @@
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.test.internal.performance.data.Sample;
-import org.eclipse.test.internal.performance.db.DB;
import org.eclipse.test.internal.performance.db.Variations;
/**
@@ -44,8 +43,8 @@
String[] args = (String[]) context.getArguments().get("application.args");
if (args.length > 0) {
System.out.println("\n\t= = Raw arguments ('application.args') passed to performance import application: = =");
- for (int i = 0; i < args.length; i++) {
- System.out.println("\t\t>" + args[i] + "<");
+ for (String arg : args) {
+ System.out.println("\t\t>" + arg + "<");
}
}
IStatus result = run(args);
@@ -81,10 +80,6 @@
// check database
System.out.println("INFO: Connecting to database...");
- DB.getConnection();
- if (!DB.isActive()) {
- return new Status(IStatus.ERROR, UiPlugin.getDefault().toString(), "Cannot connect to performance database.");
- }
// import data
IStatus exitStatus = new Status(IStatus.OK, UiPlugin.getDefault().toString(), "Nothing to import.");
@@ -99,9 +94,6 @@
} catch (Exception ex) {
return new Status(IStatus.ERROR, UiPlugin.getDefault().toString(), "Performance data import failed with exception!", ex);
}
- finally {
- DB.shutdown();
- }
}
@Override
@@ -146,10 +138,6 @@
}
System.out.println("DEBUG: Store data for scenario " + scenarioId);
- boolean success = DB.store(variations, sample);
- if (!success) {
- System.err.println("ERROR: Failed to import scenario " + scenarioId);
- }
}
} catch (EOFException ex) {
// EOFException is the intended way to end the loop