Fixes the clean-integration target to handle merged ivy-cache and integration repo
diff --git a/build.properties b/build.properties
index 46bff5f..e618211 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,8 @@
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache.dir=${basedir}/../ivy-cache
-integration.repo.dir=${basedir}/../integration-repo
+integration.repo.dir=${basedir}/../integration-repo
+project.organisation=org.eclipse.virgo.build
findbugs.enforce=true
clover.enforce=true
clover.coverage=85%
diff --git a/common/common.xml b/common/common.xml
index a518849..d1f61e6 100644
--- a/common/common.xml
+++ b/common/common.xml
@@ -43,7 +43,14 @@
</not>
</condition>
</fail>
- <delete quiet="true" dir="${integration.repo.dir}"/>
+ <fail message="The 'project.organisation' property must be set on this project.">
+ <condition>
+ <not>
+ <isset property="project.organisation"/>
+ </not>
+ </condition>
+ </fail>
+ <delete dir="${integration.repo.dir}/${project.organisation}"/>
</target>
<target name="clean-ivy" description="Removes the ivy cache directory.">
diff --git a/multi-bundle/common.xml b/multi-bundle/common.xml
index 6803fa9..e48fee8 100644
--- a/multi-bundle/common.xml
+++ b/multi-bundle/common.xml
@@ -99,8 +99,7 @@
<all-bundles target="clean"/>
</target>
- <target name="clean-integration"
- description="Removes the integration repository directory.">
+ <target name="clean-integration" description="Removes the integration repository directory.">
<fail message="The 'integration.repo.dir' property must be set on this project.">
<condition>
<not>
@@ -108,7 +107,14 @@
</not>
</condition>
</fail>
- <delete quiet="true" dir="${integration.repo.dir}"/>
+ <fail message="The 'project.organisation' property must be set on this project.">
+ <condition>
+ <not>
+ <isset property="project.organisation"/>
+ </not>
+ </condition>
+ </fail>
+ <delete dir="${integration.repo.dir}/${project.organisation}"/>
</target>
<target name="clean-ivy" depends="ivy.init"
