Fix wrong build directory 'target'
This commit switches the test's working directory from 'target'
to the Gradle build directory 'build'.
Change-Id: Idbcdea2320f17c0fceea0f2e60f8ebc6da6055d1
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/.gitignore b/kernel/org.eclipse.virgo.kernel.deployer.test/.gitignore
deleted file mode 100644
index 2f7896d..0000000
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
index 755a80a..d13858a 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
@@ -27,7 +27,7 @@
@Ignore("TODO - Check why the eventlog doesn't contain the blueprint messages...")
public class BlueprintDependencyMonitorIntegrationTests extends AbstractDeployerIntegrationTest {
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
+ private static final File LOG_FILE = new File("build/serviceability/eventlog/eventlog.log");
private int existingLines;
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ClasspathScanningTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ClasspathScanningTests.java
index 54f2546..2851042 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ClasspathScanningTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ClasspathScanningTests.java
@@ -59,9 +59,9 @@
}
private void cleanUp() {
- cleanDirectory("./target/org.eclipse.virgo.kernel");
- cleanDirectory("./target/install");
- cleanDirectory("./target/locationCache");
+ cleanDirectory("./build/org.eclipse.virgo.kernel");
+ cleanDirectory("./build/install");
+ cleanDirectory("./build/locationCache");
}
private void cleanDirectory(String dir) {
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
index bc8ee75..766e4b1 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
@@ -121,7 +121,7 @@
@Test
public void testHotDeployConfig() throws Exception {
File source = new File("src/test/resources/configuration.deployment/t.properties");
- File target = new File("target/pickup/t.properties");
+ File target = new File("build/pickup/t.properties");
if (target.exists()) {
assertTrue(target.delete());
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
index c37d438..aeb8c13 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
@@ -50,26 +50,26 @@
@Before
public void setUp() {
- PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
+ PathReference pr = new PathReference("./build/org.eclipse.virgo.kernel");
pr.delete(true);
pr.createDirectory();
- pr = new PathReference("./target/deployer-edge-test");
+ pr = new PathReference("./build/deployer-edge-test");
pr.delete(true);
pr.createDirectory();
- pr = new PathReference("./target/deployer-edge-test/other");
+ pr = new PathReference("./build/deployer-edge-test/other");
pr.createDirectory();
this.appDeployerServiceReference = this.context.getServiceReference(ApplicationDeployer.class);
this.appDeployer = this.context.getService(this.appDeployerServiceReference);
- parCopy1 = new PathReference("./target/deployer-edge-test/app0.par");
- parCopy2 = new PathReference("./target/deployer-edge-test/app0copy.par");
- parCopy3 = new PathReference("./target/deployer-edge-test/other/app0.par");
+ parCopy1 = new PathReference("./build/deployer-edge-test/app0.par");
+ parCopy2 = new PathReference("./build/deployer-edge-test/app0copy.par");
+ parCopy3 = new PathReference("./build/deployer-edge-test/other/app0.par");
par = new PathReference("src/test/resources/app0.par");
- jarCopy1 = new PathReference("./target/deployer-edge-test/dummy.jar");
- jarCopy2 = new PathReference("./target/deployer-edge-test/dummycopy.jar");
- jarCopy3 = new PathReference("./target/deployer-edge-test/other/dummy.jar");
+ jarCopy1 = new PathReference("./build/deployer-edge-test/dummy.jar");
+ jarCopy2 = new PathReference("./build/deployer-edge-test/dummycopy.jar");
+ jarCopy3 = new PathReference("./build/deployer-edge-test/other/dummy.jar");
jar = new PathReference("src/test/resources/dummy.jar");
}
@@ -78,9 +78,9 @@
if (this.appDeployerServiceReference != null) {
this.context.ungetService(this.appDeployerServiceReference);
}
- PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
+ PathReference pr = new PathReference("./build/org.eclipse.virgo.kernel");
pr.delete(true);
- pr = new PathReference("./target/deployer-edge-test");
+ pr = new PathReference("./build/deployer-edge-test");
pr.delete(true);
}
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
index 93f3032..e895491 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
@@ -175,7 +175,7 @@
hotDeployConfiguration.setProperty("prop1", "prop1");
hotDeployConfiguration.setProperty("prop2", "2");
- File target = new File("target/pickup/factory-config-a-hot.properties");
+ File target = new File("build/pickup/factory-config-a-hot.properties");
if (target.exists()) {
assertTrue(target.delete());
@@ -231,7 +231,7 @@
hotDeployConfiguration.setProperty("prop1", "prop1");
hotDeployConfiguration.setProperty("prop2", "2");
- File target = new File("target/pickup/factory-config-a-hot-update.properties");
+ File target = new File("build/pickup/factory-config-a-hot-update.properties");
if (target.exists()) {
assertTrue(target.delete());
@@ -320,8 +320,8 @@
configTwo.setProperty("prop1", "prop2");
configTwo.setProperty("prop2", "2");
- final File targetOne = new File("target/pickup/factory-config-a-hot-update-1.properties");
- final File targetTwo = new File("target/pickup/factory-config-a-hot-update-2.properties");
+ final File targetOne = new File("build/pickup/factory-config-a-hot-update-1.properties");
+ final File targetTwo = new File("build/pickup/factory-config-a-hot-update-2.properties");
if (targetOne.exists()) {
assertTrue(targetOne.delete());
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
index 99632b3..5845cf0 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
@@ -56,7 +56,7 @@
}
private void doTest(PathReference artifact, String type, String version) throws DeploymentException {
- PathReference copyInPickup = artifact.copy(new PathReference("target/pickup"), true);
+ PathReference copyInPickup = artifact.copy(new PathReference("build/pickup"), true);
try {
while (!this.deployer.isDeployed(copyInPickup.toURI())) {
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/InterdependentBundleDeploymentTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/InterdependentBundleDeploymentTests.java
index 80b0c1b..c351833 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/InterdependentBundleDeploymentTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/InterdependentBundleDeploymentTests.java
@@ -34,7 +34,7 @@
private ApplicationDeployer appDeployer;
@Before public void setUp() {
- PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
+ PathReference pr = new PathReference("./build/org.eclipse.virgo.kernel");
pr.delete(true);
pr.createDirectory();
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
index b91f867..84d7b9a 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
@@ -75,7 +75,7 @@
private static final String TEST_RESOURCES_DIRECTORY = "src/test/resources/plan-deployment/";
- private static final String GENERATED_PLAN_DIRECTORY = "target/watched/";
+ private static final String GENERATED_PLAN_DIRECTORY = "build/watched/";
private static final String PLAN_EXTENSION = ".plan";
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
index 01b7e76..f331eaa 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
@@ -45,9 +45,9 @@
private static final int POLLING_INTERVAL_MILLIS = 100;
- private final PathReference pickup = new PathReference("./target/pickup");
+ private final PathReference pickup = new PathReference("./build/pickup");
- private final PathReference target = new PathReference("./target");
+ private final PathReference target = new PathReference("./build");
private StubInstallArtifactLifecycleListener lifecycleListener;
@@ -61,7 +61,7 @@
@Before
public void setUp() {
- PathReference pr = new PathReference("./target/deployer");
+ PathReference pr = new PathReference("./build/deployer");
pr.delete(true);
pr.createDirectory();
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerTimeOutTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerTimeOutTests.java
index 221b03e..6fabee4 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerTimeOutTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerTimeOutTests.java
@@ -41,7 +41,7 @@
private ApplicationDeployer appDeployer;
- private final PathReference pickup = new PathReference("./target/pickup");
+ private final PathReference pickup = new PathReference("./build/pickup");
private StubInstallArtifactLifecycleListener lifecycleListener;
@@ -49,7 +49,7 @@
@Before
public void setUp() {
- PathReference pr = new PathReference("./target/deployer");
+ PathReference pr = new PathReference("./build/deployer");
pr.delete(true);
pr.createDirectory();
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
index cce56e6..83b006f 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
@@ -34,7 +34,7 @@
private static final String TEST_RESOURCES_DIRECTORY = "src/test/resources/plan-deployment/";
- private static final String GENERATED_PLAN_DIRECTORY = "target/PlanUriIntegrationTests/";
+ private static final String GENERATED_PLAN_DIRECTORY = "build/PlanUriIntegrationTests/";
private static final String PLAN_EXTENSION = ".plan";
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
index c2e3384..01c1130 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
@@ -40,7 +40,7 @@
@Test
public void refresh() throws DeploymentException {
- PathReference copyToDeploy = new PathReference("target/initial.jar");
+ PathReference copyToDeploy = new PathReference("build/initial.jar");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -91,14 +91,14 @@
@Test
public void refreshWithinAnUnscopedPlan() throws DeploymentException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/refresh.jar");
+ PathReference copyToDeploy = new PathReference("build/watched/refresh.jar");
PathReference original = new PathReference("src/test/resources/ram-bundle-refresh/initial.jar");
original.copy(copyToDeploy, true);
@@ -133,7 +133,7 @@
@Test
public void refreshWithinAPar() throws DeploymentException {
- PathReference copyToDeploy = new PathReference("target/bundle-refresh.par");
+ PathReference copyToDeploy = new PathReference("build/bundle-refresh.par");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -146,7 +146,7 @@
assertStateOfScopedInitialBundle();
PathReference refreshSource = new PathReference("src/test/resources/ram-bundle-refresh/new-entry.jar");
- PathReference refreshTarget = new PathReference("target/bundle-refresh.par/initial.jar");
+ PathReference refreshTarget = new PathReference("build/bundle-refresh.par/initial.jar");
refreshTarget.delete(true);
refreshSource.copy(refreshTarget, true);
@@ -184,18 +184,18 @@
@Test
public void refreshWithinAnUnscopedPlanWithAScopedParent() throws DeploymentException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/refresh.jar");
+ PathReference copyToDeploy = new PathReference("build/watched/refresh.jar");
PathReference original = new PathReference("src/test/resources/ram-bundle-refresh/initial.jar");
original.copy(copyToDeploy, true);
- new PathReference("src/test/resources/ram-bundle-refresh/test.plan").copy(new PathReference("target/watched/test.plan"));
+ new PathReference("src/test/resources/ram-bundle-refresh/test.plan").copy(new PathReference("build/watched/test.plan"));
Thread.sleep(2000);
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
index 6beaa67..7ad2734 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
@@ -39,7 +39,7 @@
@Test
public void refresh() throws DeploymentException, IOException, InvalidSyntaxException {
- PathReference copyToDeploy = new PathReference("target/test.properties");
+ PathReference copyToDeploy = new PathReference("build/test.properties");
if (copyToDeploy.exists() && !copyToDeploy.delete()) {
fail("Failed to delete " + copyToDeploy);
}
@@ -67,7 +67,7 @@
@Test
public void refreshWithinAPar() throws DeploymentException, IOException, InvalidSyntaxException {
- PathReference copyToDeploy = new PathReference("target/config-refresh.par");
+ PathReference copyToDeploy = new PathReference("build/config-refresh.par");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -98,19 +98,19 @@
@Test
public void refreshWithinAPlan() throws DeploymentException, IOException, InvalidSyntaxException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/test.properties");
+ PathReference copyToDeploy = new PathReference("build/watched/test.properties");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
- PathReference configurationCopy = new PathReference("target/watched/test.properties");
+ PathReference configurationCopy = new PathReference("build/watched/test.properties");
new PathReference("src/test/resources/ram-config-refresh/test.properties").copy(configurationCopy);
Thread.sleep(2000);
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RedeployRefreshTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RedeployRefreshTests.java
index 8c35431..37fdda0 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RedeployRefreshTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RedeployRefreshTests.java
@@ -44,7 +44,7 @@
// The following races with server startup and causes unpleasantness on
// the console, but is unfortunately
// necessary until the test framework cold starts the server.
- PathReference pr = new PathReference("./target/redeploy-refresh");
+ PathReference pr = new PathReference("./build/redeploy-refresh");
pr.delete(true);
pr.createDirectory();
simpleModule = pr.newChild("simple.module.jar");
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
index 2987cf9..23a28ee 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
@@ -54,14 +54,14 @@
@Before
public void setUp() throws Exception {
- PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
+ PathReference pr = new PathReference("./build/org.eclipse.virgo.kernel");
pr.delete(true);
pr.createDirectory();
this.appDeployerServiceReference = this.context.getServiceReference(ApplicationDeployer.class);
this.appDeployer = this.context.getService(this.appDeployerServiceReference);
- explodedPar = new PathReference("./target/refresh-test/refresh.par");
+ explodedPar = new PathReference("./build/refresh-test/refresh.par");
explodedPar.delete(true);
par = new PathReference("src/test/resources/refresh.par");
@@ -88,8 +88,8 @@
checkV1Classes();
- PathReference exporter = new PathReference("./target/refresh-test/refresh.par/RefreshExporter.jar");
- PathReference v2 = new PathReference("./target/refresh-test/refresh.par/build/RefreshExporterv2.jar");
+ PathReference exporter = new PathReference("./build/refresh-test/refresh.par/RefreshExporter.jar");
+ PathReference v2 = new PathReference("./build/refresh-test/refresh.par/build/RefreshExporterv2.jar");
exporter.delete();
v2.copy(exporter);
this.appDeployer.refresh(explodedPar.toURI(), "RefreshExporter");
@@ -98,7 +98,7 @@
checkV2Classes();
- PathReference v3 = new PathReference("./target/refresh-test/refresh.par/build/RefreshExporterv3.jar");
+ PathReference v3 = new PathReference("./build/refresh-test/refresh.par/build/RefreshExporterv3.jar");
exporter.delete();
v3.copy(exporter);
this.appDeployer.refresh(explodedPar.toURI(), "RefreshExporter");
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
index b6bb1e8..c6e290f 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
@@ -50,7 +50,7 @@
@Before
public void setUp() throws Exception {
- PathReference pr = new PathReference("./target/work/org.eclipse.virgo.kernel");
+ PathReference pr = new PathReference("./build/work/org.eclipse.virgo.kernel");
pr.delete(true);
this.appDeployerServiceReference = this.context.getServiceReference(ApplicationDeployer.class);
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index a374d40..0f0f190 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -37,18 +37,18 @@
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.management/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.management-${org.eclipse.virgo.nano}.jar@start,\
- file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
+ file:../org.eclipse.virgo.kernel.agent.dm/build/classes@start,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar,\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
- file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
- file:../org.eclipse.virgo.kernel.services/target/classes@start,\
- file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.model/target/classes@start,\
- file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes,\
- file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
- file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
+ file:../org.eclipse.virgo.kernel.artifact/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.services/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.deployer/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.model/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.kerneldmfragment/build/classes,\
+ file:../org.eclipse.virgo.kernel.osgi/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.userregionfactory/build/classes@start
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../user-ivy.properties
@@ -58,7 +58,7 @@
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
-osgi.configuration.area=target
+osgi.configuration.area=build
org.osgi.framework.bsnversion=multiple
# osgi console support
@@ -76,7 +76,7 @@
org.eclipse.virgo.kernel.deployer.disableRecovery=true
org.eclipse.virgo.suppress.heap.dumps=true
-org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.home=build
org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
# Paths are relative to the current working directory
org.eclipse.virgo.kernel.config=src/test/resources/config
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index 6058fd7..b66c69d 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -37,18 +37,18 @@
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.management/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.management-${org.eclipse.virgo.nano}.jar@start,\
- file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
+ file:../org.eclipse.virgo.kernel.agent.dm/build/classes@start,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar,\
file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
- file:../org.eclipse.virgo.kernel.artifact/target/classes@start,\
- file:../org.eclipse.virgo.kernel.services/target/classes@start,\
- file:../org.eclipse.virgo.kernel.deployer/target/classes@start,\
- file:../org.eclipse.virgo.kernel.model/target/classes@start,\
- file:../org.eclipse.virgo.kernel.kerneldmfragment/target/classes,\
- file:../org.eclipse.virgo.kernel.osgi/target/classes@start,\
- file:../org.eclipse.virgo.kernel.userregionfactory/target/classes@start
+ file:../org.eclipse.virgo.kernel.artifact/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.services/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.deployer/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.model/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.kerneldmfragment/build/classes,\
+ file:../org.eclipse.virgo.kernel.osgi/build/classes@start,\
+ file:../org.eclipse.virgo.kernel.userregionfactory/build/classes@start
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../user-ivy.properties
@@ -58,7 +58,7 @@
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
-osgi.configuration.area=target
+osgi.configuration.area=build
org.osgi.framework.bsnversion=multiple
# osgi console support
@@ -76,7 +76,7 @@
org.eclipse.virgo.kernel.deployer.disableRecovery=true
org.eclipse.virgo.suppress.heap.dumps=false
-org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.home=build
org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
# Paths are relative to the current working directory
org.eclipse.virgo.kernel.config=src/test/resources/config
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index 4b8e8b6..85997a8 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -64,7 +64,7 @@
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
-osgi.configuration.area=target
+osgi.configuration.area=build
org.osgi.framework.bsnversion=multiple
# osgi console support
@@ -80,7 +80,7 @@
org.eclipse.virgo.kernel.deployer.disableRecovery=true
org.eclipse.virgo.suppress.heap.dumps=false
-org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.home=build
org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
# Paths are relative to the current working directory
org.eclipse.virgo.kernel.config=src/test/resources/config
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
index 7c8dd56..98b2169 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
@@ -1,5 +1,5 @@
deployer.timeout= 300
-deployer.pickupDirectory= target/pickup
+deployer.pickupDirectory= build/pickup
deployer.scanIntervalMillis=1000
deployer.systemArtifacts=
deployer.unpackBundles=false
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.medic.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.medic.properties
index 8b9e75a..ae70f58 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.medic.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.medic.properties
@@ -1,4 +1,4 @@
-dump.root.directory=target/serviceability/dump
+dump.root.directory=build/serviceability/dump
log.wrapSysOut=true
log.wrapSysErr=true
log.dump.level=DEBUG
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
index 0686df4..f223735 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
@@ -1,5 +1,5 @@
bundles.type=external
-bundles.searchPattern=../{bundle}/target/classes
+bundles.searchPattern=../{bundle}/build/classes
ivy-cache-bundles.type=external
ivy-cache-bundles.searchPattern=${user.home}/virgo-build-cache/ivy-cache/repository/{org}/{name}/{version}/{bundle}.jar
@@ -8,7 +8,7 @@
ivy-cache-libraries.searchPattern=${user.home}/virgo-build-cache/ivy-cache/repository/{org}/{name}/{version}/{library}.libd
target-watched.type=watched
-target-watched.watchDirectory=target/watched
+target-watched.watchDirectory=build/watched
target-watched.watchInterval=1
src-test-resources-1.type=external
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
index ebfb8fb..c7919e7 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
@@ -5,9 +5,9 @@
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/log/log.log</file>
+ <file>build/serviceability/log/log.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/log/log_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/log/log_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
@@ -26,9 +26,9 @@
</appender>
<appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/eventlog/eventlog.log</file>
+ <file>build/serviceability/eventlog/eventlog.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/configTimeout/org.eclipse.virgo.kernel.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/configTimeout/org.eclipse.virgo.kernel.properties
index 132ac38..d7381d3 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/configTimeout/org.eclipse.virgo.kernel.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/configTimeout/org.eclipse.virgo.kernel.properties
@@ -1,8 +1,8 @@
deployer.timeout= 0
-deployer.pickupDirectory= target/pickup
+deployer.pickupDirectory= build/pickup
deployer.scanIntervalMillis=1000
-io.workDirectory= target/work
-io.dumpDirectory= target/serviceability/dump
+io.workDirectory= build/work
+io.dumpDirectory= build/serviceability/dump
profile.name = deployer integration tests
profile.subsystems=
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java
index 17c6422..572db76 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/concurrent/test/ApplicationContextDependencyMonitorIntegrationTests.java
@@ -83,7 +83,7 @@
} catch (InterruptedException ignored) {
}
- File loggingOutput = new File("./target/serviceability/eventlog/eventlog.log");
+ File loggingOutput = new File("./build/serviceability/eventlog/eventlog.log");
Assert.assertTrue("The log file " + loggingOutput.getAbsolutePath() + " does not exist.", loggingOutput.exists());
BufferedReader reader = new BufferedReader(new FileReader(loggingOutput));
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
index c3d78a8..17b5b9d 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
@@ -58,7 +58,7 @@
Assert.assertNotNull(this.quasiFrameworkFactory);
this.quasiFramework = this.quasiFrameworkFactory.create();
Assert.assertNotNull(this.quasiFramework);
- this.dumpDir = new File("target/serviceability/dump/");
+ this.dumpDir = new File("build/serviceability/dump/");
if(this.dumpDir.exists()){
FileSystemUtils.deleteRecursively(this.dumpDir);
}
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index 9100999..e450bd7 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -60,7 +60,7 @@
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
-osgi.configuration.area=target
+osgi.configuration.area=build
org.osgi.framework.bsnversion=multiple
# osgi console support
@@ -74,7 +74,7 @@
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator
-org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.home=build
org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
# Paths are relative to the current working directory
org.eclipse.virgo.kernel.config=src/test/resources/config
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
index a1dcae0..6c98cab 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
@@ -1,4 +1,4 @@
deployer.timeout= 300
-deployer.pickupDirectory= target/pickup
+deployer.pickupDirectory= build/pickup
deployer.scanIntervalMillis=1000
deployer.systemArtifacts=
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.medic.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.medic.properties
index 8b9e75a..ae70f58 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.medic.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.medic.properties
@@ -1,4 +1,4 @@
-dump.root.directory=target/serviceability/dump
+dump.root.directory=build/serviceability/dump
log.wrapSysOut=true
log.wrapSysErr=true
log.dump.level=DEBUG
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.repository.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.repository.properties
index 5b88812..9f268ef 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.repository.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.repository.properties
@@ -1,5 +1,5 @@
#bundles.type=external
-#bundles.searchPattern=../{bundle}/target/classes
+#bundles.searchPattern=../{bundle}/build/classes
src-test-resources.type=external
src-test-resources.searchPattern=src/test/resources/*.jar
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
index 667c8a7..3710a30 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
@@ -11,9 +11,9 @@
</appender>
<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/log/log.log</file>
+ <file>build/serviceability/log/log.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/log/log_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/log/log_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
@@ -32,9 +32,9 @@
</appender>
<appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/eventlog/eventlog.log</file>
+ <file>build/serviceability/eventlog/eventlog.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/kernel.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/kernel.properties
index 904b062..150326c 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/kernel.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/kernel.properties
@@ -1,8 +1,8 @@
deployer.timeout= 300
-deployer.pickupDirectory= target/pickup
+deployer.pickupDirectory= build/pickup
deployer.scanIntervalMillis=1000
-io.workDirectory= target/work
-io.dumpDirectory= target/serviceability/dump
+io.workDirectory= build/work
+io.dumpDirectory= build/serviceability/dump
profile.name= subsystem installation test
profile.subsystems= subsystem.installation.test
profile.optionalSubsystems=
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/repository.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/repository.properties
index 1d2e9f0..f71bffd 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/repository.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/repository.properties
@@ -1,5 +1,5 @@
bundles.type=external
-bundles.searchPattern=../{bundle}/target/classes
+bundles.searchPattern=../{bundle}/build/classes
ivy-cache-bundles.type=external
ivy-cache-bundles.searchPattern=../${ivy.cache::ivy-cache}/repository/{org}/{name}/{version}/{bundle}.jar
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
index 1ebbacb..52e7b93 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
@@ -11,9 +11,9 @@
</appender>
<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/log/log.log</file>
+ <file>build/serviceability/log/log.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/log/log_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/log/log_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
@@ -32,9 +32,9 @@
</appender>
<appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/eventlog/eventlog.log</file>
+ <file>build/serviceability/eventlog/eventlog.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
diff --git a/medic/org.eclipse.virgo.medic.core/src/test/resources/logback-test.xml b/medic/org.eclipse.virgo.medic.core/src/test/resources/logback-test.xml
index 4dedac1..5e77755 100644
--- a/medic/org.eclipse.virgo.medic.core/src/test/resources/logback-test.xml
+++ b/medic/org.eclipse.virgo.medic.core/src/test/resources/logback-test.xml
@@ -15,9 +15,9 @@
</encoder>
</appender>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/serviceability/eventlog/eventlog.log</file>
+ <file>build/serviceability/eventlog/eventlog.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>target/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
+ <FileNamePattern>build/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>4</MaxIndex>
</rollingPolicy>
