bug 353122: prevent Equinox being duplicated in lib and lib/kernel. Ivy <exclude> does not work properly so used <delete>.

build-kernel/build.xml

diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 1fab054..f1b8ad8 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -54,6 +54,8 @@
 
 		<ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
 		<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/lib/kernel/[artifact]-[revision].[ext]" conf="lib-kernel" type="jar"/>
+		<!-- Workaround for the issue that exclude does not work properly for Equinox in kernel-ivy.xml -->
+		<delete file="${package.output.dir}/lib/kernel/org.eclipse.osgi-${org.eclipse.osgi}.jar"/>
 		
 		<ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
 		<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/repository/ext/[artifact]-[revision].[ext]" conf="repository-ext" type="jar"/>

build-kernel/kernel-ivy.xml

diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index 0292ac2..7b21c37 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -36,7 +36,7 @@
 		<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
 		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
 		
-		
+		<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work. See build.xml for a workaround. -->
 		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
 		<exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
 		<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.extensions.equinox"/>