summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2012-12-07 16:14:08 (EST)
committerIan Bull2012-12-07 16:14:08 (EST)
commitbb3337b22a12bedb23b068bd4d5f25c4465170ee (patch)
tree7d530739e021ba53b8810930681218a821a1ce5d
parentd0a7af13c7a61babf89d54d8a23797f00059b9c4 (diff)
downloadrt.equinox.p2-bb3337b22a12bedb23b068bd4d5f25c4465170ee.zip
rt.equinox.p2-bb3337b22a12bedb23b068bd4d5f25c4465170ee.tar.gz
rt.equinox.p2-bb3337b22a12bedb23b068bd4d5f25c4465170ee.tar.bz2
shortened the path names of the shared install tests
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/build.properties2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile (renamed from bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile)0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.sharedinstall/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedProfilePreferencesTestWithDataInUser.java4
16 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/META-INF/MANIFEST.MF
index 1fa88a1..85484b5 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/META-INF/MANIFEST.MF
@@ -9,4 +9,6 @@ Require-Bundle: org.eclipse.equinox.p2.tests;bundle-version="1.5.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.equinox.security;bundle-version="1.1.100",
org.junit4;bundle-version="4.8.1",
- org.eclipse.equinox.p2.metadata;bundle-version="2.1.100"
+ org.eclipse.equinox.p2.metadata;bundle-version="2.1.100",
+ org.eclipse.equinox.p2.metadata.repository;bundle-version="1.2.100",
+ org.eclipse.equinox.p2.repository;bundle-version="2.3.0"
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/build.properties b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/build.properties
index 4c8022d..be6734d 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/build.properties
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/build.properties
@@ -2,4 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- testData/
+ data/
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
index e69de29..e69de29 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
index 6f18bb0..6f18bb0 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
index bd469b5..bd469b5 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/sharedPreferences/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
index 8cb4991..8cb4991 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
index e69de29..e69de29 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.lock
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
index 6f18bb0..6f18bb0 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
index bd469b5..bd469b5 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/baseInstall/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/base/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/state.properties
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
index 1831c80..1831c80 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs
index 05c8680..05c8680 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/.data/.settings/org.eclipse.equinox.p2.ui.sdk.prefs
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
index 6f18bb0..6f18bb0 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/testData/sharedPreferencesWithDataInUser/userHome/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/data/test1/user/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.java.profile/1339695683273.profile
diff --git a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedProfilePreferencesTestWithDataInUser.java b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedProfilePreferencesTestWithDataInUser.java
index bfb6b63..c4590e8 100644
--- a/bundles/org.eclipse.equinox.p2.tests.sharedinstall/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedProfilePreferencesTestWithDataInUser.java
+++ b/bundles/org.eclipse.equinox.p2.tests.sharedinstall/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedProfilePreferencesTestWithDataInUser.java
@@ -59,8 +59,8 @@ public class SharedProfilePreferencesTestWithDataInUser extends AbstractProvisio
Bundle p2Core = Platform.getBundle("org.eclipse.equinox.p2.core");
p2Core.stop();
- File baseInstall = getTestData("test shared install", "testData/sharedPreferencesWithDataInUser/baseInstall");
- File userHome = getTestData("test shared install", "testData/sharedPreferencesWithDataInUser/userHome");
+ File baseInstall = getTestData("test shared install", "data/test1/base");
+ File userHome = getTestData("test shared install", "data/test1/user");
System.setProperty("osgi.sharedConfiguration.area", new File(baseInstall, "configuration").toURI().toString());
System.setProperty("osgi.configuration.area", new File(userHome, "configuration").toURI().toString());
System.setProperty("eclipse.p2.profile", "epp.package.java");