Roland Grunberg da94d7
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
Roland Grunberg da94d7
index 12e4d89..77945ef 100644
Roland Grunberg da94d7
--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
Roland Grunberg da94d7
+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
Roland Grunberg da94d7
@@ -156,7 +156,20 @@ public class SimpleConfiguratorUtils {
Roland Grunberg da94d7
 						}
Roland Grunberg da94d7
 						continue;
Roland Grunberg da94d7
 					}
Roland Grunberg da94d7
-					File[] listFiles = extension.listFiles();
Roland Grunberg da94d7
+
Roland Grunberg da94d7
+					// Support the additional 'eclipse' directory if it exists.
Roland Grunberg da94d7
+					File[] extensionFiles = extension.listFiles(new FilenameFilter() {
Roland Grunberg da94d7
+						public boolean accept(File dir, String name) {
Roland Grunberg da94d7
+							return name.equals("eclipse");
Roland Grunberg da94d7
+						}
Roland Grunberg da94d7
+					});
Roland Grunberg da94d7
+
Roland Grunberg da94d7
+					File[] listFiles;
Roland Grunberg da94d7
+					if (extensionFiles.length == 1) {
Roland Grunberg da94d7
+						listFiles = extensionFiles[0].listFiles();
Roland Grunberg da94d7
+					} else {
Roland Grunberg da94d7
+						listFiles = extension.listFiles();
Roland Grunberg da94d7
+					}
Roland Grunberg da94d7
 					// new magic - multiple info files, f.e.
Roland Grunberg da94d7
 					//   egit.info (git feature)
Roland Grunberg da94d7
 					//   cdt.linkĀ (properties file containing link=path) to other info file