Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-08-23 10:32:33 +0000
committerBorislav Kapukaranov2012-08-23 10:32:33 +0000
commit3df05a9c26be1ce376646ba38a2e586640046041 (patch)
tree412525ccea90aabf35c8e3d295c8a897ba918a82 /org.eclipse.virgo.kernel.deployer.test/src/test
parentead9f02ea9eca7992758fb1cddccf13a30078cd1 (diff)
downloadorg.eclipse.virgo.kernel-3df05a9c26be1ce376646ba38a2e586640046041.tar.gz
org.eclipse.virgo.kernel-3df05a9c26be1ce376646ba38a2e586640046041.tar.xz
org.eclipse.virgo.kernel-3df05a9c26be1ce376646ba38a2e586640046041.zip
387886 - Creates a common virgo-build-cache
Diffstat (limited to 'org.eclipse.virgo.kernel.deployer.test/src/test')
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties4
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
index a1d46afe..4fa31f47 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
@@ -43,7 +43,7 @@ public class CommonsDbcpTests extends AbstractDeployerIntegrationTest {
@Test
public void testCommonsDbcpClassLoading() throws Exception {
- this.deployer.deploy(new File(System.getProperty("user.home") + "/ivy/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar").toURI());
+ this.deployer.deploy(new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar").toURI());
this.deployer.deploy(new File("src/test/resources/com.springsource.platform.test.commons-dbcp.jar").toURI());
ApplicationContextUtils.assertApplicationContextContainsExpectedBeanDefinitions(ApplicationContextUtils.getApplicationContext(this.context, "com.springsource.server.test.commons-dbcp"), "dataSourceTest");
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
index 15bd92d1..0686df42 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.repository.properties
@@ -2,10 +2,10 @@ bundles.type=external
bundles.searchPattern=../{bundle}/target/classes
ivy-cache-bundles.type=external
-ivy-cache-bundles.searchPattern=${user.home}/ivy/ivy-cache/repository/{org}/{name}/{version}/{bundle}.jar
+ivy-cache-bundles.searchPattern=${user.home}/virgo-build-cache/ivy-cache/repository/{org}/{name}/{version}/{bundle}.jar
ivy-cache-libraries.type=external
-ivy-cache-libraries.searchPattern=${user.home}/ivy/ivy-cache/repository/{org}/{name}/{version}/{library}.libd
+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

Back to the top