|
 |
11dc0f |
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
|
|
11dc0f |
index 5fc0e73..ed7e4fa 100644
|
|
|
11dc0f |
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
|
|
11dc0f |
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
|
|
|
11dc0f |
@@ -150,7 +150,20 @@ public class EngineActivator implements BundleActivator {
|
|
|
11dc0f |
}
|
|
|
11dc0f |
continue;
|
|
|
11dc0f |
}
|
|
|
11dc0f |
- File[] listFiles = extension.listFiles();
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ // Support the additional 'eclipse' directory if it exists.
|
|
|
11dc0f |
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
|
|
|
11dc0f |
+ public boolean accept(File dir, String name) {
|
|
|
11dc0f |
+ return name.equals("eclipse");
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+ });
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ File[] listFiles;
|
|
|
11dc0f |
+ if (extensionFiles.length == 1) {
|
|
|
11dc0f |
+ listFiles = extensionFiles[0].listFiles();
|
|
|
11dc0f |
+ } else {
|
|
|
11dc0f |
+ listFiles = extension.listFiles();
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
// new magic - multiple info files, f.e.
|
|
|
11dc0f |
// egit.info (git feature)
|
|
|
11dc0f |
// cdt.link (properties file containing link=path) to other info file
|
|
|
11dc0f |
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
|
|
11dc0f |
index 12e4d89..77945ef 100644
|
|
|
11dc0f |
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
|
|
11dc0f |
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
|
|
|
11dc0f |
@@ -160,7 +160,20 @@ public class SimpleConfiguratorUtils {
|
|
|
11dc0f |
}
|
|
|
11dc0f |
continue;
|
|
|
11dc0f |
}
|
|
|
11dc0f |
- File[] listFiles = extension.listFiles();
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ // Support the additional 'eclipse' directory if it exists.
|
|
|
11dc0f |
+ File[] extensionFiles = extension.listFiles(new FilenameFilter() {
|
|
|
11dc0f |
+ public boolean accept(File dir, String name) {
|
|
|
11dc0f |
+ return name.equals("eclipse");
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
+ });
|
|
|
11dc0f |
+
|
|
|
11dc0f |
+ File[] listFiles;
|
|
|
11dc0f |
+ if (extensionFiles.length == 1) {
|
|
|
11dc0f |
+ listFiles = extensionFiles[0].listFiles();
|
|
|
11dc0f |
+ } else {
|
|
|
11dc0f |
+ listFiles = extension.listFiles();
|
|
|
11dc0f |
+ }
|
|
|
11dc0f |
// new magic - multiple info files, f.e.
|
|
|
11dc0f |
// egit.info (git feature)
|
|
|
11dc0f |
// cdt.link (properties file containing link=path) to other info file
|