380765 - Merges the integration repo with the ivy-cache and adjusts the clean-integration target, required by the integration tests
diff --git a/build.properties b/build.properties
index c1535f7..cf9bac8 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,8 @@
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache.dir=${user.home}/ivy/ivy-cache
-integration.repo.dir=${basedir}/../integration-repo
+integration.repo.dir=${ivy.cache.dir}/repository
+project.organisation=org.eclipse.virgo.osgi
findbugs.enforce=true
clover.enforce=true
clover.coverage=65
diff --git a/org.eclipse.virgo.osgi.console/ivy.xml b/org.eclipse.virgo.osgi.console/ivy.xml
index 82a7cf3..2075e54 100644
--- a/org.eclipse.virgo.osgi.console/ivy.xml
+++ b/org.eclipse.virgo.osgi.console/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" 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.osgi.extensions.equinox/ivy.xml b/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
index 2be429a..86753e1 100644
--- a/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
+++ b/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" 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.osgi.launcher/ivy.xml b/org.eclipse.virgo.osgi.launcher/ivy.xml
index 9821b98..148adfd 100644
--- a/org.eclipse.virgo.osgi.launcher/ivy.xml
+++ b/org.eclipse.virgo.osgi.launcher/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" module="${ant.project.name}" />
+ <info organisation="${project.organisation}" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
