Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2015-04-16 09:23:02 +0000
committerFlorian Waibel2015-04-16 09:23:02 +0000
commitf28f5686fd7cfb268ebefac4ed14e1aabc591136 (patch)
tree9bb5d53d117c7e6e7ebaa5e298088b2d197f393e /org.eclipse.virgo.kernel.services
parent91564e2707f01298566ea7cce9f1a54b0c546533 (diff)
downloadorg.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.tar.gz
org.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.tar.xz
org.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.zip
463462 - Switches to Gradle build
Diffstat (limited to 'org.eclipse.virgo.kernel.services')
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java8
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java12
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java2
-rw-r--r--org.eclipse.virgo.kernel.services/template.mf14
4 files changed, 18 insertions, 18 deletions
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
index ffa7ecb9..6b985687 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
@@ -46,7 +46,7 @@ public class RepositoryFactoryBeanTests {
mockEventLogger.reinitialise();
Properties properties = new Properties();
RepositoryFactory factory = createMock(RepositoryFactory.class);
- File work = new File("target");
+ File work = new File("build");
RepositoryFactoryBean bean = new RepositoryFactoryBean(properties, mockEventLogger, factory, work, Collections.<ArtifactBridge>emptySet(), null);
Repository r = bean.getObject();
@@ -57,12 +57,12 @@ public class RepositoryFactoryBeanTests {
@SuppressWarnings("unchecked")
@Test
public void testCreate() throws Exception {
- File work = new File("target");
+ File work = new File("build");
mockEventLogger.reinitialise();
Properties properties = new Properties();
properties.put("bundles.type", "external");
- properties.put("bundles.searchPattern", "target/*.jar");
+ properties.put("bundles.searchPattern", "build/*.jar");
properties.put("chain", "bundles");
RepositoryFactory factory = createMock(RepositoryFactory.class);
@@ -81,7 +81,7 @@ public class RepositoryFactoryBeanTests {
mockEventLogger.reinitialise();
Properties properties = new Properties();
RepositoryFactory factory = createMock(RepositoryFactory.class);
- File work = new File("target");
+ File work = new File("build");
RepositoryFactoryBean bean = new RepositoryFactoryBean(properties, mockEventLogger, factory, work, Collections.<ArtifactBridge>emptySet(), null);
assertTrue(bean.isSingleton());
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
index 251b1ad9..e6f5bf42 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
@@ -37,8 +37,8 @@ public class StandardWorkAreaTests {
@Before
public void before() {
- FileSystemUtils.deleteRecursively(new File("./target/work", WORK_DIR_NAME));
- FileSystemUtils.deleteRecursively(new File("./target/work", KERNEL_WORK_DIR_NAME));
+ FileSystemUtils.deleteRecursively(new File("./build/work", WORK_DIR_NAME));
+ FileSystemUtils.deleteRecursively(new File("./build/work", KERNEL_WORK_DIR_NAME));
}
@Test
@@ -46,27 +46,27 @@ public class StandardWorkAreaTests {
StubBundle bundle = new StubBundle(WORK_DIR_NAME, Version.emptyVersion);
- StandardWorkArea manager = new StandardWorkArea(new File("./target/work"), bundle);
+ StandardWorkArea manager = new StandardWorkArea(new File("./build/work"), bundle);
PathReference workDir = manager.getWorkDirectory();
assertNotNull(workDir);
assertTrue("work dir does not exist", workDir.exists());
assertTrue(workDir.isDirectory());
- assertTrue(new File("./target/work", WORK_DIR_NAME + "_" + Version.emptyVersion).exists());
+ assertTrue(new File("./build/work", WORK_DIR_NAME + "_" + Version.emptyVersion).exists());
}
@Test
public void kernelWorkDirectory() {
StubBundle bundle = new StubBundle(KERNEL_BSN, Version.emptyVersion);
- StandardWorkArea manager = new StandardWorkArea(new File("./target/work"), bundle);
+ StandardWorkArea manager = new StandardWorkArea(new File("./build/work"), bundle);
PathReference workDir = manager.getWorkDirectory();
assertNotNull(workDir);
assertTrue("work dir does not exist", workDir.exists());
assertTrue(workDir.isDirectory());
- assertTrue(new File("./target/work", KERNEL_WORK_DIR_NAME).exists());
+ assertTrue(new File("./build/work", KERNEL_WORK_DIR_NAME).exists());
}
}
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
index 8ee94951..fafb7ff2 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
@@ -29,7 +29,7 @@ public class WorkAreaServiceFactoryTests {
@Test
public void testCreate() {
- File work = new File("target");
+ File work = new File("build");
WorkAreaServiceFactory factory = new WorkAreaServiceFactory(work);
StubBundle bundle = new StubBundle("foo", new Version("1.0.0"));
diff --git a/org.eclipse.virgo.kernel.services/template.mf b/org.eclipse.virgo.kernel.services/template.mf
index 4cca3ea8..6588fe53 100644
--- a/org.eclipse.virgo.kernel.services/template.mf
+++ b/org.eclipse.virgo.kernel.services/template.mf
@@ -7,15 +7,15 @@ Excluded-Exports:
*.internal.*
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
javax.management.*;version="0",
javax.xml.*;version="0",
org.xml.*;version="0",

Back to the top