diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
--- a/.gitmodules
+++ /dev/null
diff --git a/build-packaging/build.xml b/build-packaging/build.xml
deleted file mode 100644
index 6950e7e..0000000
--- a/build-packaging/build.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-packaging" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <path id="bundles">
-    </path>
-
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	
-    <property name="javaprofile.location" value="${basedir}/nano/configuration/java6-server.profile"/>
-     
-    <import file="${basedir}/sign.xml"/>
-    <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
-    <import file="${basedir}/nano/build-nano.xml"/>
-    <import file="${basedir}/kernel/build-kernel.xml"/>
-    <import file="${basedir}/tomcat-server/build-tomcat-server.xml"/>
-    <import file="${basedir}/jetty-server/build-jetty-server.xml"/>
-    
-    <property name="nano.target.dir" value="${target.dir}/nano"/>
-    <property name="kernel.target.dir" value="${target.dir}/kernel"/>
-    <property name="tomcat-server.target.dir" value="${target.dir}/tomcat-server"/>
-    <property name="jetty-server.target.dir" value="${target.dir}/jetty-server"/>
-	
-    <target name="precommit" depends="clean, clean-integration, test, findbugs, package, smoke-test"
-    description="Performs a CI server-like build, should be run prior to performing a Git push"/>
-    
-    <target name="package" depends="ivy.init, fetch-unzipped-virgo-build-tools">
-        <antcall target="package-bundles-and-features"/>
-    	<antcall target="package-resources-and-products"/>
-        <antcall target="package-distros"/>
-
-        <zip destfile="${updatesite.output.file}" update="yes">
-			<zipfileset dir="${p2.repository.dir}"/>
-		</zip>
-
-    	<antcall target="clean-up"/>
-        <delete dir="${tools.dir}" quiet="true"/>
-    </target>
-    
-    <target name="package-signed" depends="ivy.init, fetch-unzipped-virgo-build-tools">
-        <antcall target="package-bundles-and-features"/>
-    	<!-- additional signing steps start -->
-        <antcall target="sign-updatesite"/>
-        <antcall target="republish-bundles-and-features"/>
-    	<!-- additional signing steps end -->
-        <antcall target="package-resources-and-products"/>
-        <antcall target="package-distros"/>
-
-        <zip destfile="${updatesite.output.file}" update="yes">
-			<zipfileset dir="${p2.repository.dir}"/>
-		</zip>
-        
-        <antcall target="clean-up"/>
-        <delete dir="${tools.dir}" quiet="true"/>
-    </target>
-
-    <target name="package-bundles-and-features">	
-        <delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-
-    	<antcall target="nano.prepare-bundles-and-features"/>
-    	<antcall target="nano.publish-bundles-and-features"/>
-        <antcall target="kernel.prepare-bundles-and-features"/>
-        <antcall target="kernel.publish-bundles-and-features"/>
-        <antcall target="vjs.prepare-bundles-and-features"/>
-        <antcall target="vjs.publish-bundles-and-features"/>
-        <antcall target="vts.prepare-bundles-and-features"/>
-        <antcall target="vts.publish-bundles-and-features"/>
-
-        <zip destfile="${updatesite.output.file}" update="yes">
-			<zipfileset dir="${p2.repository.dir}"/>
-		</zip>
-    </target>
-
-	<target name="package-resources-and-products">	
-        <delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-
-        <antcall target="nano.package-resources-and-products"/>
-        <antcall target="kernel.package-resources-and-products"/>
-		<antcall target="vjs.package-resources-and-products"/>
-        <antcall target="vts.package-resources-and-products"/>
-    </target>
-    
-    <target name="package-distros">
-        <antcall target="nano.package-distros"/>
-        <antcall target="kernel.package-distro"/>
-        <antcall target="vjs.package-distro"/>
-        <antcall target="vts.package-distro"/>
-    </target>
-
-    <target name="clean-up">
-        <antcall target="nano.clean-up"/>
-        <antcall target="kernel.clean-up"/>
-        <antcall target="vjs.clean-up"/>
-        <antcall target="vts.clean-up"/>
-    </target>
-    
-    <target name="smoke-test">
-        <antcall target="smoke-test-nano"/>
-        <antcall target="smoke-test-kernel"/>
-        <antcall target="smoke-test-jetty-server"/>
-        <antcall target="smoke-test-tomcat-server"/>
-    </target>
-    
-    <property name="nano.package.file" value="${artifacts.dir}/virgo-nano-${bundle.version}.zip"/>
-    <property name="nano.full.package.file" value="${artifacts.dir}/virgo-nano-full-${bundle.version}.zip"/>
-    <property name="nano.rap.package.file" value="${artifacts.dir}/virgo-nano-rap-${bundle.version}.zip"/>
-    <property name="kernel.package.file" value="${artifacts.dir}/virgo-kernel-${bundle.version}.zip"/>
-    <property name="tomcat-server.package.file" value="${artifacts.dir}/virgo-tomcat-server-${bundle.version}.zip"/>
-    <property name="jetty-server.package.file" value="${artifacts.dir}/virgo-jetty-server-${bundle.version}.zip"/>
-    
-    <target name="publish-packages-build">
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${nano.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${nano.full.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${nano.rap.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${kernel.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${jetty-server.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-build">
-            <param name="package.file" value="${tomcat-server.package.file}"/>
-        </antcall>
-    </target>
-    
-    <target name="publish-packages-download">
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${nano.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${nano.full.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${nano.rap.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${kernel.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${jetty-server.package.file}"/>
-        </antcall>
-        <antcall target="publish-package-download">
-            <param name="package.file" value="${tomcat-server.package.file}"/>
-        </antcall>
-    </target>
-    
-    <target name="publish-updatesite-download">
-        <fail message="The 'project.name' property must be set on this project.">
-            <condition>
-                <not>
-                    <isset property="project.name"/>
-                </not>
-            </condition>
-        </fail>
-        <checksum file="${updatesite.output.file}" algorithm="sha1"/>
-        <sshexec host="build.eclipse.org" 
-                username="${eclipse.committerId}" 
-                keyfile="${key.file}" 
-                passphrase="${passphrase}"
-                command="mkdir -pv /home/data/httpd/download.eclipse.org/virgo/updatesite-zipped/${bundle.version}"/>
-        <sshexec host="build.eclipse.org" 
-                username="${eclipse.committerId}" 
-                keyfile="${key.file}" 
-                passphrase="${passphrase}"
-                command="mkdir -pv /home/data/httpd/download.eclipse.org/virgo/updatesite/${bundle.version}"/>
-        <scp localFile="${updatesite.output.file}"
-                todir="${eclipse.committerId}@build.eclipse.org:/home/data/httpd/download.eclipse.org/virgo/updatesite-zipped/${bundle.version}" 
-                keyfile="${key.file}"
-                passphrase="${passphrase}" />
-        <scp localFile="${updatesite.output.file}.sha1"
-                todir="${eclipse.committerId}@build.eclipse.org:/home/data/httpd/download.eclipse.org/virgo/updatesite-zipped/${bundle.version}" 
-                keyfile="${key.file}"
-                passphrase="${passphrase}" />
-        <sshexec host="build.eclipse.org" 
-                username="${eclipse.committerId}" 
-                keyfile="${key.file}" 
-                passphrase="${passphrase}"
-                command="unzip /home/data/httpd/download.eclipse.org/virgo/updatesite-zipped/${bundle.version}/${updatesite.file.name} -d /home/data/httpd/download.eclipse.org/virgo/updatesite/${bundle.version}"/>
-    </target>
-
-	<!-- used only for signing -->
-    <target name="sign-updatesite">	
-        <!-- clean up the published xmls and zip it -->
-        <delete file="${p2.repository.dir}/content.jar"/>
-        <delete file="${p2.repository.dir}/artifacts.jar"/>
-        <delete file="${updatesite.output.file}"/>
-        <zip destfile="${updatesite.output.file}">
-			<zipfileset dir="${p2.repository.dir}"/>
-		</zip>
-        
-        <property name="stagingDirectory" value="/opt/public/download-staging.priv/rt/virgo"/>
-        <property name="stagingDirectoryOutput" value="${stagingDirectory}/signed" />
-        <property name="archiveName" value="${updatesite.file.name}"/>
-        
-        <!-- upload zipped p2 repo to sign machine -->
-        <scp localFile="${updatesite.output.file}"
-        todir="${eclipse.committerId}@build.eclipse.org:${stagingDirectory}" 
-        keyfile="${key.file}"
-        passphrase="${passphrase}" />
-        
-        <!-- execute sign -->
-        <sshexec host="build.eclipse.org" 
-        username="${eclipse.committerId}" 
-        keyfile="${key.file}" 
-        passphrase="${passphrase}"
-        command="/usr/bin/sign ${stagingDirectory}/${archiveName} nomail ${stagingDirectoryOutput}"/>
-        
-        <!-- wait for sign to complete -->
-        <antcall target="waitForSign">
-            <param name="stagingDirectory" value="${stagingDirectory}"/>
-            <param name="archiveName" value="${archiveName}"/>
-        </antcall>
-        <sleep seconds="30"/>
-        
-        <!-- pull signed p2 repo -->
-        <scp remoteFile="${eclipse.committerId}@build.eclipse.org:${stagingDirectoryOutput}/${archiveName}"
-        localTodir="${target.dir}"
-        keyfile="${key.file}"
-        passphrase="${passphrase}" />
-        
-        <!-- backup and replace original p2 repo -->
-        <exec executable="mv">
-            <arg value="${p2.repository.dir}"/>
-            <arg value="${p2.repository.dir}.backup"/>
-        </exec>
-        <unzip src="${target.dir}/${archiveName}" dest="${p2.repository.dir}"/>
-        
-        <!-- clean up sign machine -->
-        <sshexec host="build.eclipse.org" 
-        username="${eclipse.committerId}" 
-        keyfile="${key.file}" 
-        passphrase="${passphrase}"
-        command="rm -r ${stagingDirectoryOutput}"/>
-        
-        <sshexec host="build.eclipse.org" 
-        username="${eclipse.committerId}" 
-        keyfile="${key.file}" 
-        passphrase="${passphrase}"
-        command="rm ${stagingDirectory}/${archiveName}"/>
-    </target> 
-
-	<!-- used only for signing -->
-    <target name="republish-bundles-and-features">	
-        <delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-        
-        <antcall target="p2.publish-bundles-features">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${p2.repository.dir}"/>
-        </antcall>
-        
-        <zip destfile="${updatesite.output.file}" update="yes">
-			<zipfileset dir="${p2.repository.dir}"/>
-		</zip>
-    </target>
-
-</project>
diff --git a/build-packaging/kernel/build-kernel.xml b/build-packaging/kernel/build-kernel.xml
deleted file mode 100644
index a62cb93..0000000
--- a/build-packaging/kernel/build-kernel.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-kernel" xmlns:ivy="antlib:org.apache.ivy.ant">
-
-	<path id="bundles">
-	</path>
-
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
-    <property name="kernel.basedir" value="${basedir}/kernel"/>
-
-	<target name="kernel.package-resources-and-products" depends="ivy.init">
-		<!-- prepare Kernel's resources - configurations and bundles that are not installed initially -->
-		<property name="kernel.resources" value="${kernel.target.dir}/kernel_resources"/>
-
-		<ivy:resolve resolveId="copy.path" file="${kernel.basedir}/repository-ext-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/repository/ext/[artifact]_[revision].[ext]" conf="repository-ext" type="jar"/>
-		
-		<ivy:resolve resolveId="copy.path" file="${kernel.basedir}/pickup-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/pickup/[artifact]_[revision].[ext]" type="plan" conf="pickup-plan"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/repository/ext/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup-plan"/>
-
-		<mkdir dir="${kernel.resources}/configuration"/>
-
-		<copy todir="${kernel.resources}/configuration" failonerror="false">
-			<fileset dir="${kernel.basedir}/configuration" excludes="org.eclipse.virgo.kernel.userregion.properties"/>
-		</copy>
-
-		<copy todir="${kernel.resources}" failonerror="false">
-			<fileset dir="${kernel.basedir}/resources"/>
-		</copy>
-
-		<copy todir="${kernel.resources}/repository/ext" failonerror="false">
-			<fileset dir="${kernel.basedir}/repository/ext"/>
-		</copy>
-
-		<copy todir="${kernel.resources}/repository/ext" failonerror="false">
-			<fileset dir="${kernel.target.dir}/assembly/plugins">
-				<include name="org.eclipse.virgo.kernel.agent.dm_*.jar"/>
-			</fileset>
-		</copy>
-		<!-- Prepare these two as part of the resources. They need a later installation, not with the other initial kernel region bundles. -->
-		<copy todir="${kernel.resources}/plugins" failonerror="false">
-			<fileset dir="${kernel.target.dir}/assembly/plugins">
-				<include name="org.eclipse.virgo.kernel.userregion_*.jar"/>
-				<include name="org.eclipse.virgo.shell.command_*.jar"/>
-				<!--include name="org.eclipse.virgo.kernel.osgicommand_*.jar"/-->
-			</fileset>
-		</copy>
-
-		<move todir="${kernel.resources}/repository/ext" failonerror="false">
-			<fileset dir="${kernel.target.dir}/assembly/plugins">
-				<include name="org.eclipse.virgo.kernel.dmfragment_*.jar"/>
-				<include name="org.eclipse.virgo.kernel.deployer.dm_*.jar"/>
-			</fileset>
-		</move>
-
-		<mkdir dir="${kernel.resources}/repository/usr"/>
-
-		<property name="kernel.resources.location" value="${kernel.target.dir}/kernel_resources_zipped"/>
-		<zip destfile="${kernel.resources.location}/binary/kernel_resources">
-			<zipfileset dir="${kernel.resources}"/>
-		</zip>
-		<delete dir="${kernel.resources}" quiet="true"/>
-
-		<!-- Assemble and prepare for publishing the Kernel's specific resources -->
-		<property name="specific.resources" value="${kernel.target.dir}/specific_resources"/>
-		<mkdir dir="${specific.resources}/lib"/>
-		<mkdir dir="${specific.resources}/configuration"/>
-
-		<copy todir="${specific.resources}/configuration" failonerror="false">
-			<fileset dir="${kernel.basedir}/configuration">
-				<include name="org.eclipse.virgo.kernel.userregion.properties"/>
-			</fileset>
-			<filterset>
-				<filter token="ASPECTJ.VERSION" value="${org.aspectj}"/>
-				<filter token="OSGI.SERVICES.VERSION" value="${org.eclipse.osgi.services}"/>
-				<filter token="EQUINOX.EVENT.VERSION" value="${org.eclipse.equinox.event}"/>
-				<filter token="EQUINOX.CONFIGADMIN.VERSION" value="${org.eclipse.equinox.cm}"/>
-				<filter token="EQUINOX.DS.VERSION" value="${org.eclipse.equinox.ds}"/>
-				<filter token="EQUINOX.UTIL.VERSION" value="${org.eclipse.equinox.util}"/>
-				<filter token="OSGI.ENTERPRISE.VERSION" value="${org.osgi.enterprise}"/>
-				<filter token="GEMINI.MANAGEMENT.VERSION" value="${org.eclipse.gemini.management}"/>
-				<filter token="KERNEL.VERSION" value="${org.eclipse.virgo.kernel}"/>
-				<filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}"/>
-				<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
-				<filter token="SLF4J.VERSION" value="${org.slf4j.api}"/>
-				<filter token="SPRING.DM.VERSION" value="${org.eclipse.gemini.blueprint}"/>	
-				<filter token="SPRING.VERSION" value="${org.springframework}"/>
-				<filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}"/>
-				<filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}"/>
-				<filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}"/>
-				<filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}"/>
-				<filter token="MINA.CORE.VERSION" value="${org.apache.mina.core}"/>
-				<filter token="SSHD.CORE.VERSION" value="${org.apache.sshd.core}"/>
-				<filter token="EQUINOX.CONSOLE.VERSION" value="${org.eclipse.equinox.console}"/>
-                <filter token="EQUINOX.CONSOLE.SSH.VERSION" value="${org.eclipse.equinox.console.ssh}"/>
-                
-			</filterset>
-		</copy>
-
-		<!-- get and reconfigure the serviceability.xml and .version -->
-		<unzip src="${p2.repository.dir}/binary/nano_specific_resources_1.0.0" dest="${specific.resources}">
-			<globmapper from="nano_specific_resources/*" to="*"/>
-		</unzip>
-		<echo file="${specific.resources}/lib/.version" append="true" message="virgo.kernel.version=${bundle.version}&#xa;"/>
-
-		<replaceregexp match="virgo-nano" replace="virgo-kernel" flags="g" file="${specific.resources}/configuration/serviceability.xml"/>
-
-		<property name="specific.resources.location" value="${kernel.target.dir}/specific_resources_zipped"/>
-		<zip destfile="${specific.resources.location}/binary/kernel_specific_resources">
-			<zipfileset dir="${specific.resources}"/>
-		</zip>
-		<delete dir="${specific.resources}" quiet="true"/>
-
-		<!-- Publish -->
-		<mkdir dir="${artifacts.dir}"/>
-		<property name="p2.products.location" value="${kernel.basedir}/publish_resources/products"/>
-
-		<antcall target="p2.publish-binary">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="source" value="${kernel.resources.location}"/>
-		</antcall>
-		<echo message="Published the kernel resources to ${p2.repository.dir}."/>
-
-		<antcall target="p2.publish-binary">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="source" value="${specific.resources.location}"/>
-		</antcall>
-		<echo message="Published the kernel specific resources to ${p2.repository.dir}."/>
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="product.file.location" value="${p2.products.location}/kernel-base/kernel-base.product"/>
-		</antcall>
-		<echo message="Published kernel base product to ${p2.repository.dir}."/>
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="product.file.location" value="${p2.products.location}/kernel/kernel.product"/>
-		</antcall>
-		<echo message="Published kernel product to ${p2.repository.dir}."/>
-	</target>
-    
-    <target name="kernel.prepare-bundles-and-features" depends="ivy.init">
-		<!-- Assemble the kernel bundles for publishing -->
-		<ivy:resolve resolveId="copy.path" file="${kernel.basedir}/plugins-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${kernel.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="plugins" type="jar"/>
-		<!-- Prepare the features for publishing -->
-		<copy todir="${kernel.target.dir}/assembly/features" failonerror="false">
-			<fileset dir="${kernel.basedir}/publish_resources/features" excludes="keystore"/>
-			<filterset>
-				<filter token="REGION.VERSION" value="${org.eclipse.equinox.region}"/>
-				<filter token="KERNEL.VERSION" value="${org.eclipse.virgo.kernel}"/>
-				<filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
-				<filter token="SPRING.VERSION" value="${org.springframework}"/>
-				<filter token="JAVAX.SERVLET.VERSION" value="${javax.servlet}"/>
-				<filter token="EQUINOX.HTTP.VERSION" value="${org.eclipse.equinox.http}"/>
-				<filter token="OSGI.ENTERPRISE.VERSION" value="${org.osgi.enterprise}"/>
-				<filter token="GEMINI.MANAGEMENT.VERSION" value="${org.eclipse.gemini.management}"/>
-			</filterset>
-		</copy>
-    </target>
-    
-    <target name="kernel.publish-bundles-and-features" depends="ivy.init">
-        <antcall target="p2.generate-inf">
-			<param name="source" value="${kernel.target.dir}/assembly/features"/>
-		</antcall>
-        
-        <!-- Publish -->
-		<mkdir dir="${artifacts.dir}"/>
-		<antcall target="p2.publish-bundles-features">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="source" value="${kernel.target.dir}/assembly"/>
-		</antcall>
-		<echo message="Published bundles and features to ${p2.repository.dir}."/>
-	</target>
-    
-    <target name="kernel.clean-up" depends="ivy.init">
-        <delete dir="${kernel.resources.location}" quiet="true"/>
-		<delete dir="${specific.resources.location}" quiet="true"/>
-		<delete dir="${kernel.target.dir}/assembly" quiet="true"/>
-        <delete dir="${kernel.target.dir}" quiet="true"/>
-	</target>
-    
-    <target name="kernel.package-distro" depends="ivy.init">
-        <delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-        <property name="vk.package.dir" value="${package.dir}/VK"/>
-        
-		<antcall target="p2.install-virgo-product">
-			<param name="repository" value="${p2.repository.dir}"/>
-			<param name="destination" value="${vk.package.dir}/virgo-kernel-${bundle.version}"/>
-			<param name="product.iu" value="kernel.product"/>
-		</antcall>
-		<echo message="Installed Virgo Kernel for distribution purposes."/>
-        
-		<delete dir="${vk.package.dir}/virgo-kernel-${bundle.version}/Eclipse.app" quiet="true"/>
-        
-		<zip destfile="${artifacts.dir}/virgo-kernel-${bundle.version}.zip">
-			<zipfileset dir="${vk.package.dir}" includes="virgo-kernel-${bundle.version}/bin/*.sh" filemode="755"/>
-			<zipfileset dir="${vk.package.dir}" includes="virgo-kernel-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
-			<zipfileset dir="${vk.package.dir}">
-				<exclude name="virgo-kernel-${bundle.version}/bin/*.sh"/>
-				<exclude name="virgo-kernel-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</zipfileset>
-		</zip>
-	</target>
-	
-	<target name="smoke-test-kernel" description="Runs a smoke test on the kernel packaged build">
-		<path id="smoke.test.bundles">
-			<pathelement location="${kernel.basedir}/org.eclipse.virgo.kernel.smoketest" />
-		</path>
-		<antcall target="test.pre"/>
-		<all-bundles target="test-package" buildpathRef="smoke.test.bundles">
-			<property name="package.output.file" value="${artifacts.dir}/virgo-kernel-${bundle.version}.zip"/>
-			<property name="package.basename" value="virgo-kernel-${bundle.version}"/>
-		</all-bundles>
-		<antcall target="test.post"/>
-	</target>
-
-</project>
diff --git a/build-packaging/kernel/pickup-ivy.xml b/build-packaging/kernel/pickup-ivy.xml
deleted file mode 100644
index 4a90447..0000000
--- a/build-packaging/kernel/pickup-ivy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-	
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-	
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>	
-		<conf name="pickup" visibility="public" description="Dependencies to be packaged in pickup"/>
-		<conf name="pickup-plan" visibility="public" description="Plans to be packaged in pickup, with dependencies to be packaged in repostiory/bundles/ext"/>
-	</configurations>
-	
-	<dependencies>	    
-		<dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.console" rev="${org.eclipse.virgo.kernel}" conf="pickup->runtime"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/build-packaging/kernel/plugins-ivy.xml b/build-packaging/kernel/plugins-ivy.xml
deleted file mode 100644
index d4ea946..0000000
--- a/build-packaging/kernel/plugins-ivy.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="${project.organisation}" module="${ant.project.name}" />
-
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="plugins" visibility="public" description="Dependencies to be packaged in plugins"/>
-	</configurations>
-
-	<dependencies>
-		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}" conf="plugins->runtime"/>
-        <!--dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="${org.eclipse.virgo.kernel}" conf="plugins->runtime"/-->
-        <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.shell.command" rev="${org.eclipse.virgo.kernel}" conf="plugins->runtime"/>
-		<dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.fragment" rev="${org.eclipse.virgo.kernel}" conf="plugins->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="plugins->runtime"/>
-		<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.http" rev="${org.eclipse.equinox.http}" conf="plugins->runtime" />
-		<dependency org="org.eclipse.virgo.mirrored" name='org.eclipse.equinox.region' rev='${org.eclipse.equinox.region}' conf="plugins->runtime" />
-		<dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="plugins->runtime" />
-		
-		<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work. 
-		This is due to the transitive dependency from org.eclipse.virgo.test.equinox on org.eclipse.osgi
-		See build.xml for a workaround. -->
-		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
-		<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
-		<exclude org="org.jboss.logging"/>
-		<exclude org="org.jboss.util"/>
-		<exclude org="org.jboss.vfs"/>
-		<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
-		<exclude org="org.springframework" module="org.springframework.context.support"/>
-
-		<override org="org.aspectj" rev="${org.aspectj}"/>
-		<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
-		<override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
-		<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
-		<override org="org.springframework" rev="${org.springframework}"/>
-	</dependencies>
-
-</ivy-module>
-
diff --git a/build-packaging/kernel/repository-ext-ivy.xml b/build-packaging/kernel/repository-ext-ivy.xml
deleted file mode 100644
index 5afea56..0000000
--- a/build-packaging/kernel/repository-ext-ivy.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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="${project.organisation}" module="${ant.project.name}" />
-
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="repository-ext" visibility="public" description="Dependencies to be packaged in repository/ext"/>
-	</configurations>
-
-	<dependencies>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.extender" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.io" rev="${org.eclipse.gemini.blueprint}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
-		
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.management" rev="${org.eclipse.gemini.management}" conf="repository-ext->runtime"/>
-		<dependency org="org.osgi" name="org.osgi.enterprise" rev="${org.osgi.enterprise}" conf="repository-ext->runtime"/>
-		<dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.fragment" rev="latest.integration" conf="repository-ext->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="${org.apache.commons.fileupload}" conf="repository-ext->runtime"/>
-		<dependency org="org.jolokia" name="org.jolokia.osgi" rev="${org.jolokia.osgi}" conf="repository-ext->runtime"/>
-		
-		<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work. 
-		This is due to the transitive dependency from org.eclipse.virgo.test.equinox on org.eclipse.osgi
-		See build.xml for a workaround. -->
-		<exclude org="org.eclipse.osgi"/>
-		<exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
-		<exclude org="org.eclipse.virgo.test" module="org.eclipse.virgo.test.launcher"/>
-		<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
-		<exclude org="org.jboss.logging"/>
-		<exclude org="org.jboss.util"/>
-		<exclude org="org.jboss.vfs"/>
-		<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
-		<exclude org="org.springframework" module="org.springframework.context.support"/>
-				
-		<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
-		<override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
-		<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
-		<override org="org.springframework" rev="${org.springframework}"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/build-packaging/kernel/test-package.xml b/build-packaging/kernel/test-package.xml
deleted file mode 100644
index 366870f..0000000
--- a/build-packaging/kernel/test-package.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="test-package">
-
-	<property name="test.staging.dir" value="${target.dir}/test-expanded"/>
-	<property name="package.basename" value="${package.basename}"/>
-	<property name="test.package.dir" value="${test.staging.dir}/${package.basename}"/>
-
-	<target name="test-package"
-			description="Runs a test on the packaged build">
-		<antcall target="unzip.package"/>
-		<antcall target="test.do"/>
-    </target>
-
-	<target name="unzip.package">
-		<delete dir="${test.staging.dir}" quiet="true"/>
-		<mkdir dir="${test.staging.dir}"/>
-		<unzip src="${package.output.file}" dest="${test.staging.dir}"/>
-		<chmod perm="755">
-			<fileset dir="${test.package.dir}/bin">
-				<include name="*.sh"/>
-			</fileset>
-		</chmod>
-		<chmod perm="600">
-			<fileset dir="${test.package.dir}/configuration">
-				<include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</fileset>
-		</chmod>
-	</target>
-
-</project>
diff --git a/build-packaging/nano/build-nano.xml b/build-packaging/nano/build-nano.xml
deleted file mode 100644
index 51a94b9..0000000
--- a/build-packaging/nano/build-nano.xml
+++ /dev/null
@@ -1,571 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-nano" xmlns:ivy="antlib:org.apache.ivy.ant">
-	<path id="bundles">
-	</path>
-
-	<property file="${basedir}/../build.properties" />
-	<property file="${basedir}/../build.versions" />
-	<import file="${basedir}/../virgo-build/multi-bundle/default.xml" />
-	<property name="nano-full-package" value="virgo-nano-full" />
-	<property name="nano-package" value="virgo-nano" />
-	<property name="nano-rap-package" value="virgo-nano-rap" />
-	<property name="nano.basedir" value="${basedir}/nano" />
-
-	<!-- package-bundles-and-features -->
-	<target name="nano.prepare-bundles-and-features">
-		<!-- Copy the nano kernel artifacts to a prepared for publishing location - a p2 repo will be built around them -->
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/nano-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="jar" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="wab" />
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/p2runtime-ivy.xml" transitive="true" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="p2-runtime" type="jar" />
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/gemini-web-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar" />
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/enterprise-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="enterprise" type="jar" />
-
-		<!-- Prepare the features for publishing -->
-		<copy todir="${nano.target.dir}/assembly/features" failonerror="false">
-			<fileset dir="${nano.basedir}/publish_resources/features" excludes="keystore" />
-			<filterset>
-				<filter token="OSGI" value="${org.eclipse.osgi}" />
-				<filter token="ASPECTJ" value="${org.aspectj}" />
-				<filter token="JAVAX.ACTIVATION" value="${javax.activation}" />
-				<filter token="JAVAX.TRANSACTION" value="${javax.transaction}" />
-				<filter token="JAVAX.ANNOTATION" value="${javax.annotation}" />
-				<filter token="JAVAX.EJB" value="${javax.ejb}" />
-				<filter token="JAVAX.EL" value="${javax.el}" />
-				<filter token="JAVAX.MAIL" value="${javax.mail}" />
-				<filter token="JAVAX.PERSISTENCE" value="${javax.persistence}" />
-				<filter token="JAVAX.SERVLET" value="${javax.servlet}" />
-				<filter token="JAVAX.SERVLET.JSP" value="${javax.servlet.jsp}" />
-				<filter token="JAVAX.XML.RPC" value="${javax.xml.rpc}" />
-				<filter token="JAVAX.WEBSOCKET" value="${javax.websocket}" />
-				<filter token="CATALINA" value="${org.apache.catalina}" />
-				<filter token="CATALINA.HA" value="${org.apache.catalina.ha}" />
-				<filter token="JASPER.VERSION" value="${org.apache.jasper}" />
-				<filter token="TRIBES.VERSION" value="${org.apache.catalina.tribes}" />
-				<filter token="COYOTE" value="${org.apache.coyote}" />
-				<filter token="EL" value="${org.apache.el}" />
-				<filter token="JULI.EXTRAS" value="${org.apache.juli.extras}" />
-				<filter token="TOMCAT.API" value="${org.apache.tomcat.api}" />
-				<filter token="TOMCAT.UTIL" value="${org.apache.tomcat.util}" />
-				<filter token="EQUINOX.CM" value="${org.eclipse.equinox.cm}" />
-				<filter token="EQUINOX.EVENT" value="${org.eclipse.equinox.event}" />
-				<filter token="EQUINOX.REGION" value="${org.eclipse.equinox.region}" />
-				<filter token="EQUINOX.UTIL" value="${org.eclipse.equinox.util}" />
-				<filter token="COMPILER.BATCH" value="${org.eclipse.jdt.core.compiler.batch}" />
-				<filter token="OSGI.SERVICES" value="${org.eclipse.osgi.services}" />
-				<filter token="SAT4J.CORE" value="${org.sat4j.core}" />
-				<filter token="SAT4J.PB" value="${org.sat4j.pb}" />
-				<filter token="SLF4J.API" value="${org.slf4j.api}" />
-				<filter token="SLF4J.JUL" value="${org.slf4j.jul}" />
-				<filter token="EQUINOX.CONSOLE.VERSION" value="${org.eclipse.equinox.console}" />
-				<filter token="EQUINOX.DS.VERSION" value="${org.eclipse.equinox.ds}" />
-				<filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}" />
-				<filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}" />
-				<filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}" />
-				<filter token="GEMINI.WEB" value="${org.eclipse.gemini.web}" />
-				<filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}" />
-				<filter token="MINA.CORE.VERSION" value="${org.apache.mina.core}" />
-				<filter token="NANO.VERSION" value="${org.eclipse.virgo.nano}" />
-				<filter token="WEB.VERSION" value="${org.eclipse.virgo.web}" />
-				<filter token="SPRING.DM.VERSION" value="${org.eclipse.gemini.blueprint}" />
-				<filter token="SSHD.CORE.VERSION" value="${org.apache.sshd.core}" />
-				<filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}" />
-				<filter token="KERNEL.VERSION" value="${org.eclipse.virgo.kernel}" />
-				<filter token="CONTENTTYPE.VERSION" value="${org.eclipse.core.contenttype}" />
-				<filter token="CORE.VERSION" value="${org.eclipse.core.runtime}" />
-				<filter token="CORE.NET.VERSION" value="${org.eclipse.core.net}" />
-				<filter token="ECF.FT.VERSION" value="${org.eclipse.ecf.filetransfer}" />
-				<filter token="ECF.I.VERSION" value="${org.eclipse.ecf.identity}" />
-				<filter token="ECF.P.FT.VERSION" value="${org.eclipse.ecf.provider.filetransfer}" />
-				<filter token="ECF.SSL.VERSION" value="${org.eclipse.ecf.ssl}" />
-				<filter token="ECF.VERSION" value="${org.eclipse.ecf}" />
-				<filter token="EQUINOX.APP.VERSION" value="${org.eclipse.equinox.app}" />
-				<filter token="EQUINOX.COMMON.VERSION" value="${org.eclipse.equinox.common}" />
-				<filter token="EQUINOX.CONSOLE.SSH.VERSION" value="${org.eclipse.equinox.console.ssh}" />
-				<filter token="EQUINOX.FRKA.E.VERSION" value="${org.eclipse.equinox.frameworkadmin.equinox}" />
-				<filter token="EQUINOX.FRKA.VERSION" value="${org.eclipse.equinox.frameworkadmin}" />
-				<filter token="EQUINOX.PFRCS.VERSION" value="${org.eclipse.equinox.preferences}" />
-				<filter token="EQUINOX.REGISTRY.VERSION" value="${org.eclipse.equinox.registry}" />
-				<filter token="EQUINOX.SC.M.VERSION" value="${org.eclipse.equinox.simpleconfigurator.manipulator}" />
-				<filter token="EQUINOX.SC.VERSION" value="${org.eclipse.equinox.simpleconfigurator}" />
-				<filter token="EQUINOX.SECURITY.VERSION" value="${org.eclipse.equinox.security}" />
-				<filter token="JOBS.VERSION" value="${org.eclipse.core.jobs}" />
-				<filter token="LOGBACK.CLASSIC.VERSION" value="${ch.qos.logback.classic}" />
-				<filter token="LOGBACK.CORE.VERSION" value="${ch.qos.logback.core}" />
-				<filter token="LOGBACK.SLF4J.VERSION" value="${ch.qos.logback.slf4j}" />
-				<filter token="P2.A.R.VERSION" value="${org.eclipse.equinox.p2.artifact.repository}" />
-				<filter token="P2.CONSOLE.VERSION" value="${org.eclipse.equinox.p2.console}" />
-				<filter token="P2.CORE.VERSION" value="${org.eclipse.equinox.p2.core}" />
-				<filter token="P2.DIRECTOR.VERSION" value="${org.eclipse.equinox.p2.director}" />
-				<filter token="P2.ENGINE.VERSION" value="${org.eclipse.equinox.p2.engine}" />
-				<filter token="P2.GC.VERSION" value="${org.eclipse.equinox.p2.garbagecollector}" />
-				<filter token="P2.JP.VERSION" value="${org.eclipse.equinox.p2.jarprocessor}" />
-				<filter token="P2.M.R.VERSION" value="${org.eclipse.equinox.p2.metadata.repository}" />
-				<filter token="P2.METADATA.VERSION" value="${org.eclipse.equinox.p2.metadata}" />
-				<filter token="P2.P.E.VERSION" value="${org.eclipse.equinox.p2.publisher.eclipse}" />
-				<filter token="P2.PUBLISHER.VERSION" value="${org.eclipse.equinox.p2.publisher}" />
-				<filter token="P2.REPOSITORY.VERSION" value="${org.eclipse.equinox.p2.repository}" />
-				<filter token="P2.T.E.VERSION" value="${org.eclipse.equinox.p2.touchpoint.eclipse}" />
-				<filter token="P2.T.ECF.VERSION" value="${org.eclipse.equinox.p2.transport.ecf}" />
-				<filter token="P2.T.N.VERSION" value="${org.eclipse.equinox.p2.touchpoint.natives}" />
-				<filter token="JAVASSIST" value="${javassist.feature}" />
-				<filter token="JAVAX.JMS" value="${javax.jms}" />
-				<filter token="JSTL.IMPL" value="${javax.servlet.jsp.jstl.impl}" />
-				<filter token="JSTL.API" value="${javax.servlet.jsp.jstl.api}" />
-				<filter token="JAVAX.VALIDATION" value="${javax.validation.feature}" />
-				<filter token="JAVAX.WS.RS" value="${javax.ws.rs}" />
-				<filter token="SLF4J.JCL" value="${org.slf4j.jcl}" />
-				<filter token="SLF4J.LOG4J" value="${org.slf4j.log4j}" />
-				<filter token="QUARTZ" value="${org.quartz}" />
-				<filter token="WB.COMMON" value="${org.apache.openwebbeans.ee.common}" />
-				<filter token="WB.EE" value="${org.apache.openwebbeans.ee}" />
-				<filter token="WB.EJB" value="${org.apache.openwebbeans.ejb}" />
-				<filter token="WB.IMPL" value="${org.apache.openwebbeans.impl}" />
-				<filter token="WB.SPI" value="${org.apache.openwebbeans.spi}" />
-				<filter token="WB.WEB" value="${org.apache.openwebbeans.web}" />
-				<filter token="WB.JSF" value="${org.apache.openwebbeans.jsf}" />
-				<filter token="WB.TOMCAT7" value="${org.apache.openwebbeans.tomcat7}" />
-				<filter token="COMMOMS.BEANUTILS" value="${org.apache.commons.beanutils}" />
-				<filter token="COMMONS.CLI" value="${org.apache.commons.cli}" />
-				<filter token="COMMONS.COLLECTIONS" value="${org.apache.commons.collections}" />
-				<filter token="COMMONS.DBCP" value="${org.apache.commons.dbcp}" />
-				<filter token="COMMONS.LANG" value="${org.apache.commons.lang}" />
-				<filter token="COMMONS.POOL" value="${org.apache.commons.pool}" />
-				<filter token="DERBY" value="${org.apache.derby.feature}" />
-				<filter token="BVAL" value="${org.apache.bval}" />
-				<filter token="G.CONNECTOR" value="${org.apache.geronimo.components.connector}" />
-				<filter token="G.TRANSACTIONS" value="${org.apache.geronimo.components.transaction}" />
-				<filter token="G.MANAGEMENT" value="${org.apache.geronimo.specs.j2ee.management}" />
-				<filter token="G.OSGI.LOCATOR" value="${org.apache.geronimo.specs.osgi.locator}" />
-				<filter token="G.OSGI.REGISTRY" value="${org.apache.geronimo.specs.osgi.registry}" />
-				<filter token="CDI.API" value="${cdi.api}" />
-				<filter token="OE.API" value="${org.apache.openejb.api.feature}" />
-				<filter token="OE.CORE" value="${org.apache.openejb.core.feature}" />
-				<filter token="OE.JAVAAGENT" value="${org.apache.openejb.javaagent.feature}" />
-				<filter token="OE.JEE" value="${org.apache.openejb.jee.feature}" />
-				<filter token="OE.LOADER" value="${org.apache.openejb.loader.feature}" />
-				<filter token="OE.JPA.INTEGRATION" value="${org.apache.openejb.jpa-integration.feature}" />
-				<filter token="JAVAX.WSDL" value="${javax.wsdl}" />
-				<filter token="XB.ASM" value="${org.apache.xbean.asm}" />
-				<filter token="XB.BUNDLEUTILS" value="${org.apache.xbean.bundleutils}" />
-				<filter token="XB.FINDER" value="${org.apache.xbean.finder}" />
-				<filter token="XB.NAMING" value="${org.apache.xbean.naming}" />
-				<filter token="XB.REFLECT" value="${org.apache.xbean.reflect}" />
-				<filter token="GEMINI.JPA" value="${org.eclipse.gemini.jpa}" />
-				<filter token="EL.ANTLR" value="${org.eclipse.persistence.antlr}" />
-				<filter token="EL.ASM" value="${org.eclipse.persistence.asm}" />
-				<filter token="EL.CORE" value="${org.eclipse.persistence.core}" />
-				<filter token="EL.JPA" value="${org.eclipse.persistence.jpa}" />
-				<filter token="EL.JPQL" value="${org.eclipse.persistence.jpa.jpql}" />
-				<filter token="FACES.IMPL" value="${org.glassfish.com.sun.faces}" />
-				<filter token="FACES.API" value="${org.glassfish.javax.faces}" />
-				<filter token="JAVAX.INJECT" value="${javax.inject}" />
-				<filter token="JAVAX.RESOURCE" value="${javax.resource}" />
-				<filter token="JAVAX.SECURITY.AUTH" value="${javax.security.auth.message}" />
-				<filter token="JAVAX.SECURITY.JACC" value="${javax.security.jacc}" />
-				<filter token="JOTM" value="${org.ow2.jotm.jotm-core}" />
-				<filter token="OSGI.ENTERPRISE" value="${osgi.enterprise}" />
-				<filter token="SCANNOTATION" value="${scannotation}" />
-				<filter token="JAVAX.EJB" value="${javax.ejb}" />
-				<filter token="HTTPSERVICE.VERSION" value="${org.eclipse.equinox.http}" />
-				<filter token="MNGMNT.CONSOLE.VERSION" value="${org.eclipse.virgo.kernel}" />
-				<filter token="GMNGMNT.VERSION" value="${org.eclipse.gemini.management}" />
-				<filter token="VIRGO.MNGMNT.FR.VERSION" value="${org.eclipse.virgo.kernel}" />
-				<filter token="C.FILEUPLOAD.VERSION" value="${org.apache.commons.fileupload}" />
-				<filter token="C.IO.VERSION" value="${org.apache.commons.io}" />
-				<filter token="JOLOKIA.VERSION" value="${org.jolokia.osgi}" />
-				<filter token="OBJECTWEB.ASM" value="${org.objectweb.asm}" />
-				<filter token="JETTY.RAP.VERSION" value="${org.eclipse.jetty.rap}" />
-				<filter token="RAP.RWT.VERSION" value="${org.eclipse.rap.rwt}" />
-				<filter token="RAP.RWT.OSGI.VERSION" value="${org.eclipse.rap.rwt.osgi}" />
-				<filter token="RAP.JFACE.VERSION" value="${org.eclipse.rap.jface}" />
-				<filter token="RAP.JFACE.DATABINDING.VERSION" value="${org.eclipse.rap.jface.databinding}" />
-			</filterset>
-		</copy>
-
-		<!--prepare Jetty and RAP bundles for publishing -->
-		<copy todir="${nano.target.dir}/assembly/plugins" failonerror="false">
-			<fileset dir="${nano.basedir}/rapbundles" />
-		</copy>
-	</target>
-
-	<target name="nano.publish-bundles-and-features">
-		<antcall target="p2.generate-inf">
-			<param name="source" value="${nano.target.dir}/assembly/features" />
-		</antcall>
-
-		<antcall target="p2.publish-bundles-features">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${nano.target.dir}/assembly" />
-		</antcall>
-		<echo message="Published Virgo Nano Server bundles and features to ${p2.repository.dir}." />
-	</target>
-
-	<!-- package resources and products -->
-	<target name="nano.package-resources-and-products" depends="ivy.init">
-		<property name="common.resources.location" value="${nano.target.dir}/common_resources_zipped" />
-		<property name="specific.resources.location" value="${nano.target.dir}/specific_resources_zipped" />
-		<property name="enterprise.resources.location" value="${nano.target.dir}/enterprise_resources_zipped" />
-		<property name="scripts.location" value="${nano.target.dir}/scripts_zipped" />
-
-		<antcall target="prepare-common-resources" />
-		<antcall target="prepare-specific-resources" />
-		<antcall target="prepare-enterprise-resources" />
-		<antcall target="prepare-scripts" />
-		<antcall target="publish-resources-and-products" />
-	</target>
-
-	<target name="prepare-common-resources">
-		<property name="common.resources" value="${nano.target.dir}/common_resources" />
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true" />
-		<ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar" />
-
-		<property name="common.resources" value="${nano.target.dir}/common_resources" />
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/endorsed-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/endorsed/[artifact]_[revision].[ext]" conf="endorsed" type="jar" />
-
-		<property name="common.resources" value="${nano.target.dir}/common_resources" />
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/persistence/[artifact]_[revision].[ext]" conf="persistence" type="jar" />
-
-		<mkdir dir="${common.resources}/configuration" />
-		<mkdir dir="${common.resources}/pickup" />
-
-		<copy todir="${common.resources}" failonerror="false">
-			<fileset dir="${nano.basedir}/resources" />
-		</copy>
-
-		<copy todir="${common.resources}/configuration" failonerror="false">
-			<fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml" />
-		</copy>
-
-		<copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false" />
-
-		<mkdir dir="${common.resources.location}/binary" />
-		<zip destfile="${common.resources.location}/binary/nano_common_resources">
-			<zipfileset dir="${common.resources}" />
-		</zip>
-		<delete dir="${common.resources}" quiet="true" />
-	</target>
-
-	<target name="prepare-specific-resources">
-		<property name="specific.resources" value="${nano.target.dir}/specific_resources" />
-		<mkdir dir="${specific.resources}/lib" />
-		<echo file="${specific.resources}/lib/.version" message="virgo.nano.version=${bundle.version}&#xa;" />
-		<copy todir="${specific.resources}/configuration" failonerror="false">
-			<fileset dir="${nano.basedir}/configuration">
-				<include name="serviceability.xml" />
-			</fileset>
-		</copy>
-
-		<!-- Package the Web Admin Console in both Nano's -->
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/pickup-ivy.xml" transitive="true" />
-		<ivy:retrieve resolveId="copy.path" pattern="${specific.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup" />
-
-		<mkdir dir="${specific.resources.location}/binary" />
-		<zip destfile="${specific.resources.location}/binary/nano_specific_resources">
-			<zipfileset dir="${specific.resources}" />
-		</zip>
-		<delete dir="${specific.resources}" quiet="true" />
-	</target>
-
-	<target name="prepare-enterprise-resources">
-		<property name="enterprise.resources" value="${nano.target.dir}/enterprise_resources" />
-
-		<mkdir dir="${enterprise.resources}/configuration" />
-
-		<copy todir="${enterprise.resources}/configuration" failonerror="false">
-			<fileset dir="${nano.basedir}/enterprise_resources" />
-		</copy>
-
-		<copy file="${nano.basedir}/abouts/AboutNanoWeb.html" todir="${enterprise.resources}" failonerror="false" />
-
-		<mkdir dir="${enterprise.resources.location}/binary" />
-		<zip destfile="${enterprise.resources.location}/binary/nano_enterprise_resources">
-			<zipfileset dir="${enterprise.resources}" />
-		</zip>
-		<delete dir="${enterprise.resources}" quiet="true" />
-	</target>
-
-	<target name="prepare-scripts">
-		<property name="scripts" value="${nano.target.dir}/scripts" />
-		<copy todir="${scripts}/bin" failonerror="false">
-			<fileset dir="${nano.basedir}/bin" />
-		</copy>
-
-		<mkdir dir="${scripts.location}/binary" />
-		<zip destfile="${scripts.location}/binary/scripts">
-			<zipfileset dir="${scripts}" />
-		</zip>
-		<delete dir="${scripts}" quiet="true" />
-	</target>
-
-	<target name="publish-resources-and-products">
-		<property name="p2.products.location" value="${nano.basedir}/publish_resources/products" />
-
-		<antcall target="p2.publish-binary-chmod">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${common.resources.location}" />
-			<param name="chmod.args" value="org.eclipse.virgo.kernel.jmxremote.access.properties@/configuration#600" />
-		</antcall>
-		<echo message="Published the commons resources to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-binary-chmod">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${scripts.location}" />
-			<param name="chmod.args" value="startup.sh@/bin#755,dmk.sh@/bin#755,checkJava.sh@/bin#755,jconsole.sh@/bin#755,setupClasspath.sh@/bin#755,shutdown.sh@/bin#755" />
-		</antcall>
-		<echo message="Published the scripts to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-binary">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${enterprise.resources.location}" />
-		</antcall>
-		<echo message="Published the nano enterprise resources to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-binary">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${specific.resources.location}" />
-		</antcall>
-		<echo message="Published the specific resources to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/base/base.product" />
-		</antcall>
-		<echo message="Published base product to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/nano-base/nano-base.product" />
-		</antcall>
-		<echo message="Published nano-base product to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/nano/nano.product" />
-		</antcall>
-		<echo message="Published nano product to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/nano-full/nano-full.product" />
-		</antcall>
-		<echo message="Published nano-full product to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/nano-rap/nano-rap.product" />
-		</antcall>
-		<echo message="Published nano-rap product to ${p2.repository.dir}." />
-	</target>
-
-	<!-- package distros -->
-    <target name="nano.package-distros" depends="ivy.init">
-		<antcall target="install-packages" />
-		<antcall target="assemble-zips" />
-	</target>
-
-	<target name="install-packages">
-		<antcall target="p2.install-virgo-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="destination" value="${package.dir}/VN/${nano-package}-${bundle.version}" />
-			<param name="product.iu" value="nano.product" />
-		</antcall>
-		<echo message="Installed Virgo Nano for distribution purposes." />
-
-		<antcall target="p2.install-virgo-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="destination" value="${package.dir}/VNF/${nano-full-package}-${bundle.version}" />
-			<param name="product.iu" value="nano-full.product" />
-		</antcall>
-		<echo message="Installed Virgo Nano Full for distribution purposes." />
-
-		<antcall target="p2.install-virgo-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="destination" value="${package.dir}/VNR/${nano-rap-package}-${bundle.version}" />
-			<param name="product.iu" value="nano-rap.product" />
-		</antcall>
-		<echo message="Installed Virgo Nano RAP for distribution purposes." />
-	</target>
-
-	<target name="assemble-zips">
-    	<property name="nano.package.dir" value="${package.dir}/VN"/>
-        <delete dir="${nano.package.dir}/${nano-package}-${bundle.version}/Eclipse.app" quiet="true"/>
-        <mkdir dir="${artifacts.dir}"/>
-        <zip destfile="${artifacts.dir}/${nano-package}-${bundle.version}.zip">
-            <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/bin/*.sh" filemode="755"/>
-            <zipfileset dir="${nano.package.dir}" includes="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
-            <zipfileset dir="${nano.package.dir}">
-                <exclude name="${nano-package}-${bundle.version}/bin/*.sh"/>
-                <exclude name="${nano-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-            </zipfileset>
-        </zip>
-        <echo message="Virgo Nano assembled in ${artifacts.dir}/${nano-package}-${bundle.version}.zip"/>
-
-        <property name="nano.full.package.dir" value="${package.dir}/VNF"/>
-        <delete dir="${nano.full.package.dir}/${nano-full-package}-${bundle.version}/Eclipse.app" quiet="true"/>
-        <zip destfile="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip">
-            <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/bin/*.sh" filemode="755"/>
-            <zipfileset dir="${nano.full.package.dir}" includes="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
-            <zipfileset dir="${nano.full.package.dir}">
-                <exclude name="${nano-full-package}-${bundle.version}/bin/*.sh"/>
-                <exclude name="${nano-full-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-            </zipfileset>
-        </zip>
-        <echo message="Virgo Nano Full assembled in ${artifacts.dir}/${nano-full-package}-${bundle.version}.zip"/>
-		
-		<property name="nano.rap.package.dir" value="${package.dir}/VNR" />
-		<delete dir="${nano.rap.package.dir}/${nano-rap-package}-${bundle.version}/Eclipse.app" quiet="true" />
-		<zip destfile="${artifacts.dir}/${nano-rap-package}-${bundle.version}.zip">
-			<zipfileset dir="${nano.rap.package.dir}" includes="${nano-rap-package}-${bundle.version}/bin/*.sh" filemode="755" />
-			<zipfileset dir="${nano.rap.package.dir}" includes="${nano-rap-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600" />
-			<zipfileset dir="${nano.rap.package.dir}">
-				<exclude name="${nano-rap-package}-${bundle.version}/bin/*.sh" />
-				<exclude name="${nano-rap-package}-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" />
-			</zipfileset>
-		</zip>
-		<echo message="Virgo Nano RAP assembled in ${artifacts.dir}/${nano-rap-package}-${bundle.version}.zip" />
-	</target>
-
-	<target name="nano.clean-up">
-		<delete dir="${nano.target.dir}/assembly" quiet="true" />
-		<delete dir="${common.resources.location}" quiet="true" />
-		<delete dir="${specific.resources.location}" quiet="true" />
-		<delete dir="${scripts.location}" quiet="true" />
-		<delete dir="${nano.target.dir}" quiet="true" />
-	</target>
-
-	<target name="smoke-test-nano" description="Runs a smoke test on the nano packaged build">
-		<path id="smoke.test.bundles">
-			<pathelement location="${nano.basedir}/org.eclipse.virgo.nano.smoketest" />
-		</path>
-		<antcall target="test.pre" />
-		<all-bundles target="test-package" buildpathRef="smoke.test.bundles">
-			<property name="package.output.file" value="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip" />
-			<property name="package.basename" value="${nano-full-package}-${bundle.version}" />
-		</all-bundles>
-		<antcall target="test.post" />
-	</target>
-
-	<target name="publish-multiple-nano-packages-build" description="Uploads all Nano zipped packages to build.eclipse.org">
-		<antcall target="publish-package-build">
-			<param name="package.output.file" value="${package.output.file}" />
-		</antcall>
-		<antcall target="publish-package-build">
-			<param name="package.output.file" value="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip" />
-		</antcall>
-		<antcall target="publish-package-build">
-			<param name="package.output.file" value="${artifacts.dir}/${nano-rap-package}-${bundle.version}.zip" />
-		</antcall>
-	</target>
-
-	<target name="simrel-package" depends="ivy.init">
-		<delete dir="${package.output.dir}" quiet="true" />
-		<mkdir dir="${package.output.dir}" />
-		<property name="common.resources.location" value="${nano.target.dir}/common_resources_zipped" />
-		<property name="specific.resources.location" value="${nano.target.dir}/specific_resources_zipped" />
-		<property name="enterprise.resources.location" value="${nano.target.dir}/enterprise_resources_zipped" />
-		<property name="scripts.location" value="${nano.target.dir}/scripts_zipped" />
-
-		<antcall target="simrel-common-resources" />
-		<antcall target="simrel-bundles-and-features" />
-		<antcall target="simrel-publish-p2-repo" />
-	</target>
-
-	<target name="simrel-publish-p2-repo">
-		<antcall target="fetch-unzipped-virgo-build-tools" />
-
-		<property name="p2.products.location" value="${nano.basedir}/publish_resources/products" />
-
-		<antcall target="p2.publish-bundles-features">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="source" value="${nano.target.dir}/assembly" />
-		</antcall>
-		<echo message="Published bundles and features to ${p2.repository.dir}." />
-
-		<antcall target="p2.publish-product">
-			<param name="repository" value="${p2.repository.dir}" />
-			<param name="product.file.location" value="${p2.products.location}/virgo-nano/virgo-nano.product" />
-		</antcall>
-		<echo message="Published virgo-nano product to ${p2.repository.dir}." />
-	</target>
-
-	<target name="simrel-bundles-and-features">
-		<!-- Copy the nano kernel artifacts to a prepared for publishing location - a p2 repo will be built around them -->
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/nano-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="nano-runtime" type="jar" />
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/orbit-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="orbit-runtime" type="jar" />
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/gemini-web-ivy.xml" transitive="false" />
-		<ivy:retrieve resolveId="copy.path" pattern="${nano.target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="gemini-web" type="jar" />
-	</target>
-
-	<target name="simrel-common-resources">
-		<copy todir="${nano.target.dir}/assembly/plugins/org.eclipse.virgo.common.resources_${bundle.version}" failonerror="false">
-			<fileset dir="${nano.basedir}/publish_resources/org.eclipse.virgo.common.resources" />
-			<filterset>
-				<filter token="NANO.VERSION" value="${bundle.version}" />
-			</filterset>
-		</copy>
-
-		<property name="common.resources" value="${nano.target.dir}/assembly/plugins/org.eclipse.virgo.common.resources_${bundle.version}/root_content" />
-
-		<copy todir="${common.resources}/bin" failonerror="false">
-			<fileset dir="${nano.basedir}/bin" />
-		</copy>
-
-		<ivy:resolve resolveId="copy.path" file="${nano.basedir}/lib-ivy.xml" transitive="true" />
-		<ivy:retrieve resolveId="copy.path" pattern="${common.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar" />
-
-		<mkdir dir="${common.resources}/configuration" />
-		<mkdir dir="${common.resources}/pickup" />
-
-		<copy todir="${common.resources}" failonerror="false">
-			<fileset dir="${nano.basedir}/resources" />
-		</copy>
-
-		<copy todir="${common.resources}/configuration" failonerror="false">
-			<fileset dir="${nano.basedir}/configuration" excludes="keystore,serviceability.xml" />
-		</copy>
-
-		<copy file="${nano.basedir}/configuration/keystore" todir="${common.resources}/configuration" failonerror="false" />
-
-		<mkdir dir="${common.resources}/lib" />
-		<echo file="${common.resources}/lib/.version" message="virgo.nano.version=${bundle.version}&#xa;" />
-		<copy todir="${common.resources}/configuration" failonerror="false">
-			<fileset dir="${nano.basedir}/configuration">
-				<include name="serviceability.xml" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="publish-multiple-nano-packages-download" description="Uploads all Nano zipped packages to download.eclipse.org">
-		<antcall target="publish-package-download">
-			<param name="package.output.file" value="${package.output.file}" />
-		</antcall>
-		<antcall target="publish-package-download">
-			<param name="package.output.file" value="${artifacts.dir}/${nano-full-package}-${bundle.version}.zip" />
-		</antcall>
-		<antcall target="publish-package-download">
-			<param name="package.output.file" value="${artifacts.dir}/${nano-rap-package}-${bundle.version}.zip" />
-		</antcall>
-	</target>
-
-	<target name="ci.publish.nightly" description="Publishes nightly repository to download.eclipse.org. Can be executed on Hudson only!">
-		<delete dir="${nightly.updatesite.dir}" />
-
-		<copy toDir="${nightly.updatesite.dir}">
-			<fileset dir="${p2.repository.dir}" />
-		</copy>
-	</target>
-
-</project>
diff --git a/build-packaging/nano/endorsed-ivy.xml b/build-packaging/nano/endorsed-ivy.xml
deleted file mode 100644
index 66dfd95..0000000
--- a/build-packaging/nano/endorsed-ivy.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="endorsed" visibility="public" description="Dependencies to be packaged in lib"/>
-	</configurations>
-    
-	<dependencies>
-		<!-- endorsed -->
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="endorsed->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.annotation" rev="${javax.annotation}" conf="endorsed->runtime"/>
-        
-		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
-        <exclude org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi"/>
-	</dependencies>
-    
-</ivy-module>
\ No newline at end of file
diff --git a/build-packaging/nano/enterprise-ivy.xml b/build-packaging/nano/enterprise-ivy.xml
deleted file mode 100644
index 8cdfb74..0000000
--- a/build-packaging/nano/enterprise-ivy.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="enterprise" visibility="public" description="Enterprise dependencies to be published for Nano"/>
-	</configurations>
-    
-	<dependencies>
-        <dependency org="org.eclipse.virgo.mirrored" name="javassist" rev="${javassist}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.jms" rev="${javax.jms}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp.jstl.impl" rev="${javax.servlet.jsp.jstl.impl}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp.jstl" rev="${javax.servlet.jsp.jstl.api}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.validation" rev="${javax.validation}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.ws.rs" rev="${javax.ws.rs}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jcl}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.log4j" rev="${org.slf4j.log4j}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.quartz" rev="${org.quartz}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.ee.common" rev="${org.apache.openwebbeans.ee.common}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.ee" rev="${org.apache.openwebbeans.ee}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.ejb" rev="${org.apache.openwebbeans.ejb}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.impl" rev="${org.apache.openwebbeans.impl}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.spi" rev="${org.apache.openwebbeans.spi}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.web" rev="${org.apache.openwebbeans.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.jsf" rev="${org.apache.openwebbeans.jsf}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openwebbeans.tomcat7" rev="${org.apache.openwebbeans.tomcat7}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.beanutils" rev="${org.apache.commons.beanutils}" conf="enterprise->runtime"/>
-        <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.cli" rev="${org.apache.commons.cli}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.collections" rev="${org.apache.commons.collections}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.dbcp" rev="${org.apache.commons.dbcp}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.lang" rev="${org.apache.commons.lang}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.commons.pool" rev="${org.apache.commons.pool}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.derby" rev="${org.apache.derby}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.bval" rev="${org.apache.bval}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.geronimo.components.connector" rev="${org.apache.geronimo.components.connector}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.geronimo.components.transaction" rev="${org.apache.geronimo.components.transaction}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.geronimo.specs.j2ee.management" rev="${org.apache.geronimo.specs.j2ee.management}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.geronimo.specs.osgi.locator" rev="${org.apache.geronimo.specs.osgi.locator}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.geronimo.specs.osgi.registry" rev="${org.apache.geronimo.specs.osgi.registry}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="cdi.api" rev="${cdi.api}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.api" rev="${org.apache.openejb.api}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.core" rev="${org.apache.openejb.core}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.javaagent" rev="${org.apache.openejb.javaagent}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.jee" rev="${org.apache.openejb.jee}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.loader" rev="${org.apache.openejb.loader}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.openejb.jpa-integration" rev="${org.apache.openejb.jpa-integration}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.wsdl" rev="${javax.wsdl}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.xbean.asm" rev="${org.apache.xbean.asm}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.xbean.bundleutils" rev="${org.apache.xbean.bundleutils}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.xbean.finder" rev="${org.apache.xbean.finder}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.xbean.naming" rev="${org.apache.xbean.naming}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.xbean.reflect" rev="${org.apache.xbean.reflect}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.persistence.antlr" rev="${org.eclipse.persistence.antlr}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.persistence.asm" rev="${org.eclipse.persistence.asm}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.persistence.core" rev="${org.eclipse.persistence.core}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.persistence.jpa" rev="${org.eclipse.persistence.jpa}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.persistence.jpa.jpql" rev="${org.eclipse.persistence.jpa.jpql}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.glassfish.com.sun.faces" rev="${org.glassfish.com.sun.faces}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.glassfish.javax.faces" rev="${org.glassfish.javax.faces}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.inject" rev="${javax.inject}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.resource" rev="${javax.resource}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.security.auth.message" rev="${javax.security.auth.message}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.security.jacc" rev="${javax.security.jacc}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.ow2.jotm.jotm-core" rev="${org.ow2.jotm.jotm-core}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="osgi.enterprise" rev="${osgi.enterprise}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="scannotation" rev="${scannotation}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.objectweb.asm" rev="${org.objectweb.asm}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.appdeployer" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.applistener" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.jsf.support" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.fragment.bval" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.fragment.jotm" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.fragment.jpa" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.initialiser" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.services.accessor" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.security" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.security.valve" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.security.openejb.classloading.hook" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.catalina.fragment.webbeans" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.fragment.webbeans" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.tomcat.factory" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openwebbeans.initialiser" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.javax.persistence.extension" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer" rev="${org.eclipse.virgo.web}" conf="enterprise->runtime"/>
-	</dependencies>
-    
-</ivy-module>
-
diff --git a/build-packaging/nano/gemini-web-ivy.xml b/build-packaging/nano/gemini-web-ivy.xml
deleted file mode 100644
index 81790ea..0000000
--- a/build-packaging/nano/gemini-web-ivy.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="gemini-web" visibility="public" description="Gemini Web that will be packaged in Nano"/>
-	</configurations>
-
-	<dependencies>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="${org.eclipse.gemini.web}" conf="gemini-web->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.tomcat" rev="${org.eclipse.gemini.web}" conf="gemini-web->runtime"/>
-        <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.extender" rev="${org.eclipse.gemini.web}" conf="gemini-web->runtime"/>
-        <exclude org="org.slf4j" module="com.springsource.slf4j.nop"/>
-        <override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}" />
-	</dependencies>
-
-</ivy-module>
-
diff --git a/build-packaging/nano/lib-ivy.xml b/build-packaging/nano/lib-ivy.xml
deleted file mode 100644
index 5ceda1d..0000000
--- a/build-packaging/nano/lib-ivy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="lib" visibility="public" description="Dependencies to be packaged in lib"/>
-		<conf name="persistence" visibility="public" description="Dependencies to be packaged in lib/persistence"/>
-	</configurations>
-    
-	<dependencies>
-		<!-- lib -->
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.env" rev="${org.eclipse.virgo.util}" conf="lib->runtime"/>
-		<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.shutdown" rev="${org.eclipse.virgo.nano}" conf="lib->runtime"/>
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.authentication" rev="${org.eclipse.virgo.nano}" conf="lib->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.launcher" rev="${org.eclipse.equinox.launcher}" conf="lib->runtime"/>
-        <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.equinox.extensions" rev="${org.eclipse.virgo.kernel}" conf="lib->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.enterprise.openejb.jpa.integration" rev="${org.eclipse.virgo.web}" conf="persistence->runtime"/>
-        
-		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
-        <exclude org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi"/>
-	</dependencies>
-    
-</ivy-module>
\ No newline at end of file
diff --git a/build-packaging/nano/nano-ivy.xml b/build-packaging/nano/nano-ivy.xml
deleted file mode 100644
index ba85999..0000000
--- a/build-packaging/nano/nano-ivy.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="nano-runtime" visibility="public" description="Dependencies to be published for Nano"/>
-	</configurations>
-    
-	<dependencies>
-		<!-- nano runtime -->	
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.core" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.services.ds" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.services.concurrent" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.api" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.hot" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime" />
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.management" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.management.controller" rev="${org.eclipse.virgo.nano}" conf="nano-runtime->runtime"/>
-        
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.war.deployer" rev="${org.eclipse.virgo.web}" conf="nano-runtime->runtime" />
-        
-		<dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.transaction" rev="${javax.transaction}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic}" conf="nano-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackcorefragment" rev="${org.eclipse.virgo.medic}" conf="nano-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.logbackclassicfragment" rev="${org.eclipse.virgo.medic}" conf="nano-runtime->runtime"/>
-        
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.common" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.jmx" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="nano-runtime->runtime"/>
-        
-        <!-- web console -->
-        <dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.console" rev="${org.eclipse.virgo.kernel}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.management" rev="${org.eclipse.gemini.management}" conf="nano-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.fragment" rev="${org.eclipse.virgo.kernel}" conf="nano-runtime->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="${org.apache.commons.fileupload}" conf="nano-runtime->runtime"/>
-        <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="${org.apache.commons.io}" conf="nano-runtime->runtime"/>
-		<dependency org="org.jolokia" name="org.jolokia.osgi" rev="${org.jolokia.osgi}" conf="nano-runtime->runtime"/>
-        <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.http" rev="${org.eclipse.equinox.http}" conf="nano-runtime->runtime" />
-        
-		<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
-		<exclude org="org.jboss.logging"/>
-		<exclude org="org.jboss.util"/>
-		<exclude org="org.jboss.vfs"/>
-        
-		<override org="org.aspectj" rev="${org.aspectj}" />
-		<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
-		<override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
-		<override org="org.springframework" rev="${org.springframework}"/>
-	</dependencies>
-    
-</ivy-module>
-
diff --git a/build-packaging/nano/orbit-ivy.xml b/build-packaging/nano/orbit-ivy.xml
deleted file mode 100644
index 0b67d11..0000000
--- a/build-packaging/nano/orbit-ivy.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="orbit-runtime" visibility="public" description="Dependencies to be used for p2"/>
-	</configurations>
-    
-	<dependencies>	
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.classic" rev="${ch.qos.logback.classic}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.core" rev="${ch.qos.logback.core}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.slf4j" rev="${ch.qos.logback.slf4j}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.activation" rev="${javax.activation}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.mail" rev="${javax.mail}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.persistence" rev="${javax.persistence}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.xml.rpc" rev="${javax.xml.rpc}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.websocket" rev="${javax.websocket}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina" rev="${org.apache.catalina}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina.ha" rev="${org.apache.catalina.ha}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina.tribes" rev="${org.apache.catalina.tribes}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.coyote" rev="${org.apache.coyote}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.el" rev="${org.apache.el}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.jasper" rev="${org.apache.jasper}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.juli.extras" rev="${org.apache.juli.extras}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.mina.core" rev="${org.apache.mina.core}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.sshd.core" rev="${org.apache.sshd.core}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.api" rev="${org.apache.tomcat.api}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.util" rev="${org.apache.tomcat.util}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.websocket" rev="${org.apache.tomcat.websocket}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jul}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.annotation" rev="${javax.annotation}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.el" rev="${javax.el}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.command" rev="${org.apache.felix.gogo.command}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.shell" rev="${org.apache.felix.gogo.shell}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.sat4j.core" rev="${org.sat4j.core}" conf="orbit-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.sat4j.pb" rev="${org.sat4j.pb}" conf="orbit-runtime->runtime"/>
-	</dependencies>
-    
-</ivy-module>
-
diff --git a/build-packaging/nano/p2runtime-ivy.xml b/build-packaging/nano/p2runtime-ivy.xml
deleted file mode 100644
index 905e14e..0000000
--- a/build-packaging/nano/p2runtime-ivy.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-    
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-    
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="p2-runtime" visibility="public" description="Dependencies to be used for p2"/>
-	</configurations>
-    
-	<dependencies>	
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.core.contenttype" rev="${org.eclipse.core.contenttype}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.core.jobs" rev="${org.eclipse.core.jobs}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.core.net" rev="${org.eclipse.core.net}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.core.runtime" rev="${org.eclipse.core.runtime}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.ecf" rev="${org.eclipse.ecf}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.ecf.filetransfer" rev="${org.eclipse.ecf.filetransfer}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.ecf.identity" rev="${org.eclipse.ecf.identity}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.ecf.provider.filetransfer" rev="${org.eclipse.ecf.provider.filetransfer}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.ecf.ssl" rev="${org.eclipse.ecf.ssl}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.app" rev="${org.eclipse.equinox.app}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.event" rev="${org.eclipse.equinox.event}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.common" rev="${org.eclipse.equinox.common}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.frameworkadmin" rev="${org.eclipse.equinox.frameworkadmin}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.frameworkadmin.equinox" rev="${org.eclipse.equinox.frameworkadmin.equinox}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.launcher" rev="${org.eclipse.equinox.launcher}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.artifact.repository" rev="${org.eclipse.equinox.p2.artifact.repository}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.console" rev="${org.eclipse.equinox.p2.console}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.core" rev="${org.eclipse.equinox.p2.core}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.director" rev="${org.eclipse.equinox.p2.director}" conf="p2-runtime->runtime"/>
-        <!--dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.director.app" rev="${org.eclipse.equinox.p2.director.app}" conf="p2-runtime->runtime"/-->
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.engine" rev="${org.eclipse.equinox.p2.engine}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.garbagecollector" rev="${org.eclipse.equinox.p2.garbagecollector}" conf="p2-runtime->runtime"/>
-        <!--dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.updatesite" rev="${org.eclipse.equinox.p2.updatesite}" conf="p2-runtime->runtime"/-->
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.jarprocessor" rev="${org.eclipse.equinox.p2.jarprocessor}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.metadata" rev="${org.eclipse.equinox.p2.metadata}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.metadata.repository" rev="${org.eclipse.equinox.p2.metadata.repository}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.publisher" rev="${org.eclipse.equinox.p2.publisher}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.publisher.eclipse" rev="${org.eclipse.equinox.p2.publisher.eclipse}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.repository" rev="${org.eclipse.equinox.p2.repository}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.touchpoint.eclipse" rev="${org.eclipse.equinox.p2.touchpoint.eclipse}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.touchpoint.natives" rev="${org.eclipse.equinox.p2.touchpoint.natives}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.p2.transport.ecf" rev="${org.eclipse.equinox.p2.transport.ecf}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.preferences" rev="${org.eclipse.equinox.preferences}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.registry" rev="${org.eclipse.equinox.registry}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.security" rev="${org.eclipse.equinox.security}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.simpleconfigurator" rev="${org.eclipse.equinox.simpleconfigurator}" conf="p2-runtime->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.simpleconfigurator.manipulator" rev="${org.eclipse.equinox.simpleconfigurator.manipulator}" conf="p2-runtime->runtime"/>
-        
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.classic" rev="${ch.qos.logback.classic}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.core" rev="${ch.qos.logback.core}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.slf4j" rev="${ch.qos.logback.slf4j}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.activation" rev="${javax.activation}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.mail" rev="${javax.mail}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.persistence" rev="${javax.persistence}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.xml.rpc" rev="${javax.xml.rpc}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.websocket" rev="${javax.websocket}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina" rev="${org.apache.catalina}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina.ha" rev="${org.apache.catalina.ha}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.catalina.tribes" rev="${org.apache.catalina.tribes}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.coyote" rev="${org.apache.coyote}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.el" rev="${org.apache.el}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.jasper" rev="${org.apache.jasper}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.juli.extras" rev="${org.apache.juli.extras}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.mina.core" rev="${org.apache.mina.core}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.sshd.core" rev="${org.apache.sshd.core}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.api" rev="${org.apache.tomcat.api}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.util" rev="${org.apache.tomcat.util}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.tomcat.websocket" rev="${org.apache.tomcat.websocket}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt.core.compiler.batch}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jul}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.annotation" rev="${javax.annotation}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.el" rev="${javax.el}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.command" rev="${org.apache.felix.gogo.command}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.apache.felix.gogo.shell" rev="${org.apache.felix.gogo.shell}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.console" rev="${org.eclipse.equinox.console}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.console.ssh" rev="${org.eclipse.equinox.console.ssh}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.sat4j.core" rev="${org.sat4j.core}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.sat4j.pb" rev="${org.sat4j.pb}" conf="p2-runtime->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.region" rev="${org.eclipse.equinox.region}" conf="p2-runtime->runtime"/>
-	</dependencies>
-    
-</ivy-module>
-
diff --git a/build-packaging/nano/pickup-ivy.xml b/build-packaging/nano/pickup-ivy.xml
deleted file mode 100644
index 93a1c83..0000000
--- a/build-packaging/nano/pickup-ivy.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-	
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-	
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>	
-		<conf name="pickup" visibility="public" description="Dependencies to be packaged in pickup"/>
-	</configurations>
-	
-	<dependencies>	    
-		<dependency org="org.eclipse.virgo.management" name="org.eclipse.virgo.management.console" rev="${org.eclipse.virgo.kernel}" conf="pickup->runtime"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/build-packaging/nano/test-package.xml b/build-packaging/nano/test-package.xml
deleted file mode 100644
index 3b03562..0000000
--- a/build-packaging/nano/test-package.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="test-package">
-
-	<property name="test.staging.dir" value="${target.dir}/test-expanded"/>
-	<property name="test.package.dir" value="${test.staging.dir}/virgo-nano-full-${bundle.version}"/>
-
-	<target name="test-package"
-			description="Runs a test on the packaged build">
-		<antcall target="unzip.package"/>
-		<antcall target="test.do"/>
-    </target>
-
-	<target name="unzip.package">
-		<delete dir="${test.staging.dir}" quiet="true"/>
-		<mkdir dir="${test.staging.dir}"/>
-		<unzip src="${package.output.file}" dest="${test.staging.dir}"/>
-		<chmod perm="755">
-			<fileset dir="${test.package.dir}/bin">
-				<include name="*.sh"/>
-			</fileset>
-		</chmod>
-		<chmod perm="600">
-			<fileset dir="${test.package.dir}/configuration">
-				<include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</fileset>
-		</chmod>
-	</target>
-
-</project>
diff --git a/build-packaging/sign.xml b/build-packaging/sign.xml
deleted file mode 100644
index f7c97f2..0000000
--- a/build-packaging/sign.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="sign" xmlns:ivy="antlib:org.apache.ivy.ant">
-    
-    <target name="waitForSign" depends="ivy.init">	
-        <fail message="The 'stagingDirectory' property must be set on this project.">
-            <condition>
-                <not>
-                    <isset property="stagingDirectory"/>
-                </not>
-            </condition>
-        </fail>
-        <fail message="The 'archiveName' property must be set on this project.">
-            <condition>
-                <not>
-                    <isset property="archiveName"/>
-                </not>
-            </condition>
-        </fail>
-        <fail message="The 'eclipse.committerId' property must be set on this project.">
-            <condition>
-                <not>
-                    <isset property="eclipse.committerId"/>
-                </not>
-            </condition>
-        </fail>
-        <fail message="The 'stagingDirectoryOutput' property must be set on this project.">
-            <condition>
-                <not>
-                    <isset property="stagingDirectoryOutput"/>
-                </not>
-            </condition>
-        </fail>
-        <property name="signpoll" value="ssh" />
-        <property name="signhost" value="build.eclipse.org" />
-        <property name="signquote" value="&quot;" />
-        <property name="archiveName" value="org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-3.jar" />
-        <property name="signpollline" value="${eclipse.committerId}@${signhost} ${signquote}cd ${stagingDirectoryOutput};ls ${archiveName}${signquote}" />
-        
-        <echo message="DEBUG: signing - signpoll: ${signpoll}" />
-        <echo message="DEBUG: signing - signpollline: ${signpollline}" />
-        <echo message="DEBUG: signing - signquote: ${signquote}" />
-        <echo message="DEBUG: signing - stagingDirectoryoutput: ${stagingDirectoryOutput}" />
-        <echo message="DEBUG: signing - archiveName: ${archiveName}" />
-        
-        <antcall target="waitForChangedAttribs">
-            <param name="signpoll" value="${signpoll}" />
-            <param name="signpollline" value="${signpollline}" />
-        </antcall>
-    </target> 
-    
-    <target name="compareAttribs">
-        <!--poll file for change in attributes -->
-        <exec
-            dir="${target.dir}"
-            executable="${signpoll}"
-            outputProperty="polledAttribs">
-            <arg line="${signpollline}" />
-        </exec>
-        <condition property="attribChanged">
-            <and>
-                <not>
-                    <contains
-                    string="${polledAttribs}"
-                    substring="Permission denied, please try again."
-                    casesensitive="no" />
-                </not>
-                <not>
-                    <contains
-                    string="${polledAttribs}"
-                    substring="Host key verification failed."
-                    casesensitive="no" />
-                </not>
-                <or>
-                    <not>
-                        <contains
-                        string="${polledAttribs}"
-                        substring="No such file or directory"
-                        casesensitive="no" />
-                    </not>
-                    <contains
-                    string="${polledAttribs}"
-                    substring="bash: line 0: cd:"
-                    casesensitive="no" />
-                </or>
-            </and>
-        </condition>
-        <echo message="polled:  ${polledAttribs}" />
-        <antcall target="writeDiffResult" />
-        <sleep seconds="120" />
-        <available
-        property="attribs.changed"
-        file="${target.dir}/attribDiff.txt" />
-        <antcall target="waitForChangedAttribs" />
-    </target>
-    
-    <target
-        name="waitForChangedAttribs"
-        unless="attribs.changed">
-        <antcall
-            target="compareAttribs"
-            inheritAll="false">
-            <param
-            name="signpoll"
-            value="${signpoll}" />
-        </antcall>
-    </target>
-    
-    <target
-        name="writeDiffResult"
-        if="attribChanged">
-        <echo
-        message="new: ${polledAttribs}"
-        file="${target.dir}/attribDiff.txt"
-        append="true" />
-    </target>
-    
-</project>
diff --git a/build-packaging/tomcat-server/build-tomcat-server.xml b/build-packaging/tomcat-server/build-tomcat-server.xml
deleted file mode 100644
index 8da85af..0000000
--- a/build-packaging/tomcat-server/build-tomcat-server.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-web-server" default="precommit" xmlns:ivy="antlib:org.apache.ivy.ant">
-
-	<path id="bundles"/>
-
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
-
-    <property name="tomcat-server.basedir" value="${basedir}/tomcat-server"/>
-    
-	<target name="vts.package-resources-and-products" depends="ivy.init">
-		<delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-        
-		<property name="kernel.stage.file" value=""/>
-        <property name="tomcat.server.resources" value="${tomcat-server.target.dir}/tomcat_server_resources"/>
-        <property name="repository.ext" value="${tomcat.server.resources}/repository/ext"/>
-        <property name="repository.usr" value="${tomcat.server.resources}/repository/usr"/>
-
-        <unzip src="${p2.repository.dir}/binary/kernel_specific_resources_1.0.0" dest="${tomcat.server.resources}">
-			<globmapper from="kernel_specific_resources_1.0.0/*" to="*"/>
-		</unzip>
-
-		<mkdir dir="${repository.usr}"/>
-        
-		<antcall target="package.config"/>
-		<antcall target="package.docs"/>
-		<antcall target="package.lib"/>
-		<antcall target="package.pickup"/>
-		<antcall target="package.repository"/>
-		<antcall target="package.resources"/>
-        <antcall target="package.publish"/>
-	</target>
-    
-    <target name="vts.package-distro" depends="ivy.init">
-        <antcall target="package.install"/>
-	</target>
-    
-    <target name="vts.clean-up" depends="ivy.init">
-        <delete dir="${tomcat.server.resources.location}" quiet="true"/>
-        <delete dir="${tomcat-server.target.dir}/assembly" quiet="true"/>
-        <delete dir="${tomcat-server.target.dir}" quiet="true"/>
-	</target>
-    
-    <target name="package.publish">
-        <property name="tomcat.server.resources.location" value="${tomcat-server.target.dir}/tomcat_server_resources_zipped"/>
-		<zip destfile="${tomcat.server.resources.location}/binary/tomcat_server_resources">
-			<zipfileset dir="${tomcat.server.resources}"/>
-		</zip>
-        <delete dir="${tomcat.server.resources}" quiet="true"/>
-
-        <property name="p2.products.location" value="${tomcat-server.basedir}/publish_resources/products"/>
-        <antcall target="p2.publish-binary">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${tomcat.server.resources.location}"/>
-        </antcall>
-        <echo message="Published the tomcat server resources to ${p2.repository.dir}."/>
-        
-        <antcall target="p2.publish-product">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="product.file.location" value="${p2.products.location}/tomcat-server/tomcat-server.product"/>
-        </antcall>
-        <echo message="Published tomcat server product to ${p2.repository.dir}."/>
-    </target>
-    
-    <target name="vts.prepare-bundles-and-features">
-        <!--prepare tomcat server feature for publishing -->
-        <copy todir="${tomcat-server.target.dir}/assembly/features" failonerror="false">
-            <fileset dir="${tomcat-server.basedir}/publish_resources/features"/>
-        </copy>
-    </target>
-    
-    <target name="vts.publish-bundles-and-features">
-        <antcall target="p2.publish-bundles-features">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${tomcat-server.target.dir}/assembly"/>
-        </antcall>
-        <echo message="Published bundles and features to ${p2.repository.dir}."/>
-    </target>
-    
-    <target name="package.install">
-        <property name="vts.package.dir" value="${package.dir}/VTS"/>
-        
-        <antcall target="p2.install-virgo-product">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="destination" value="${vts.package.dir}/virgo-tomcat-server-${bundle.version}"/>
-            <param name="product.iu" value="tomcat-server.product"/>
-        </antcall>
-        <echo message="Installed Virgo Tomcat Server for distribution purposes."/>
-        
-        <mkdir dir="${artifacts.dir}"/>
-        
-        <delete dir="${vts.package.dir}/virgo-tomcat-server-${bundle.version}/Eclipse.app" quiet="true"/>
-        
-		<zip destfile="${artifacts.dir}/virgo-tomcat-server-${bundle.version}.zip">
-			<zipfileset dir="${vts.package.dir}" includes="virgo-tomcat-server-${bundle.version}/bin/*.sh" filemode="755"/>
-			<zipfileset dir="${vts.package.dir}" includes="virgo-tomcat-server-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
-			<zipfileset dir="${vts.package.dir}">
-				<exclude name="virgo-tomcat-server-${bundle.version}/bin/*.sh"/>
-				<exclude name="virgo-tomcat-server-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</zipfileset>
-		</zip>
-    </target>
-
-	<target name="package.config">
-		<copy todir="${tomcat.server.resources}/configuration" failonerror="false" overwrite="true">
-			<fileset dir="${tomcat-server.basedir}/configuration"/>
-		</copy>
-        
-        <replaceregexp match="initialArtifacts =.*\.blueprint"
-				replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint,repository:plan/org.eclipse.virgo.web.tomcat,repository:configuration/org.eclipse.virgo.apps.repository" flags="s"
-				file="${tomcat.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
-
-		<replaceregexp match=" javax\.servlet\.\*;.*?,\\.*? "
-				replace=" " flags="s"
-				file="${tomcat.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>			
-                
-        <replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
-				file="${tomcat.server.resources}/configuration/serviceability.xml"/>
-	</target>
-
-	<target name="package.docs" depends="ivy.init">
-		<ivy:resolve resolveId="copy.path" file="${tomcat-server.basedir}/docs-ivy.xml" transitive="false" conf="docs"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${tomcat-server.target.dir}/docs/[artifact]-[revision].[ext]" conf="docs" type="zip, pdf"/>
-
-		<copy todir="${tomcat.server.resources}/docs/virgo-user-guide/pdf" flatten="true">
-			<fileset dir="${tomcat-server.target.dir}/docs">
-				<include name="**/virgo-user-guide*.pdf"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${tomcat.server.resources}/docs/virgo-programmer-guide/pdf" flatten="true">
-			<fileset dir="${tomcat-server.target.dir}/docs">
-				<include name="**/virgo-programmer-guide*.pdf"/>
-			</fileset>
-		</copy>
-
-		<unzip dest="${tomcat.server.resources}/docs/virgo-user-guide">
-			<fileset dir="${tomcat-server.target.dir}/docs">
-		        <include name="**/virgo-user-guide*.zip"/>
-		    </fileset>
-		</unzip>
-
-		<unzip dest="${tomcat.server.resources}/docs/virgo-programmer-guide">
-			<fileset dir="${tomcat-server.target.dir}/docs">
-		        <include name="**/virgo-programmer-guide*.zip"/>
-		    </fileset>
-		</unzip>
-
-	</target>
-
-	<target name="package.lib">
-		<echo file="${tomcat.server.resources}/lib/.version" append="true"
-				message="virgo.server.version=${bundle.version}&#xa;"/>
-	</target>
-
-	<target name="package.pickup" depends="ivy.init">
-		<ivy:resolve resolveId="copy.path" file="${tomcat-server.basedir}/pickup-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${tomcat.server.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${tomcat.server.resources}/pickup/[artifact]_[revision].[ext]" type="plan" conf="pickup-plan"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup-plan"/>
-	</target>
-
-	<target name="package.repository" depends="ivy.init">
-		<copy todir="${tomcat.server.resources}/repository/ext" flatten="true">
-			<fileset dir="${tomcat-server.basedir}/repository/ext">
-				<include name="*.*"/>
-			</fileset>
-		</copy>
-		<ivy:resolve resolveId="copy.path" file="${tomcat-server.basedir}/repository-ivy.xml" transitive="false"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" conf="ext" type="library,jar,plan"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact].[ext]" conf="ext" type="configuration"/>
-
-		<ivy:resolve resolveId="copy.path" file="${tomcat-server.basedir}/repository-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" conf="transitive" type="library,jar,plan" />
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact].[ext]" conf="transitive" type="configuration" />
-	</target>
-
-	<target name="package.resources">
-		<copy todir="${tomcat.server.resources}" failonerror="false">
-			<fileset dir="${tomcat-server.basedir}/resources"/>
-		</copy>
-	</target>
-
-	<target name="smoke-test-tomcat-server" description="Runs a smoke test on the packaged build">
-		<path id="smoke.test.bundles">
-			<pathelement location="${tomcat-server.basedir}/org.eclipse.virgo.tomcat.smoketest" />
-		</path>
-		<antcall target="test.pre"/>
-		<all-bundles target="test-package" buildpathRef="smoke.test.bundles">
-			<property name="package.output.file" value="${artifacts.dir}/virgo-tomcat-server-${bundle.version}.zip"/>
-			<property name="package.basename" value="virgo-tomcat-server-${bundle.version}"/>
-			<property name="test-results.output.dir" value="${test-results.output.dir}"/>
-		</all-bundles>
-		<antcall target="test.post"/>
-	</target>
-
-</project>
diff --git a/build-packaging/tomcat-server/docs-ivy.xml b/build-packaging/tomcat-server/docs-ivy.xml
deleted file mode 100644
index 2dc986a..0000000
--- a/build-packaging/tomcat-server/docs-ivy.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-	
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-	
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>	
-		<conf name="docs" visibility="public" description="Documentation"/>
-	</configurations>
-	
-	<dependencies>
-		<dependency org="org.eclipse.virgo.documentation" name="virgo-programmer-guide" rev="${org.eclipse.virgo.documentation}" conf="docs->*"/>
-		<dependency org="org.eclipse.virgo.documentation" name="virgo-user-guide" rev="${org.eclipse.virgo.documentation}" conf="docs->*"/>
-	</dependencies>
-
-</ivy-module>
-
diff --git a/build-packaging/tomcat-server/pickup-ivy.xml b/build-packaging/tomcat-server/pickup-ivy.xml
deleted file mode 100644
index 658ed39..0000000
--- a/build-packaging/tomcat-server/pickup-ivy.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-	
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-	
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>	
-		<conf name="pickup" visibility="public" description="Dependencies to be packaged in pickup"/>
-		<conf name="pickup-plan" visibility="public" description="Plans to be packaged in pickup, with dependencies to be packaged in repostiory/bundles/ext"/>
-	</configurations>
-	
-	<dependencies>	    
-		<dependency org="org.eclipse.virgo.apps" name="org.eclipse.virgo.apps.splash" rev="${org.eclipse.virgo.apps}" conf="pickup->runtime"/>
-		<dependency org="org.eclipse.virgo.apps" name="org.eclipse.virgo.apps.repository" rev="${org.eclipse.virgo.apps}" conf="pickup->runtime"/>
-	</dependencies>
-
-</ivy-module>
-
diff --git a/build-packaging/tomcat-server/repository-ivy.xml b/build-packaging/tomcat-server/repository-ivy.xml
deleted file mode 100644
index 4b8323c..0000000
--- a/build-packaging/tomcat-server/repository-ivy.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
-
-	<info organisation="${project.organisation}" module="${ant.project.name}" />
-
-	<configurations>
-		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="ext" visibility="public" description="Dependencies to be packaged in repository/ext"/>
-		<conf name="transitive" visibility="public" description="Dependencies to be packaged with their transitive dependencies in repository/ext"/>
-	</configurations>
-
-	<dependencies>
-		<dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="ext->runtime"/>
-		
-		<dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.tomcat" rev="${org.eclipse.virgo.web}" conf="ext,transitive->runtime"/>
-        <dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.servlet.adapter" rev="${org.eclipse.virgo.web}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.ejb" rev="${javax.ejb}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.jms" rev="${javax.jms}" conf="ext->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.mail" rev="${javax.mail}" conf="ext->runtime"/>
-		<dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="${javax.portlet}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.servlet" rev="${javax.servlet}" conf="ext->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="ext->runtime"/>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="${javax.servlet.jsp.jstl}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.xml.rpc" rev="${javax.xml.rpc}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="javax.websocket" rev="${javax.websocket}" conf="ext->runtime"/>
-		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="${org.aopalliance}" conf="ext->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.codec" rev="${org.apache.commons.codec}" conf="ext->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="${org.apache.commons.fileupload}" conf="ext->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="${org.apache.commons.httpclient}" conf="ext->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.io" rev="${org.apache.commons.io}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.event" rev="${org.eclipse.equinox.event}" conf="ext->runtime"/>
-		
-		<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="${org.apache.taglibs.standard}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="ext->compile"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jcl}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.log4j" rev="${org.slf4j.log4j}" conf="ext->runtime"/>	
-		<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="ext->runtime"/>
-        <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.jdt.core.compiler.batch" rev="${org.eclipse.jdt.core.compiler.batch}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.aop" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.asm" rev="${org.springframework}" conf="ext->runtime"/>		
-		<dependency org="org.springframework" name="org.springframework.aspects" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.expression" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.jdbc" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.jms" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.orm" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.oxm" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.transaction" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.web" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="${org.springframework}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.core" rev="${org.eclipse.gemini.blueprint}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.extender" rev="${org.eclipse.gemini.blueprint}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.gemini" name="org.eclipse.gemini.blueprint.io" rev="${org.eclipse.gemini.blueprint}" conf="ext->runtime"/>
-		
-		<exclude org="org.aspectj" module="com.springsource.org.aspectj.runtime"/>
-        <exclude org="org.slf4j"/>
-        <exclude org="javax.servlet" module="javax.servlet"/>
-        <exclude org="javax.servlet" module="javax.servlet.jsp"/>
-        <exclude org="org.eclipse.jdt" module="org.eclipse.jdt.core.compiler.batch"/>
-		<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
-		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
-        <exclude org="javax.ejb" module="com.springsource.javax.ejb"/>
-        <exclude org="javax.xml.rpc" module="com.springsource.javax.xml.rpc"/>
-        <exclude org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi"/>
-		<exclude org="org.eclipse.virgo.util"/>
-		<exclude org="javax.xml.ws"/>
-		
-		<override org="org.springframework" rev="${org.springframework}"/>
-	</dependencies>
-
-</ivy-module>
-
diff --git a/build-packaging/tomcat-server/test-package.xml b/build-packaging/tomcat-server/test-package.xml
deleted file mode 100644
index b011fb8..0000000
--- a/build-packaging/tomcat-server/test-package.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="test-package">
-
-	<property name="test.staging.dir" value="${target.dir}/test-expanded"/>
-	<property name="test.package.dir" value="${test.staging.dir}/virgo-tomcat-server-${bundle.version}"/>
-	<property name="pickup.dir" value="${test.package.dir}/pickup"/>
-
-	<target name="test-package"
-			description="Runs a test on the packaged build">
-		<antcall target="unzip.package"/>
-		<antcall target="startup.pre"/>
-		<antcall target="startup"/>
-		<antcall target="startup.post"/>
-		<antcall target="test.do"/>
-		<antcall target="shutdown.pre"/>
-		<antcall target="shutdown"/>
-		<antcall target="shutdown.post"/>
-	</target>
-
-	<target name="unzip.package">
-		<delete dir="${test.staging.dir}" quiet="true"/>
-		<mkdir dir="${test.staging.dir}"/>
-		<unzip src="${package.output.file}" dest="${test.staging.dir}"/>
-		<chmod perm="755">
-			<fileset dir="${test.package.dir}/bin">
-				<include name="*.sh"/>
-			</fileset>
-		</chmod>
-		<chmod perm="600">
-			<fileset dir="${test.package.dir}/configuration">
-				<include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</fileset>
-		</chmod>
-	</target>
-
-	<target name="startup.pre"/>
-
-	<target name="startup" depends="shutdown">
-		<echo message="Starting Up Virgo Server" />
-
-		<exec dir="${test.package.dir}" osfamily="unix" spawn="true" executable="bin/startup.sh"/>
-		
-		<exec dir="${test.package.dir}" osfamily="windows" spawn="true" executable="cmd">
-			<arg line="/c bin\startup.bat" />
-		</exec>
-
-		<echo message="Starting Up Virgo Server - script run and waiting for response from http://localhost:8080/" />
-
-		<waitfor maxwait="5" maxwaitunit="minute" timeoutproperty="start.failed">
-			<http url="http://localhost:8080/"/>
-		</waitfor>
-		<fail if="start.failed" message="Virgo Server start up failed"/>
-
-		<echo message="Starting Up Virgo Server - started" />
-	</target>
-
-	<target name="startup.post"/>
-
-	<target name="shutdown.pre"/>
-
-	<target name="shutdown">
-		<echo message="Shutting Down Virgo Server" />
-
-		<exec dir="${test.package.dir}" osfamily="unix" spawn="true" executable="bin/shutdown.sh"/>
-		
-		<exec dir="${test.package.dir}" osfamily="windows" spawn="true" executable="cmd">
-			<arg line="/c bin\shutdown.bat" />
-		</exec>
-
-		<echo message="Shutting Down Virgo Server - waiting for http://localhost:8080/ to stop responding" />
-		
-		<waitfor maxwait="5" maxwaitunit="minute" timeoutproperty="shutdown.failed">
-			<not>
-				<http url="http://localhost:8080/"/>
-			</not>
-		</waitfor>
-		<fail if="shutdown.failed" message="Virgo Server shutdown failed"/>
-		
-		<echo message="Shutting Down Virgo Server - shutdown" />
-	</target>
-
-</project>