Add support for Virgo 3.7
- Update SystemPackageFilteringRepository for Virgo 3.7 which renames
the Java profile file into "java-server.profile".
- For backward compatibility, if such a file is not found fall back to
the old name (java6-server.profile)
diff --git a/org.eclipse.virgo.kernel.tools/src/main/java/org/eclipse/virgo/kernel/tools/internal/SystemPackageFilteringRepository.java b/org.eclipse.virgo.kernel.tools/src/main/java/org/eclipse/virgo/kernel/tools/internal/SystemPackageFilteringRepository.java
index eec0af2..f57ea46 100644
--- a/org.eclipse.virgo.kernel.tools/src/main/java/org/eclipse/virgo/kernel/tools/internal/SystemPackageFilteringRepository.java
+++ b/org.eclipse.virgo.kernel.tools/src/main/java/org/eclipse/virgo/kernel/tools/internal/SystemPackageFilteringRepository.java
@@ -80,11 +80,20 @@
if (serverHomePath != null) {
repositoryConfigPath = serverHomePath + REPOSITORY_CONFIG_PATH;
- serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "java6-server.profile";
- File serverProfile = new File(serverProfilePath);
+ // new profile file name starting from 3.7
+ serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "java-server.profile";
+
+ File serverProfile = new File(serverProfilePath);
if (!serverProfile.exists()) {
- serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "server.profile";
+ // profile name in Virgo 3.6
+ serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "java6-server.profile";
+
+ serverProfile = new File(serverProfilePath);
+ if (!serverProfile.exists()) {
+ // profile name in Virgo 3.5?
+ serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "server.profile";
+ }
}
}
