Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-05-27 16:37:26 -0400
committerBorislav Kapukaranov2012-05-27 16:37:26 -0400
commitfdd620c8cf548a7eafdf0f5e03a9e71e15bdb35e (patch)
tree81700becc0e90a83ccdcc257874af95c91807bed
parente9e11a4f6861d25946a77f87c7289e66c415607b (diff)
downloadorg.eclipse.virgo.kernel-fdd620c8cf548a7eafdf0f5e03a9e71e15bdb35e.tar.gz
org.eclipse.virgo.kernel-fdd620c8cf548a7eafdf0f5e03a9e71e15bdb35e.tar.xz
org.eclipse.virgo.kernel-fdd620c8cf548a7eafdf0f5e03a9e71e15bdb35e.zip
380765 - Adopts a shared ivy-cache and integration repo directories
-rw-r--r--build.properties5
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.artifact/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/ivy.xml4
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.model/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgi/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.services/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.shell/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.smoketest/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.stubs/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregion/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel/ivy.xml2
-rw-r--r--org.eclipse.virgo.management.fragment/ivy.xml2
21 files changed, 24 insertions, 23 deletions
diff --git a/build.properties b/build.properties
index 00fe333f..cf81315b 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,9 @@
version=3.5.0
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
-ivy.cache.dir=${basedir}/../ivy-cache
-integration.repo.dir=${basedir}/../integration-repo
+ivy.cache.dir=${user.home}/ivy/ivy-cache
+integration.repo.dir=${ivy.cache.dir}/repository
+project.organisation=org.eclipse.virgo.kernel
findbugs.enforce=true
clover.enforce=true
clover.coverage=0%
diff --git a/org.eclipse.virgo.kernel.agent.dm/ivy.xml b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
index d2a4c59e..fab350db 100644
--- a/org.eclipse.virgo.kernel.agent.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
+ <info module='${ant.project.name}' organisation='${project.organisation}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.artifact/ivy.xml b/org.eclipse.virgo.kernel.artifact/ivy.xml
index 44b08d03..ca1c350a 100644
--- a/org.eclipse.virgo.kernel.artifact/ivy.xml
+++ b/org.eclipse.virgo.kernel.artifact/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
+ <info module='${ant.project.name}' organisation='${project.organisation}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
index 2b688293..4ac3b5c7 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
+ <info organisation="${project.organisation}" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/ivy.xml b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
index 483fb340..b46d987e 100644
--- a/org.eclipse.virgo.kernel.deployer.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
index 7ddf0014..d29bc850 100644
--- a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer/ivy.xml b/org.eclipse.virgo.kernel.deployer/ivy.xml
index 760a8a93..6dbfccc5 100644
--- a/org.eclipse.virgo.kernel.deployer/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.dmfragment/ivy.xml b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
index db53f4be..a01fb169 100644
--- a/org.eclipse.virgo.kernel.dmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -24,7 +24,7 @@
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="${org.eclipse.virgo.nano}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="aspects, compile->runtime"/>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
index 9ae1bcb5..4a348c51 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.model/ivy.xml b/org.eclipse.virgo.kernel.model/ivy.xml
index 7c3c5a76..e84a6b2c 100644
--- a/org.eclipse.virgo.kernel.model/ivy.xml
+++ b/org.eclipse.virgo.kernel.model/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module="${ant.project.name}" organisation="org.eclipse.virgo.kernel"/>
+ <info module="${ant.project.name}" organisation="${project.organisation}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.osgi/ivy.xml b/org.eclipse.virgo.kernel.osgi/ivy.xml
index 6e3f561f..b51d2346 100644
--- a/org.eclipse.virgo.kernel.osgi/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgi/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel' />
+ <info module='${ant.project.name}' organisation='${project.organisation}' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.osgicommand/ivy.xml b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
index 58fe224a..00e361d4 100644
--- a/org.eclipse.virgo.kernel.osgicommand/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
+ <info organisation='${project.organisation}' module='${ant.project.name}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.services/ivy.xml b/org.eclipse.virgo.kernel.services/ivy.xml
index f46e86ec..ae345b00 100644
--- a/org.eclipse.virgo.kernel.services/ivy.xml
+++ b/org.eclipse.virgo.kernel.services/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
+ <info organisation='${project.organisation}' module='${ant.project.name}' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.shell/ivy.xml b/org.eclipse.virgo.kernel.shell/ivy.xml
index 563eb99c..77638a26 100644
--- a/org.eclipse.virgo.kernel.shell/ivy.xml
+++ b/org.eclipse.virgo.kernel.shell/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.smoketest/ivy.xml b/org.eclipse.virgo.kernel.smoketest/ivy.xml
index ae65507b..98ca4fc4 100644
--- a/org.eclipse.virgo.kernel.smoketest/ivy.xml
+++ b/org.eclipse.virgo.kernel.smoketest/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
+ <info organisation="${project.organisation}" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml" />
diff --git a/org.eclipse.virgo.kernel.stubs/ivy.xml b/org.eclipse.virgo.kernel.stubs/ivy.xml
index 578f770d..1b85bf6a 100644
--- a/org.eclipse.virgo.kernel.stubs/ivy.xml
+++ b/org.eclipse.virgo.kernel.stubs/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 275138b4..9e59bf55 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.userregion/ivy.xml b/org.eclipse.virgo.kernel.userregion/ivy.xml
index a9653b4c..03c87f7b 100644
--- a/org.eclipse.virgo.kernel.userregion/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregion/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
+ <info organisation='${project.organisation}' module='${ant.project.name}' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
index 4e9dafb2..bc6eca52 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
+ <info organisation='${project.organisation}' module='${ant.project.name}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel/ivy.xml b/org.eclipse.virgo.kernel/ivy.xml
index 9c04258a..2a57024a 100644
--- a/org.eclipse.virgo.kernel/ivy.xml
+++ b/org.eclipse.virgo.kernel/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.management.fragment/ivy.xml b/org.eclipse.virgo.management.fragment/ivy.xml
index 8d012ad6..61cfb01e 100644
--- a/org.eclipse.virgo.management.fragment/ivy.xml
+++ b/org.eclipse.virgo.management.fragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="org.eclipse.virgo" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>

Back to the top