371034 - fixes the kernel-tools to comply with the new directory layout
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 7d4472f..ef9c93b 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
@@ -67,10 +67,12 @@
private final ArtifactDescriptor systemBundleDescriptor;
private static final String SYSTEM_BUNDLE_SYMBOLIC_NAME = "org.eclipse.osgi";
- private static final String REPOSITORY_CONFIG_PATH = File.separatorChar + "config" + File.separatorChar + "org.eclipse.virgo.repository.properties";
+ private static final String REPOSITORY_CONFIG_PATH = File.separatorChar + "configuration" + File.separatorChar + "org.eclipse.virgo.repository.properties";
private static final String LIB_SEARCH_PATH = File.separatorChar + "lib" + File.separatorChar + "*.jar";
+ private static final String PLUGINS_SEARCH_PATH = File.separatorChar + "plugins" + File.separatorChar + "*.jar";
+
public SystemPackageFilteringRepository(String serverHomePath, String[] additionalSearchPaths, String indexDirectoryPath,
@SuppressWarnings("unused") EventLogger eventLogger, BundleContext bundleContext) throws IOException {
@@ -79,11 +81,11 @@
if (serverHomePath != null) {
repositoryConfigPath = serverHomePath + REPOSITORY_CONFIG_PATH;
- serverProfilePath = serverHomePath + File.separator + "lib" + File.separator + "java6-server.profile";
+ serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "java6-server.profile";
File serverProfile = new File(serverProfilePath);
if (!serverProfile.exists()) {
- serverProfilePath = serverHomePath + File.separator + "lib" + File.separator + "server.profile";
+ serverProfilePath = serverHomePath + File.separator + "configuration" + File.separator + "server.profile";
}
}
@@ -107,7 +109,7 @@
try {
this.mainRepository = createRepository(repositoryConfiguration, bundleContext);
RepositoryConfiguration systemPackageRepositoryConfiguration = new ExternalStorageRepositoryConfiguration("system-repository", new File(
- indexDirectoryPath, "system-repository.index"), artifactBridges, serverHomePath + LIB_SEARCH_PATH, null);
+ indexDirectoryPath, "system-repository.index"), artifactBridges, serverHomePath + PLUGINS_SEARCH_PATH, null);
this.systemPackageRepository = createRepository(systemPackageRepositoryConfiguration, bundleContext);
} catch (RepositoryCreationException rce) {
IOException exc = new IOException("A failure occurred during repository creation");
@@ -116,7 +118,7 @@
}
systemPackages = EquinoxOsgiProfileParser.parseProfileForExportedPackages(serverProfilePath);
- systemPackages.putAll(findExportsFromOsgiImplementationBundle(new File(serverHomePath, "lib"), SYSTEM_BUNDLE_SYMBOLIC_NAME));
+ systemPackages.putAll(findExportsFromOsgiImplementationBundle(new File(serverHomePath, "plugins"), SYSTEM_BUNDLE_SYMBOLIC_NAME));
jreProvidedDependenciesDescriptors = new HashSet<ArtifactDescriptor>();
systemBundleDescriptor = new SystemBundleDescriptor(createBundleManifest(this.systemPackages));
diff --git a/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/osgi/provisioning/tools/test/DependencyLocatorTests.java b/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/osgi/provisioning/tools/test/DependencyLocatorTests.java
index 0b52c4d..5da62c3 100644
--- a/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/osgi/provisioning/tools/test/DependencyLocatorTests.java
+++ b/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/osgi/provisioning/tools/test/DependencyLocatorTests.java
@@ -294,7 +294,7 @@
assertEquals("javax.xml.soap", packages.get(0));
key = iterator.next();
- assertEquals(new File("src/test/resources/dependency-locator/lib/org.eclipse.osgi-3.4.0.v20080529-1200.jar").getAbsoluteFile(), key);
+ assertEquals(new File("src/test/resources/dependency-locator/plugins/org.eclipse.osgi-3.4.0.v20080529-1200.jar").getAbsoluteFile(), key);
packages = dependencies.get(key);
assertNotNull(packages);
assertEquals(1, packages.size());
diff --git a/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/tools/test/DependencyLocatorTests.java b/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/tools/test/DependencyLocatorTests.java
index 5326ae4..7dfd96e 100644
--- a/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/tools/test/DependencyLocatorTests.java
+++ b/org.eclipse.virgo.kernel.tools/src/test/java/org/eclipse/virgo/kernel/tools/test/DependencyLocatorTests.java
@@ -294,7 +294,7 @@
assertEquals("javax.xml.soap", packages.get(0));
key = iterator.next();
- assertEquals(new File("src/test/resources/dependency-locator/lib/org.eclipse.osgi-3.4.0.v20080529-1200.jar").getAbsoluteFile(), key);
+ assertEquals(new File("src/test/resources/dependency-locator/plugins/org.eclipse.osgi-3.4.0.v20080529-1200.jar").getAbsoluteFile(), key);
packages = dependencies.get(key);
assertNotNull(packages);
assertEquals(1, packages.size());
diff --git a/org.eclipse.virgo.kernel.tools/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.tools/src/test/resources/META-INF/test.config.properties
index 609b8f6..21863e5 100644
--- a/org.eclipse.virgo.kernel.tools/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.tools/src/test/resources/META-INF/test.config.properties
@@ -29,5 +29,5 @@
osgi.configuration.area=target
osgi.console=2401
-osgi.java.profile=file:src/test/resources/dependency-locator/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/dependency-locator/configuration/java6-server.profile
osgi.java.profile.bootdelegation=override
diff --git a/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/lib/java6-server.profile b/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/configuration/java6-server.profile
similarity index 100%
rename from org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/lib/java6-server.profile
rename to org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/configuration/java6-server.profile
diff --git a/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/config/org.eclipse.virgo.repository.properties b/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/configuration/org.eclipse.virgo.repository.properties
similarity index 100%
rename from org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/config/org.eclipse.virgo.repository.properties
rename to org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/configuration/org.eclipse.virgo.repository.properties
diff --git a/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/lib/org.eclipse.osgi-3.4.0.v20080529-1200.jar b/org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/plugins/org.eclipse.osgi-3.4.0.v20080529-1200.jar
similarity index 100%
rename from org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/lib/org.eclipse.osgi-3.4.0.v20080529-1200.jar
rename to org.eclipse.virgo.kernel.tools/src/test/resources/dependency-locator/plugins/org.eclipse.osgi-3.4.0.v20080529-1200.jar
Binary files differ
