Bug 546613 - Discontinue Virgo jetty Server

This commit is part of the Virgo Spring-Cleaning 2019 to focus on the
main deliverables of Eclipse Virgo.

As of today the Virgo Jetty Server doesn't start properly.
Also we don't have a decent knowledge to migrate to the latest Jetty
bundles among the current committers.
diff --git a/build.gradle b/build.gradle
index 1ec1f94..0ba2942 100644
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,6 @@
 ext.smokeTestProjects = [
         project(':packaging:nano:org.eclipse.virgo.nano.smoketest'),
         project(':packaging:kernel:org.eclipse.virgo.kernel.smoketest'),
-        project(':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'),
         project(':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'),
 ]
 
@@ -178,7 +177,6 @@
 ext.packagingProjects = [
         project(':packaging:nano'),
         project(':packaging:kernel'),
-        project(':packaging:jetty-server'),
         project(':packaging:tomcat-server'),
 ]
 
@@ -349,8 +347,6 @@
             'umbrella.product.name.short'  : 'Virgo Runtime',
             'tomcat.product.name'          : 'Virgo Server for Apache Tomcat',
             'tomcat.product.name.short'    : 'VTS',
-            'jetty.product.name'           : 'Virgo Jetty Server',
-            'jetty.product.name.short'     : 'VJS',
             'kernel.product.name'          : 'Virgo Kernel',
             'kernel.product.name.short'    : 'VK',
             'nano.product.name'            : 'Virgo Nano',
diff --git a/packaging/build.gradle b/packaging/build.gradle
index 93b813f..82594b5 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -13,7 +13,6 @@
 configure([
         project(':packaging:nano'),
         project(':packaging:kernel'),
-        project(':packaging:jetty-server'),
         project(':packaging:tomcat-server'),
 ]) {
     dependencies {
@@ -42,7 +41,6 @@
 
 configure([
         project(':packaging:kernel'),
-        project(':packaging:jetty-server'),
         project(':packaging:tomcat-server'),
 ]) {
     dependencies {
@@ -90,7 +88,6 @@
 ]) { dependencies {} }
 
 configure([
-        project(':packaging:jetty-server'),
         project(':packaging:tomcat-server'),
 ]) {
     dependencies {
@@ -128,39 +125,6 @@
 }
 
 configure([
-        project(':packaging:jetty-server'),
-]) {
-    dependencies {
-        repositoryExt project(':web:org.eclipse.virgo.web.servlet.adapter')
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.continuation", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.deploy", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.http", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.io", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.osgi.boot", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.security", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.server", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.servlet", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.util", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.webapp", version: jettyVersion, configuration: "compile", ext: "jar"
-        repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.xml", version: jettyVersion, configuration: "compile", ext: "jar"
-
-        /* TODO think about adding additional Jetty bundles - e.g. for WebSocket support
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.ajp_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.annotations_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.client_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.jmx_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.jndi_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.osgi.boot.jsp_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.plus_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.policy_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.rewrite_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.servlets_8.1.16.v20140903.jar
-         packaging/jetty-server/build/install/virgo-jetty-server/repository/ext/org.eclipse.jetty.websocket_8.1.16.v20140903.jar
-         */
-    }
-}
-
-configure([
         project(':packaging:tomcat-server'),
 ]) {
     dependencies {
diff --git a/packaging/jetty-server/build-jetty-server.xml b/packaging/jetty-server/build-jetty-server.xml
deleted file mode 100644
index 7dc1b8d..0000000
--- a/packaging/jetty-server/build-jetty-server.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-jetty-server" default="precommit" xmlns:ivy="antlib:org.apache.ivy.ant">
-
-    <property name="jetty-server.basedir" value="${basedir}/jetty-server"/>
-    
-	<path id="bundles">
-		<pathelement location="${jetty-server.basedir}/org.eclipse.virgo.jetty.sample.tags"/>
-		<pathelement location="${jetty-server.basedir}/org.eclipse.virgo.jetty.web"/>
-	</path>
-
-	<target name="precommit" />
-	<target name="ivy.init" />
-
-	<property file="${basedir}/../build.properties"/>
-	<property file="${basedir}/../build.versions"/>
-	<property file="${basedir}/../build/virgo.properties" />
-	<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
-    
-	<target name="vjs.package-resources-and-products" depends="ivy.init">
-		<delete dir="${package.output.dir}" quiet="true"/>
-		<mkdir dir="${package.output.dir}"/>
-
-		<property name="jetty.server.resources" value="${jetty-server.target.dir}/jetty_server_resources"/>
-        <property name="jetty.server.scripts" value="${jetty-server.target.dir}/jetty_server_scripts"/>
-        <property name="repository.ext" value="${jetty.server.resources}/repository/ext"/>
-        <property name="repository.usr" value="${jetty.server.resources}/repository/usr"/>
-        
-        <unzip src="${p2.repository.dir}/binary/kernel_specific_resources_1.0.0" dest="${jetty.server.resources}">
-			<globmapper from="kernel_specific_resources_1.0.0/*" to="*"/>
-		</unzip>
-        <unzip src="${p2.repository.dir}/binary/scripts_1.0.0" dest="${jetty.server.scripts}">
-			<globmapper from="scripts_1.0.0/*" to="*"/>
-		</unzip>
-        
-		<mkdir dir="${repository.usr}"/>
-		
-		<antcall target="jetty.package.config"/>
-		<antcall target="jetty.package.docs"/>
-		<antcall target="jetty.package.lib"/>
-		<antcall target="jetty.package.pickup"/>
-		<antcall target="jetty.package.repository"/>
-		<antcall target="jetty.package.resources"/>
-		<antcall target="package.jetty"/>
-        <antcall target="package.jetty.scripts"/>
-        <antcall target="jetty.package.publish"/>
-    </target>
-    
-    <target name="vjs.prepare-bundles-and-features" depends="ivy.init">
-        <!--prepare jetty server features for publishing -->
-        <copy todir="${jetty-server.target.dir}/assembly/features" failonerror="true">
-            <fileset dir="${jetty-server.basedir}/publish_resources/features"/>
-        </copy>
-    </target>
-
-    <target name="vjs.publish-bundles-and-features" depends="ivy.init">
-        <antcall target="p2.publish-bundles-features">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${jetty-server.target.dir}/assembly"/>
-        </antcall>
-        <echo message="Published Virgo Jetty Server bundles and features to ${p2.repository.dir}."/>
-    </target>
-    
-    <target name="vjs.clean-up" depends="ivy.init">
-        <delete dir="${jetty.server.resources.location}" quiet="true"/>
-        <delete dir="${jetty.server.scripts.location}" quiet="true"/>
-        <delete dir="${jetty-server.target.dir}/assembly" quiet="true"/>
-        <delete dir="${jetty-server.target.dir}" quiet="true"/>
-    </target>
-    
-    <target name="vjs.package-distro">
-        <property name="vjs.package.dir" value="${package.dir}/VJS"/>
-        
-        <antcall target="p2.install-virgo-product">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="destination" value="${vjs.package.dir}/virgo-jetty-server-${bundle.version}"/>
-            <param name="product.iu" value="jetty-server.product"/>
-        </antcall>
-        <echo message="Installed Virgo Jetty Server for distribution purposes."/>
-        
-        <mkdir dir="${artifacts.dir}"/>
-        
-        <delete dir="${vjs.package.dir}/virgo-jetty-server-${bundle.version}/Eclipse.app" quiet="true"/>
-        
-		<zip destfile="${artifacts.dir}/virgo-jetty-server-${bundle.version}.zip">
-			<zipfileset dir="${vjs.package.dir}" includes="virgo-jetty-server-${bundle.version}/bin/*.sh" filemode="755"/>
-			<zipfileset dir="${vjs.package.dir}" includes="virgo-jetty-server-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
-			<zipfileset dir="${vjs.package.dir}">
-				<exclude name="virgo-jetty-server-${bundle.version}/bin/*.sh"/>
-				<exclude name="virgo-jetty-server-${bundle.version}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</zipfileset>
-		</zip>
-    </target>
-
-    <target name="jetty.package.publish">
-        <property name="jetty.server.resources.location" value="${jetty-server.target.dir}/jetty_server_resources_zipped"/>
-		<zip destfile="${jetty.server.resources.location}/binary/jetty_server_resources">
-			<zipfileset dir="${jetty.server.resources}"/>
-		</zip>
-        <delete dir="${jetty.server.resources}" quiet="true"/>
-        
-        <property name="jetty.server.scripts.location" value="${jetty-server.target.dir}/jetty_server_scripts_zipped"/>
-		<zip destfile="${jetty.server.scripts.location}/binary/jetty_server_scripts">
-			<zipfileset dir="${jetty.server.scripts}"/>
-		</zip>
-        <delete dir="${jetty.server.scripts}" quiet="true"/>
-        
-        <!-- proceed with publish -->
-        <property name="p2.products.location" value="${jetty-server.basedir}/publish_resources/products"/>
-        <antcall target="p2.publish-binary">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${jetty.server.resources.location}"/>
-        </antcall>
-        <echo message="Published the jetty server resources to ${p2.repository.dir}."/>
-        
-        <antcall target="p2.publish-binary-chmod">
-            <param name="repository" value="${p2.repository.dir}"/>
-            <param name="source" value="${jetty.server.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 jetty server scripts 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}/jetty-server/jetty-server.product"/>
-        </antcall>
-        <echo message="Published jetty server product to ${p2.repository.dir}."/>
-    </target>
-    
-	<target name="jetty.package.config">
-		<copy todir="${jetty.server.resources}/configuration" failonerror="true" overwrite="true">
-			<fileset dir="${jetty-server.basedir}/configuration"/>
-		</copy>
-
-		<replaceregexp match="# osgi\.console=2401"
-			replace="osgi.console=2401" flags="s"
-			file="${jetty.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
-
-		<replaceregexp match="initialArtifacts =.*\.blueprint"
-			replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.jetty.web" flags="s"
-			file="${jetty.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
-
-		<replaceregexp match=" javax\.servlet\.\*;.*?,\\.*? "
-			replace=" " flags="s"
-			file="${jetty.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>			                
-
-		<replaceregexp match="virgo-kernel" replace="virgo-jetty-server" flags="g"
-				file="${jetty.server.resources}/configuration/serviceability.xml"/>
-	</target>
-
-	<target name="jetty.package.docs" depends="ivy.init">
-		<ivy:resolve resolveId="copy.path" file="${jetty-server.basedir}/docs-ivy.xml" transitive="false" conf="docs"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${jetty-server.target.dir}/docs/[artifact]-[revision].[ext]" conf="docs" type="zip, pdf"/>
-
-		<copy todir="${jetty.server.resources}/docs/user-guide/pdf" flatten="true">
-			<fileset dir="${jetty-server.target.dir}/docs">
-				<include name="**/virgo-user-guide*.pdf"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${jetty.server.resources}/docs/programmer-guide/pdf" flatten="true">
-			<fileset dir="${jetty-server.target.dir}/docs">
-				<include name="**/virgo-programmer-guide*.pdf"/>
-			</fileset>
-		</copy>
-
-		<unzip dest="${jetty.server.resources}/docs/user-guide">
-			<fileset dir="${jetty-server.target.dir}/docs">
-		        <include name="**/virgo-user-guide*.zip"/>
-		    </fileset>
-		</unzip>
-
-		<unzip dest="${jetty.server.resources}/docs/programmer-guide">
-			<fileset dir="${jetty-server.target.dir}/docs">
-		        <include name="**/virgo-programmer-guide*.zip"/>
-		    </fileset>
-		</unzip>
-
-	</target>
-
-	<target name="jetty.package.lib">
-		<echo file="${jetty.server.resources}/lib/.version" append="true"
-				message="virgo.server.version=${bundle.version}&#xa;"/>
-	</target>
-
-	<target name="jetty.package.pickup" depends="ivy.init">
-		<ivy:resolve resolveId="copy.path" file="${jetty-server.basedir}/pickup-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${jetty.server.resources}/pickup/[artifact]-[revision].[ext]" type="jar, war, wab" conf="pickup"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${jetty.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="jetty.package.repository" depends="ivy.init">
-		<ivy:resolve resolveId="copy.path" file="${jetty-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:resolve resolveId="copy.path" file="${jetty-server.basedir}/repository-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]-[revision].[ext]" conf="transitive" type="library,jar,plan" />
-		
-		<copy todir="${repository.ext}" failonerror="true">
-			<fileset dir="${jetty-server.basedir}/jettybundles"/>
-		</copy>
-	</target>
-
-	<target name="jetty.package.resources">
-		<copy todir="${jetty.server.resources}" failonerror="true">
-			<fileset dir="${jetty-server.basedir}/resources"/>
-		</copy>
-	</target>
-	
-	<target name="package.jetty">
-		<mkdir dir="${jetty.server.resources}/jetty"/>
-		
-		<copy todir="${jetty.server.resources}/jetty" failonerror="true">
-			<fileset dir="${jetty-server.basedir}/jetty"/>
-		</copy>		
-	</target>
-    
-    <target name="package.jetty.scripts">
-    
-        <!-- \ must be double escaped \\\\ and new lines must be given with the ascii code thus the strange chars-->
-		
-		<replaceregexp match="# parse the standard arguments"
-			replace="# parse the standard arguments &#10;    JETTY_HOME=$KERNEL_HOME/jetty" flags="m"
-			file="${jetty.server.scripts}/bin/dmk.sh" />
-
-		<replaceregexp match="-Djava.io.tmpdir"
-			replace="-Djetty.home=$JETTY_HOME \\\\&#10;       -Djava.io.tmpdir" flags="m"
-			file="${jetty.server.scripts}/bin/dmk.sh" />
-		
-		<replaceregexp match='set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%"'
-			replace='set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djetty.home="%KERNEL_HOME%\\\\jetty"&#10;      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%"' flags="m"
-			file="${jetty.server.scripts}/bin/dmk.bat" />
-    </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>
-
-	<target name="smoke-test-jetty-server" description="Runs a smoke test on the packaged build">
-		<path id="smoke.test.bundles">
-			<pathelement location="${jetty-server.basedir}/org.eclipse.virgo.jetty.smoketest" />
-		</path>
-		<antcall target="test.pre"/>
-		<all-bundles target="test-package" buildpathRef="smoke.test.bundles">
-			<property name="package.output.file" value="${artifacts.dir}/virgo-jetty-server-${bundle.version}.zip"/>
-			<property name="package.basename" value="virgo-jetty-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/packaging/jetty-server/build.gradle b/packaging/jetty-server/build.gradle
deleted file mode 100644
index 28375b8..0000000
--- a/packaging/jetty-server/build.gradle
+++ /dev/null
@@ -1,75 +0,0 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-import static virgobuild.VirgoToolsPlugin.installProduct
-import static virgobuild.VirgoToolsPlugin.publishProduct
-
-apply plugin: 'distribution'
-
-distributions {
-    main {
-        baseName = 'virgo-jetty-server'
-        contents {
-            exclude ( '**/placeholder' )
-            from ( 'src/main/filtered' ) {
-                include ( '**/*.properties' )
-                include ( '**/.version' )
-                filter(ReplaceTokens, tokens: tokenMap) // tokens are used in e.g. oev.kernel.userregion.properties
-            }
-            from ( 'src/main/filtered' ) {
-                include ( 'bin/*.sh' )
-                fileMode 0755
-            }
-            from ( 'src/main/filtered' ) {
-                include ( '**/*.libd' )
-                include ( '**/*.plan' )
-                filter(ReplaceTokens, tokens: tokenMap)
-            }
-            from ( "${buildDir}/VJS/jetty-server/" ) { exclude ( 'Eclipse.app' ) }
-            from ( "${buildDir}/common_resources/" )
-        }
-    }
-}
-
-task ('assembleJettyServer', dependsOn: [
-    'installProductJettyServer',
-    'packageResourcesAndProducts'
-]) {
-    installDist.dependsOn(['assembleJettyServer'])
-    distZip.dependsOn(['assembleJettyServer'])
-}
-
-task ('packageResourcesAndProducts') {
-    doLast {
-        packageConfiguration('lib', configurations.nanoLib, file("${buildDir}/common_resources/lib/"))
-        packageConfiguration('libPersistence', configurations.nanoLibPersistence, file("${buildDir}/common_resources/lib/persistence/"))
-        packageConfiguration('libEndorsed', configurations.nanoLibEndorsed, file("${buildDir}/common_resources/lib/endorsed/"))
-        packageConfiguration('pluginsExtras', configurations.kernelPluginsExtras, file("${buildDir}/common_resources/plugins/"))
-        packageConfiguration('repositoryExt', configurations.repositoryExt, file("${buildDir}/common_resources/repository/ext/"))
-        packageConfiguration('pickup', configurations.nanoPickup, file("${buildDir}/common_resources/pickup/"))
-    }
-}
-
-task ('publishJettyServer', dependsOn: [
-    ':org.eclipse.virgo.site:publishBase',
-    ':org.eclipse.virgo.site:publishKernelBase',
-]) {
-    description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
-
-    def product = 'jetty-server'
-    def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
-
-    doLast() { publishProduct(project, productFileLocation) }
-}
-
-task ('installProductJettyServer', dependsOn: [
-    'publishJettyServer',
-]) {
-    description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
-
-    def product = 'jetty-server'
-    def shortProduct = 'VJS'
-    def destinationDir = file("${buildDir}/${shortProduct}/${product}")
-    def productIu = "${product}.product"
-
-    doLast() { installProduct(project, productIu, destinationDir) }
-}
diff --git a/packaging/jetty-server/docs-ivy.xml b/packaging/jetty-server/docs-ivy.xml
deleted file mode 100644
index 2dc986a..0000000
--- a/packaging/jetty-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/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/.gitignore b/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/.gitignore
deleted file mode 100644
index fe99505..0000000
--- a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-
diff --git a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/build.xml b/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/build.xml
deleted file mode 100644
index 768ea15..0000000
--- a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.virgo.jetty.smoketest">
-
-	<property file="${basedir}/../../../build.properties"/>
-	<property file="${basedir}/../../../build.versions"/>
-	<property file="${basedir}/../../../build/virgo.properties" />
-	<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
-	<import file="${basedir}/../test-package.xml"/>
-
-	<property name="apps.dir" value="${basedir}/apps"/>
-	
-	<target name="startup.pre">
-		<copy todir="${pickup.dir}">
-			<fileset dir="${apps.dir}"/>
-		</copy>
-	</target>
-
-	<target name="shutdown.post">
-		<echo message="Testing warm restart"/>
-		<sleep seconds="120"/> <!-- bug 364734: avoid previous instance overlapping with the new -->
-		<antcall target="startup"/>
-		<antcall target="test.do"/>
-		<antcall target="shutdown"/>
-        <sleep seconds="30"/>
-		<delete quiet="true">
-			<fileset dir="${pickup.dir}">
-				<exclude name="*admin*"/>
-				<exclude name="*splash*"/>
-			</fileset>
-		</delete>
-	</target>
-
-</project>
diff --git a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/ivy.xml b/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/ivy.xml
deleted file mode 100644
index eaedfdb..0000000
--- a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/ivy.xml
+++ /dev/null
@@ -1,24 +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"/>
-	</configurations>
-
-	<publications>
-		<artifact name="${ant.project.name}"/>
-		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
-	</publications>
-
-	<dependencies>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="${org.apache.commons.httpclient}" conf="test->runtime"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/java/org/eclipse/virgo/jetty/smoketest/JettyServerSmokeTests.java b/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/java/org/eclipse/virgo/jetty/smoketest/JettyServerSmokeTests.java
deleted file mode 100644
index 15b06ee..0000000
--- a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/java/org/eclipse/virgo/jetty/smoketest/JettyServerSmokeTests.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.jetty.smoketest;
-
-import static org.apache.http.HttpStatus.SC_OK;
-import static org.eclipse.virgo.test.tools.UrlWaitLatch.waitFor;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeThat;
-
-import org.eclipse.virgo.test.tools.AbstractSmokeTests;
-import org.eclipse.virgo.test.tools.JmxUtils;
-import org.eclipse.virgo.test.tools.ServerUtils;
-import org.eclipse.virgo.test.tools.UrlWaitLatch;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class JettyServerSmokeTests extends AbstractSmokeTests {
-
-    private static final String OEV_JETTY_SAMPLE_TAGS_JAR = "org.eclipse.virgo.jetty.sample.tags.jar";
-
-    private static final String VIRGO_FLAVOR = "jetty-server";
-
-    @Override
-    protected String getVirgoFlavor() {
-        return VIRGO_FLAVOR;
-    }
-
-    @BeforeClass
-    public static void initJmxConnection() {
-        JmxUtils.virgoHome = ServerUtils.getHome(VIRGO_FLAVOR);
-    }
-
-    @Test
-    public void jettyServerShouldBeStarted() throws Exception {
-        assertTrue(JmxUtils.isKernelStarted());
-    }
-
-    @Test
-    public void splashScreenShouldBeAccessable() throws Exception {
-        assertEquals(SC_OK, waitFor("http://localhost:8080/"));
-    }
-
-    @Test
-    public void adminScreenShouldBeAccessableWithDefaultCredentials() {
-        assertEquals(SC_OK, waitFor("http://localhost:8080/admin/content", "admin", "admin"));
-    }
-
-    @Test
-    public void tagLibsScreenShouldBeAccessable() throws Exception {
-        // TODO - check why this test fails on Virgo HIPP - this test doesn't run offline either. Could be a proxy issue...
-        assumeThat(System.getProperty("eclipse.build"), is(nullValue()));
-
-        deployTestBundles(VIRGO_FLAVOR, OEV_JETTY_SAMPLE_TAGS_JAR);
-
-        UrlWaitLatch.waitFor("http://localhost:8080/taglibs/app/sample.htm");
-
-        undeployTestBundles(VIRGO_FLAVOR, OEV_JETTY_SAMPLE_TAGS_JAR);
-    }
-
-}
diff --git a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/resources/bundles/org.eclipse.virgo.jetty.sample.tags.jar b/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/resources/bundles/org.eclipse.virgo.jetty.sample.tags.jar
deleted file mode 100644
index 0f2fddc..0000000
--- a/packaging/jetty-server/org.eclipse.virgo.jetty.smoketest/src/smokeTest/resources/bundles/org.eclipse.virgo.jetty.sample.tags.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/pickup-ivy.xml b/packaging/jetty-server/pickup-ivy.xml
deleted file mode 100644
index e2fe010..0000000
--- a/packaging/jetty-server/pickup-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="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"/>
-	</dependencies>
-
-</ivy-module>
-
diff --git a/packaging/jetty-server/publish_resources/products/jetty-server/jetty-server.product b/packaging/jetty-server/publish_resources/products/jetty-server/jetty-server.product
deleted file mode 100755
index 4281e78..0000000
--- a/packaging/jetty-server/publish_resources/products/jetty-server/jetty-server.product
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?pde version="3.5"?>

-

-<product name="Eclipse Virgo Kernel Product" uid="jetty-server.product" version="1.0.0" useFeatures="true" includeLaunchers="false">

-

-   <configIni use="default">

-   </configIni>

-   

-   <vm>

-   </vm>

-

-   <plugins>

-   </plugins>

-

-   <features>

-   </features>

-

-   <configurations>

-		<plugin id="org.apache.felix.gogo.command" autoStart="true"/>

-		<plugin id="org.apache.felix.gogo.runtime" autoStart="true"/>

-		<plugin id="org.apache.felix.gogo.shell" autoStart="true"/>

-		<plugin id="org.apache.mina.core" autoStart="true"/>

-		<plugin id="org.apache.sshd.core" autoStart="true"/>

-		<plugin id="org.eclipse.equinox.console" autoStart="true"/>

-		<plugin id="org.eclipse.equinox.console.ssh" autoStart="true"/>

-

-		<plugin id="org.eclipse.gemini.blueprint.extender" autoStart="true"/>

-		<plugin id="org.eclipse.gemini.management" autoStart="true"/>

-

-		<plugin id="org.eclipse.virgo.kernel.agent.dm" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.artifact" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.deployer" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.model" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.osgi" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.services" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.kernel.userregionfactory" autoStart="true"/>

-

-		<plugin id="org.eclipse.virgo.nano.core" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.nano.management" autoStart="true"/>

-		<plugin id="org.eclipse.virgo.repository" autoStart="true"/>

-		<plugin id="" autoStart="true"/>

-	</configurations>

-

-</product>

diff --git a/packaging/jetty-server/publish_resources/products/jetty-server/p2.inf b/packaging/jetty-server/publish_resources/products/jetty-server/p2.inf
deleted file mode 100644
index 4c6f109..0000000
--- a/packaging/jetty-server/publish_resources/products/jetty-server/p2.inf
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-requires.0.name = kernel-base.product
-requires.0.namespace = org.eclipse.equinox.p2.iu
-requires.0.range = 0.0.0
diff --git a/packaging/jetty-server/repository-ivy.xml b/packaging/jetty-server/repository-ivy.xml
deleted file mode 100644
index 1ec411b..0000000
--- a/packaging/jetty-server/repository-ivy.xml
+++ /dev/null
@@ -1,69 +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/bundles/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.jetty" name="org.eclipse.virgo.jetty.web" rev="latest.integration" />
-		<dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.dm" 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="javax.portlet" name="com.springsource.javax.portlet" rev="${javax.portlet}" 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.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="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="ext->runtime"/>
-		<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.event" rev="${org.eclipse.equinox.event}" conf="ext->compile"/>
-		<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.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.apache.commons" module="com.springsource.org.apache.commons.logging"/>
-		<exclude org="javax.servlet" module="javax.servlet" />
-        <exclude org="javax.jms" module="com.springsource.javax.jms" />
-		<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
-        <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/packaging/jetty-server/src/main/dist/About.html b/packaging/jetty-server/src/main/dist/About.html
deleted file mode 100644
index 231c60d..0000000
--- a/packaging/jetty-server/src/main/dist/About.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0047)http://www.eclipse.org/legal/epl/longabout.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>About</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>About This Content</H2>
- 
-<P>3 August 2011</P>	
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <A href="http://www.eclipse.org/">http://www.eclipse.org</A>.</P>
-
-		
-		<H3>Third Party Content</H3>
-		<P>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor's license for 
-		terms and conditions of use.</P>
-		
-		<h4>Kernel Third Party Content</h4>
-		<p>This is listed in the <a href="AboutKernel.html">Kernel's About file</a>.
-		
-		<h4>
-			<a href="about_files/apache-v20.txt">Apache License 2.0</a>
-		</h4>
-		This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
-		<ul>
-		</ul>
-		<h4>
-			<a href="about_files/asm.txt">ASM License</a>
-		</h4>
-		<ul>
-			<li>
-				ASM 3.1.0 - binary and source is available from the <a href="http://asm.ow2.org/">ASM project</a>
-			</li>
-		</ul>
-
-		<h4>
-			<a href="about_files/cddl-10.txt">Common Development and Distribution License 1.0</a>
-		</h4>
-		<ul>
-			<li>
-				javax.activation 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.activation&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.activation&version=1.1.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
-			</li>
-			<li>
-				javax.ejb 3.1.1 - binary and source available from the <a href="http://glassfish.java.net/">Glassfish project</a> (Dual-licensed CDDL 1.0 or GPL 2. Virgo elects to use CDDL 1.0.)
-			</li>
-			<li>
-				javax.el 2.2.0 - binary and source available from the <a href="http://glassfish.java.net/">Glassfish project</a> (Dual-licensed CDDL 1.0 or GPL 2. Virgo elects to use CDDL 1.0.)
-			</li>
-			<li>
-				javax.jms 1.1.0 - binary and source available from the <a href="http://glassfish.java.net/">Glassfish project</a> (Dual-licensed CDDL 1.0 or GPL 2. Virgo elects to use CDDL 1.0.)
-			</li>
-			<li>
-				javax.mail.glassfish 1.4.1 - binary and source are available from the <a href="http://glassfish.java.net/">GlassFish project</a>
-			</li>
-			<li>
-				<!-- Note that the EBR states this JAR has an Apache license, but CQ 3940 says it has a CDDL license, so we assume the CQ is correct. -->
-				javax.portlet 2.0.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.portlet&version=2.0.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.portlet&version=2.0.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
-			</li>
-			<li>
-				<!-- Refer to CQ 5019/4710 -->
-				javax.servlet.jsp 2.2.0 - binary and source available from the <a href="http://glassfish.java.net/">Glassfish project</a> (Dual-licensed CDDL 1.0 or GPL 2. Virgo elects to use CDDL 1.0.)
-			</li>
-			<li>
-				javax.servlet.jsp.jstl 1.2.0 - <a href="http://ebr.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet.jsp.jstl&version=1.2.0.v20110517&type=binary">binary</a> and <a href="http://ebr.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet.jsp.jstl&version=1.2.0.v20110517&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a> (Dual-licensed CDDL or Apache License 2.0. Virgo elects to use CDDL.)
-			</li>
-			<li>
-				javax.xml.rpc 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.rpc&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.rpc&version=1.1.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
-			</li>
-			<li>
-				com.sun.el 2.2.0 - binary and source are available from the <a href="http://jsp.java.net/">GlassFish JavaServer Pages project</a>
-			</li>
-			<li>
-				org.apache.jasper.glassfish 2.2.2 - binary and source are available from the <a href="http://jsp.java.net/">GlassFish JavaServer Pages project</a>
-			</li>
-			<li>
-				org.apache.taglibs.standard.glassfish 1.2.0 - binary and source are available from the <a href="http://jsp.java.net/">GlassFish JavaServer Pages project</a>
-			</li>
-		</ul>
-		<h4>
-			<a href="about_files/LICENSE-asm.html">New BSD License</a>
-		</h4>
-		<ul>
-			<li>
-				org.objectweb.asm 3.1.0 - binary and source are available from the
-				<a href="http://asm.objectweb.org/">ASM project</a>
-			</li>
-		</ul>
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/AboutKernel.html b/packaging/jetty-server/src/main/dist/AboutKernel.html
deleted file mode 100644
index 6bc942a..0000000
--- a/packaging/jetty-server/src/main/dist/AboutKernel.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0047)http://www.eclipse.org/legal/epl/longabout.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>About</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>About This Content</H2>
- 
-<P>13 December 2012</P>	
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <A href="http://www.eclipse.org/">http://www.eclipse.org</A>.</P>
-
-		
-		<H3>Third Party Content</H3>
-		<P>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor's license for 
-		terms and conditions of use.</P>
-
-		<h4>Nano Third Party Content</h4>
-		<p>This is listed in <a href="AboutNano.html">Nano's About file</a>.
-
-		
-		<h4>
-			<a href="about_files/apache-v20.txt">Apache License 2.0</a>
-		</h4>
-		This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
-		<ul>
-			<li>
-				Apache Commons Codec 1.3.0 - binary and source is available from the <a href="http://commons.apache.org/codec/">Apache Commons Codec project</a>
-			</li>
-			<li>
-				Apache HttpClient 3.1.0 - binary and source is available from the <a href="http://hc.apache.org/httpclient-3.x/">Apache HttpClient project</a>
-			</li>
-			<li>
-				Spring Framework 3.1.0.RELEASE - binary and source is available from the
-				<a href="http://www.springsource.com/download/community">Spring Framework project</a>
-			</li>
-		</ul>
-		<h4>
-			<a href="about_files/asm.txt">ASM License</a>
-		</h4>
-		<ul>
-			<li>
-				ASM 2.2.3 - binary and source is available from the <a href="http://asm.ow2.org/">ASM project</a>
-			</li>
-		</ul>
-		<h4>
-			<a href="http://en.wikipedia.org/wiki/Public_domain">Public Domain</a>
-		</h4>
-		<ul>
-			<li>
-				AOP Alliance 1.0.0 - binary and source is available from the
-				<a href="http://aopalliance.sourceforge.net/">AOP Alliance project</a>
-			</li>
-		</ul>
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/AboutNano.html b/packaging/jetty-server/src/main/dist/AboutNano.html
deleted file mode 100644
index f1edaee..0000000
--- a/packaging/jetty-server/src/main/dist/AboutNano.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0047)http://www.eclipse.org/legal/epl/longabout.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>About</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>About This Content</H2>
- 
-<P>13 December 2012</P>	
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <A href="http://www.eclipse.org/">http://www.eclipse.org</A>.</P>
-
-		
-		<H3>Third Party Content</H3>
-		<P>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor's license for 
-		terms and conditions of use.</P>
-		
-		<h4>
-			<a href="about_files/apache-v20.txt">Apache License 2.0</a>
-		</h4>
-		This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
-		<ul>
-			<li>
-				Apache Commons FileUpload 1.2.0 - binary and source are available from the <a href="http://commons.apache.org/fileupload/">Apache Commons FileUpload project</a>
-			</li>
-			<li>
-				Apache Commons IO 1.4.0 - binary and source are available from the <a href="http://commons.apache.org/io/">Apache Commons IO project</a>
-			</li>
-			<li>
-				Apache Felix Gogo 0.10.0 - binary and source is available from the <a href="http://felix.apache.org">Apache Felix project</a>
-			</li>
-			<li>
-				Apache MINA Core 2.0.2 - binary and source is available from the <a href="http://mina.apache.org/">Apache MINA project</a>
-			</li>
-			<li>
-				Apache MINA SSHD Core 0.5.0 - binary and source is available from the <a href="http://mina.apache.org/">Apache MINA project</a>
-			</li>
-			<li>
-				javax.transaction 1.1.1 - binary and source are available from the <a href="http://geronimo.apache.org/">Apache Geronimo project</a>
-			</li>
-			<li>
-				Jolokia OSGi 1.0.2 - binary and source are available from the <a href="http://www.jolokia.org/">Jolokia project</a>
-			</li>
-			<li>
-				OSGi Enterprise 4.2 - binary and source are available from the <a href="https://www.osgi.org/members/Release42/HomePage">OSGi Alliance</a>
-			</li>
-		</ul>
-		<h4>
-			<a href="about_files/LICENSE-AspectJ.html">AspectJ License</a>
-		</h4>
-		<ul>
-			<li>
-				AspectJ Weaver 1.6.12 - binary and source is available from the <a href="http://eclipse.org/aspectj">AspectJ project</a>
-			</li>
-		</ul>
-		<h4>
-			<a href="about_files/cddl-10.txt">Common Development and Distribution License 1.0</a>
-		</h4>
-		<ul>
-			<li>
-				javax.annotation 1.1.0 - binary and source is available from the
-				<a href="http://glassfish.java.net/">GlassFish Project</a> (Dual-licensed CDDL 1.0 or GPL 2. Virgo elects to use CDDL 1.0.)
-			</li>
-		</ul>
-
-		<h4>
-			<a href="epl-v10.html">Eclipse Public License 1.0</a>
-		</h4>
-		<ul>
-			<li>
-				Logback 1.0.7 - binary and source is available from the
-				<a href="http://logback.qos.ch/">Logback project</a> (Dual-licensed EPL or LGPL. Virgo elects to use EPL.)
-			</li>
-		</ul>
-		<h4>
-			<a href="about_files/slf4j.txt">SLF4J License</a>
-		</h4>
-		<ul>
-			<li>
-				Simple Logging Facade for Java (SLF4J) 1.7.2 - binary and source is available from the
-				<a href="http://www.slf4j.org/">SLF4J Project</a>
-			</li>
-		</ul>
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/about_files/LICENSE-AspectJ.html b/packaging/jetty-server/src/main/dist/about_files/LICENSE-AspectJ.html
deleted file mode 100644
index 8f7d0a4..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/LICENSE-AspectJ.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-
-<head>
-<title>AspectJ License</title>
-
-
-</head>
-
-<BODY BGCOLOR="white">
-
-<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
-                      Compiler and Core Tools License</b></h2>
-
-<p>This is a binary-only release.&nbsp; Source code
-is available from
-<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>
-
-<p>The Eclipse Foundation makes available all content in this distribution ("Content").  
-		Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-		Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-		at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-		For purposes of the EPL, "Program" will mean the Content.</p>
-
-		<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-		being redistributed by another party ("Redistributor") and different terms and conditions may
-		apply to your use of any object code in the Content.  Check the Redistributor's license 
-		that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-		indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-		and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-		
-		<h3>Third Party Content</h3>
-		<p>The Content includes items that have been sourced from third parties as set out below. If you 
-		did not receive this Content directly from the Eclipse Foundation, the following is provided 
-		for informational purposes only, and you should look to the Redistributor?s license for 
-		terms and conditions of use.</p>
-		<em>
-
-		<h4>BCEL v5.1</h4>
-		<p>This product contains software developed by the
-         Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
- 
-		<p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
-		BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
-		code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
-		is made available under the Apache Software License v1.1</p>
-		
-		<h4>ASM v2.2.1</h4> 
-		<p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
-		The source code for ASM is available from the ObjectWeb download site at 
-		<a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. 
-		<p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. 
-		The license is also reproduced here:
-		</p>
-
-<pre>Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-</em>
-
-</body>
-
-</html>
diff --git a/packaging/jetty-server/src/main/dist/about_files/apache-v20.txt b/packaging/jetty-server/src/main/dist/about_files/apache-v20.txt
deleted file mode 100644
index d645695..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/apache-v20.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/packaging/jetty-server/src/main/dist/about_files/asm.txt b/packaging/jetty-server/src/main/dist/about_files/asm.txt
deleted file mode 100644
index c5aba7b..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/asm.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packaging/jetty-server/src/main/dist/about_files/cddl-10.txt b/packaging/jetty-server/src/main/dist/about_files/cddl-10.txt
deleted file mode 100644
index 9709055..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/cddl-10.txt
+++ /dev/null
@@ -1,380 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. "Contributor" means each individual or entity that
-creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the
-Original Software, prior Modifications used by a
-Contributor (if any), and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or
-(b) Modifications, or (c) the combination of files
-containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form
-other than Source Code.
-
-1.5. "Initial Developer" means the individual or entity
-that first makes Original Software available under this
-License.
-
-1.6. "Larger Work" means a work which combines Covered
-Software or portions thereof with code not governed by the
-terms of this License.
-
-1.7. "License" means this document.
-
-1.8. "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time of the initial
-grant or subsequently acquired, any and all of the rights
-conveyed herein.
-
-1.9. "Modifications" means the Source Code and Executable
-form of any of the following:
-
-A. Any file that results from an addition to,
-deletion from or modification of the contents of a
-file containing Original Software or previous
-Modifications;
-
-B. Any new file that contains any part of the
-Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made
-available under the terms of this License.
-
-1.10. "Original Software" means the Source Code and
-Executable form of computer software code that is
-originally released under this License.
-
-1.11. "Patent Claims" means any patent claim(s), now owned
-or hereafter acquired, including without limitation,
-method, process, and apparatus claims, in any patent
-Licensable by grantor.
-
-1.12. "Source Code" means (a) the common form of computer
-software code in which modifications are made and (b)
-associated documentation included in or with such code.
-
-1.13. "You" (or "Your") means an individual or a legal
-entity exercising rights under, and complying with all of
-the terms of, this License. For legal entities, "You"
-includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this
-definition, "control" means (a) the power, direct or
-indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (b) ownership
-of more than fifty percent (50%) of the outstanding shares
-or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, the
-Initial Developer hereby grants You a world-wide,
-royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Initial Developer,
-to use, reproduce, modify, display, perform,
-sublicense and distribute the Original Software (or
-portions thereof), with or without Modifications,
-and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using or selling of Original Software, to make, have
-made, use, practice, sell, and offer for sale, and/or
-otherwise dispose of the Original Software (or
-portions thereof).
-
-(c) The licenses granted in Sections 2.1(a) and (b)
-are effective on the date Initial Developer first
-distributes or otherwise makes the Original Software
-available to a third party under the terms of this
-License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent
-license is granted: (1) for code that You delete from
-the Original Software, or (2) for infringements
-caused by: (i) the modification of the Original
-Software, or (ii) the combination of the Original
-Software with other software or devices.
-
-2.2. Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, each
-Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Contributor to
-use, reproduce, modify, display, perform, sublicense
-and distribute the Modifications created by such
-Contributor (or portions thereof), either on an
-unmodified basis, with other Modifications, as
-Covered Software and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using, or selling of Modifications made by that
-Contributor either alone and/or in combination with
-its Contributor Version (or portions of such
-combination), to make, use, sell, offer for sale,
-have made, and/or otherwise dispose of: (1)
-Modifications made by that Contributor (or portions
-thereof); and (2) the combination of Modifications
-made by that Contributor with its Contributor Version
-(or portions of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and
-2.2(b) are effective on the date Contributor first
-distributes or otherwise makes the Modifications
-available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent
-license is granted: (1) for any code that Contributor
-has deleted from the Contributor Version; (2) for
-infringements caused by: (i) third party
-modifications of Contributor Version, or (ii) the
-combination of Modifications made by that Contributor
-with other software (except as part of the
-Contributor Version) or other devices; or (3) under
-Patent Claims infringed by Covered Software in the
-absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make
-available in Executable form must also be made available in
-Source Code form and that Source Code form must be
-distributed only under the terms of this License. You must
-include a copy of this License with every copy of the
-Source Code form of the Covered Software You distribute or
-otherwise make available. You must inform recipients of any
-such Covered Software in Executable form as to how they can
-obtain such Covered Software in Source Code form in a
-reasonable manner on or through a medium customarily used
-for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You
-contribute are governed by the terms of this License. You
-represent that You believe Your Modifications are Your
-original creation(s) and/or You have sufficient rights to
-grant the rights conveyed by this License.
-
-3.3. Required Notices.
-
-You must include a notice in each of Your Modifications
-that identifies You as the Contributor of the Modification.
-You may not remove or alter any copyright, patent or
-trademark notices contained within the Covered Software, or
-any notices of licensing or any descriptive text giving
-attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-
-You may not offer or impose any terms on any Covered
-Software in Source Code form that alters or restricts the
-applicable version of this License or the recipients'
-rights hereunder. You may choose to offer, and to charge a
-fee for, warranty, support, indemnity or liability
-obligations to one or more recipients of Covered Software.
-However, you may do so only on Your own behalf, and not on
-behalf of the Initial Developer or any Contributor. You
-must make it absolutely clear that any such warranty,
-support, indemnity or liability obligation is offered by
-You alone, and You hereby agree to indemnify the Initial
-Developer and every Contributor for any liability incurred
-by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-
-You may distribute the Executable form of the Covered
-Software under the terms of this License or under the terms
-of a license of Your choice, which may contain terms
-different from this License, provided that You are in
-compliance with the terms of this License and that the
-license for the Executable form does not attempt to limit
-or alter the recipient's rights in the Source Code form
-from the rights set forth in this License. If You
-distribute the Covered Software in Executable form under a
-different license, You must make it absolutely clear that
-any terms which differ from this License are offered by You
-alone, not by the Initial Developer or Contributor. You
-hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial
-Developer or such Contributor as a result of any such terms
-You offer.
-
-3.6. Larger Works.
-
-You may create a Larger Work by combining Covered Software
-with other code not governed by the terms of this License
-and distribute the Larger Work as a single product. In such
-a case, You must make sure the requirements of this License
-are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-
-Sun Microsystems, Inc. is the initial license steward and
-may publish revised and/or new versions of this License
-from time to time. Each version will be given a
-distinguishing version number. Except as provided in
-Section 4.3, no one other than the license steward has the
-right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. If the Initial Developer includes a
-notice in the Original Software prohibiting it from being
-distributed or otherwise made available under any
-subsequent version of the License, You must distribute and
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. Otherwise, You may also choose to
-use, distribute or otherwise make the Covered Software
-available under the terms of any subsequent version of the
-License published by the license steward.
-
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a
-new license for Your Original Software, You may create and
-use a modified version of this License if You: (a) rename
-the license and remove any references to the name of the
-license steward (except to note that the license differs
-from this License); and (b) otherwise make it clear that
-the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will
-terminate automatically if You fail to comply with terms
-herein and fail to cure such breach within 30 days of
-becoming aware of the breach. Provisions which, by their
-nature, must remain in effect beyond the termination of
-this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding
-declaratory judgment actions) against Initial Developer or
-a Contributor (the Initial Developer or Contributor against
-whom You assert such claim is referred to as "Participant")
-alleging that the Participant Software (meaning the
-Contributor Version where the Participant is a Contributor
-or the Original Software where the Participant is the
-Initial Developer) directly or indirectly infringes any
-patent, then any and all rights granted directly or
-indirectly to You by such Participant, the Initial
-Developer (if the Initial Developer is not the Participant)
-and all Contributors under Sections 2.1 and/or 2.2 of this
-License shall, upon 60 days notice from Participant
-terminate prospectively and automatically at the expiration
-of such 60 day notice period, unless if within such 60 day
-period You withdraw Your claim with respect to the
-Participant Software against such Participant either
-unilaterally or pursuant to a written agreement with
-Participant.
-
-6.3. In the event of termination under Sections 6.1 or 6.2
-above, all end user licenses that have been validly granted
-by You or any distributor hereunder prior to termination
-(excluding licenses granted to You by any distributor)
-shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a "commercial item," as that term is
-defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-computer software" (as that term is defined at 48 C.F.R. ¤
-252.227-7014(a)(1)) and "commercial computer software
-documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Software with only those rights set forth herein.
-This U.S. Government Rights clause is in lieu of, and supersedes,
-any other FAR, DFAR, or other clause or provision that addresses
-Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the
-extent necessary to make it enforceable. This License shall be
-governed by the law of the jurisdiction specified in a notice
-contained within the Original Software (except to the extent
-applicable law, if any, provides otherwise), excluding such
-jurisdiction's conflict-of-law provisions. Any litigation
-relating to this License shall be subject to the jurisdiction of
-the courts located in the jurisdiction and venue specified in a
-notice contained within the Original Software, with the losing
-party responsible for costs, including, without limitation, court
-costs and reasonable attorneys' fees and expenses. The
-application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded. Any law or
-regulation which provides that the language of a contract shall
-be construed against the drafter shall not apply to this License.
-You agree that You alone are responsible for compliance with the
-United States export administration regulations (and the export
-control laws and regulation of any other countries) when You use,
-distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or
-indirectly, out of its utilization of rights under this License
-and You agree to work with Initial Developer and Contributors to
-distribute such responsibility on an equitable basis. Nothing
-herein is intended or shall be deemed to constitute any admission
-of liability.
diff --git a/packaging/jetty-server/src/main/dist/about_files/cpl-10.txt b/packaging/jetty-server/src/main/dist/about_files/cpl-10.txt
deleted file mode 100644
index eb9ef5b..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/cpl-10.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Common Public License - v 1.0
-
-Updated 16 Apr 2009
-
-As of 25 Feb 2009, IBM has assigned the Agreement Steward role for the CPL to the Eclipse Foundation. Eclipse has designated the Eclipse Public License (EPL) as the follow-on version of the CPL.
-
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i)	 changes to the Program, and
-ii)	 additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-
-2. GRANT OF RIGHTS
-
-a)	Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a)	it complies with the terms and conditions of this Agreement; and
-b)	its license agreement:
-i)	effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii)	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a)	it must be made available under this Agreement; and
-b)	a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/about_files/mpl-1.1.txt b/packaging/jetty-server/src/main/dist/about_files/mpl-1.1.txt
deleted file mode 100644
index 06f9651..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/mpl-1.1.txt
+++ /dev/null
@@ -1,469 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
diff --git a/packaging/jetty-server/src/main/dist/about_files/new-bsd.txt b/packaging/jetty-server/src/main/dist/about_files/new-bsd.txt
deleted file mode 100644
index 1d256c2..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/new-bsd.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-BSD-style License
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, 
-this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation 
-and/or other materials provided with the distribution.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/about_files/slf4j.txt b/packaging/jetty-server/src/main/dist/about_files/slf4j.txt
deleted file mode 100644
index 371607c..0000000
--- a/packaging/jetty-server/src/main/dist/about_files/slf4j.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/packaging/jetty-server/src/main/dist/bin/checkJava.bat b/packaging/jetty-server/src/main/dist/bin/checkJava.bat
deleted file mode 100644
index 8df7848..0000000
--- a/packaging/jetty-server/src/main/dist/bin/checkJava.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-rem Script for checking we have the right version of Java.
-
-if "%JAVA_HOME%" == "" (
-  echo The JAVA_HOME environment variable is not defined.
-  exit /B 1
-)
-if "%CLASSPATH%" == "" (
-  echo The CLASSPATH environment variable is not defined.
-  exit /B 1
-)
-
-rem Run java version check with the discovered java jvm.
-"%JAVA_HOME%\bin\java" -classpath "%CLASSPATH%" org.eclipse.virgo.util.env.JavaVersionChecker
-
-rem If non-zero exit then either we cannot find the checker or the Java version is incorrect.
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/jetty-server/src/main/dist/bin/dmk.bat b/packaging/jetty-server/src/main/dist/bin/dmk.bat
deleted file mode 100644
index 4a90f8e..0000000
--- a/packaging/jetty-server/src/main/dist/bin/dmk.bat
+++ /dev/null
@@ -1,288 +0,0 @@
-@echo off
-rem Script for starting and stopping the kernel
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Derive full path for script (includes trailing backslash)
-  set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
-  call "%SCRIPT_DIR%setupVars.bat"
-  if not "%ERRORLEVEL%"=="0" (
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B %ERRORLEVEL%
-  )
-) else (
-  echo Cannot set up environment. "setupVars.bat" file missing.
-  if "%OS%" == "Windows_NT" endlocal
-  exit /B 1
-)
-
-rem Select command we are to run
-
-  rem First parm is command
-    set COMMAND=%~1
-    rem Rest are parameters - shift done in subroutines
-   
-  rem Switch on COMMAND in {"start","stop"}
-
-    if "%COMMAND%" == "start" (
-      call :doStartCommand %*
-      if "%OS%" == "Windows_NT" endlocal
-      exit /B 0
-    )
-
-    if "%COMMAND%" == "stop"  (
-      call :doStopCommand  %*
-      if "%OS%" == "Windows_NT" endlocal
-      exit /B 0
-    )
-
-    echo Unknown command: %COMMAND%
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B 1
-
-rem ------------------ Subroutines
-rem ------------------------------
-:doStartCommand
-
-  shift
-  rem The shift must be here :()
-
-  rem Check further file that needs to exist
-  for %%I in ("%KERNEL_HOME%\bin\jmxPermissions.vbs") do if not exist "%%~I" (
-    echo File "%%~I" does not exist but is required to continue.
-    exit /B 1
-  )
-
-  rem Set defaults
-    set CONFIG_DIR=%KERNEL_HOME%\configuration
-    set CLEAN_FLAG=
-    set NO_START_FLAG=
-    set DEBUG_FLAG=
-    set DEBUG_PORT=8000
-    set SUSPEND=n
-    if not defined JMX_PORT set JMX_PORT=9875
-    if not defined KEYSTORE_PASSWORD set KEYSTORE_PASSWORD=changeit
-    set ADDITIONAL_ARGS=
-
-  rem Loop through options
-
-  :startOptionLoop
-  if "%~1"=="" goto endStartOptionLoop
-  if "%~1"=="-debug"             goto debug
-  if "%~1"=="-clean"             goto clean
-  if "%~1"=="-configDir"         goto configDir
-  if "%~1"=="-jmxport"           goto jmxport
-  if "%~1"=="-keystore"          goto keystore
-  if "%~1"=="-keystorePassword"  goto keystorePassword
-  if "%~1"=="-noStart"           goto noStart
-  if "%~1"=="-suspend"           goto suspend
-  if "%~1"=="-shell"             goto shell
-
-  set ADDITIONAL_ARGS=%ADDITIONAL_ARGS% "%~1"
-
-  :continueStartOptionLoop
-    shift
-    goto startOptionLoop
-
-  :debug
-    set DEBUG_FLAG=1
-    set PORT_CANDIDATE=%~2
-    if not "%PORT_CANDIDATE:~0,1%"=="-" (
-      set DEBUG_PORT=%PORT_CANDIDATE%
-      shift
-    )
-    goto continueStartOptionLoop
-  :clean
-    set CLEAN_FLAG=1
-    goto continueStartOptionLoop
-  :configDir
-    set CONFIG_DIR=%~2
-    rem unless absolute, treat as relative to kernel home
-    if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDir
-    if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDir
-    set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
-  :absoluteConfigDir
-    shift
-    goto continueStartOptionLoop
-  :jmxport
-    set JMX_PORT=%~2
-    shift
-    goto continueStartOptionLoop
-  :keystore
-    set KEYSTORE_PATH=%~2
-    shift
-    goto continueStartOptionLoop
-  :keystorePassword
-    set KEYSTORE_PASSWORD=%~2
-    shift
-    goto continueStartOptionLoop
-  :noStart
-    set NO_START_FLAG=1
-    goto continueStartOptionLoop
-  :suspend
-    set SUSPEND=y
-    goto continueStartOptionLoop
-  :shell
-    set SHELL_FLAG=1
-    goto continueStartOptionLoop
-
-  :endStartOptionLoop
-
-  
-  rem Adjust permissions if necessary
-    cscript //NoLogo "%KERNEL_HOME%\bin\jmxPermissions.vbs" "%CONFIG_DIR%\"
-
-  rem Adjust options now all are known
-    if "%KEYSTORE_PATH%"=="" set KEYSTORE_PATH=%CONFIG_DIR%\keystore
-    if not "%DEBUG_FLAG%"=="" set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=%DEBUG_PORT%,server=y,suspend=%SUSPEND%
-
-  rem do Clean work:
-    if not "%CLEAN_FLAG%"=="" (
-      echo Cleaning the serviceability and working directories...
-      rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
-      rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
-      
-      set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
-    )
-
-  rem do Shell work:
-    if not "%SHELL_FLAG%"=="" ( 
-      echo "Warning: Kernel shell not supported; -shell option ignored."
-      rem set LAUNCH_OPTS=%LAUNCH_OPTS% -Forg.eclipse.virgo.kernel.shell.local=true
-    )
-
-  rem Set JMX options
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT% 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.authenticate=true 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.login.config=virgo-kernel 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.access.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.jmxremote.access.properties" 
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStore="%KEYSTORE_PATH%" 
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWORD% 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl=true 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl.need.client.auth=false
-
-    if not "%NO_START_FLAG%"=="" goto :eof
-    rem ensure that the tmp directory exists:
-      set TMP_DIR="%KERNEL_HOME%\work\tmp"
-      if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
-
-       set JAVA_OPTS=-Xmx1024m -XX:MaxMetaspaceSize=512m %JAVA_OPTS%
-    rem Run the server
-  
-      rem Marshall parameters
-      set KERNEL_JAVA_PARMS=%JAVA_OPTS% %DEBUG_OPTS% %JMX_OPTS%
-
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:+HeapDumpOnOutOfMemoryError 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:ErrorFile="%KERNEL_HOME%\serviceability\error.log" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djdk.management.heapdump.allowAnyFileSuffix=true"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:HeapDumpPath="%KERNEL_HOME%\serviceability\heap_dump.hprof"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.security.auth.login.config="%CONFIG_DIR%\org.eclipse.virgo.kernel.authentication.config" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djetty.home="%KERNEL_HOME%\jetty"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" 
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Declipse.ignoreApp="true" 
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.install.area="%KERNEL_HOME%"
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.configuration.area="%KERNEL_HOME%\work" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.frameworkClassPath="%FWCLASSPATH%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.endorsed.dirs="%KERNEL_HOME%\lib\endorsed"
-      
-      rem If Windows 10 set system property os.name=win32, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=486353	
-	  for /f "tokens=4 delims=] " %%i in ('ver') do set VIRGO_DETECTED_WIN_VERSION=%%i 
-      if "%VIRGO_DETECTED_WIN_VERSION:~0,1%"=="1" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dos.name=win32
-  
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.equinox.launcher.Main
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %LAUNCH_OPTS%
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %ADDITIONAL_ARGS%
-
-      rem Now run it
-        PUSHD %KERNEL_HOME%
-        "%JAVA_HOME%\bin\java" %KERNEL_JAVA_PARMS%
-        POPD
-
-goto :eof
-
-rem ------------------------------
-:doStopCommand
-  
-  shift
-  rem The shift must be here :()
-
-  rem Set defaults
-  set CONFIG_DIR=%KERNEL_HOME%\configuration
-  if not defined TRUSTSTORE_PATH set TRUSTSTORE_PATH=%CONFIG_DIR%\keystore
-  if not defined TRUSTSTORE_PASSWORD set TRUSTSTORE_PASSWORD=changeit
-  if not defined JMX_PORT set JMX_PORT=9875
-  set OTHER_ARGS=
-
-  rem Loop through options
-  :stopOptionLoop
-
-  if "%~1"=="" goto endStopOptionLoop  
-  if "%~1"=="-truststore" goto truststoreStop
-  if "%~1"=="-truststorePassword" goto truststorePasswordStop
-  if "%~1"=="-configDir" goto configDirStop 
-  if "%~1"=="-jmxport" goto jmxportStop
-  
-  set OTHER_ARGS=%OTHER_ARGS% "%~1"
-    
-  :continueStopOptionLoop
-  shift
-  goto stopOptionLoop
-
-  :truststoreStop
-  set TRUSTSTORE_PATH=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :truststorePasswordStop
-  set TRUSTSTORE_PASSWORD=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :configDirStop
-    set CONFIG_DIR=%~2
-    rem unless absolute, treat as relative to kernel home
-    if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDirStop
-    if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDirStop
-    set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
-  :absoluteConfigDirStop
-    shift
-    goto continueStopOptionLoop
-
-  :jmxportStop
-  set JMX_PORT=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :endStopOptionLoop
-
-  rem Call shutdown client
-
-    rem Extend JMX options
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%"
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
-    set OTHER_ARGS=%OTHER_ARGS% -jmxport %JMX_PORT%
-
-    rem Marshall parameters
-    set SHUTDOWN_PARMS= %JAVA_OPTS% %JMX_OPTS%
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -classpath "%CLASSPATH%"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% org.eclipse.virgo.nano.shutdown.ShutdownClient
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% %OTHER_ARGS%
-
-    rem Run Java program
-    PUSHD %KERNEL_HOME%
-    "%JAVA_HOME%\bin\java" %SHUTDOWN_PARMS%
-    POPD
-
-goto :eof
diff --git a/packaging/jetty-server/src/main/dist/bin/jconsole.bat b/packaging/jetty-server/src/main/dist/bin/jconsole.bat
deleted file mode 100644
index 4cbe553..0000000
--- a/packaging/jetty-server/src/main/dist/bin/jconsole.bat
+++ /dev/null
@@ -1,54 +0,0 @@
-@echo off
-rem Script for starting jconsole
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Find root drive and path for current bat file directory (includes trailing backslash)
-  set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
-  call "%SCRIPT_DIR%setupVars.bat"
-  if not "%ERRORLEVEL%"=="0" (
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B %ERRORLEVEL%
-  )
-) else (
-  echo Cannot set up environment. "setupVars.bat" file missing.
-  if "%OS%" == "Windows_NT" endlocal
-  exit /B 1
-)
-
-rem Set defaults
-  set TRUSTSTORE_PATH=%KERNEL_HOME%\configuration\keystore
-  set TRUSTSTORE_PASSWORD=changeit
-  set OTHER_ARGS=
-  
-:Loop
-  if "%~1"=="" goto EndLoop
-
-  if "%~1"=="-truststore" (
-    set TRUSTSTORE_PATH=%~2
-    shift
-    shift
-    goto Loop
-  ) 
-  if "%~1"=="-truststorePassword" (
-    set TRUSTSTORE_PASSWORD=%~2
-    shift
-    shift
-    goto Loop
-  )
-  rem Accumulate extra parameters.
-    set OTHER_ARGS=%OTHER_ARGS% "%~1"
-    shift
-  goto Loop
-:EndLoop
-
-set JMX_OPTS=%JMX_OPTS% -J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type 
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%" 
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
-
-"%JAVA_HOME%\bin\jconsole" %JMX_OPTS% %OTHER_ARGS%
-
-if "%OS%" == "Windows_NT" endlocal
-goto :eof
diff --git a/packaging/jetty-server/src/main/dist/bin/jmxPermissions.vbs b/packaging/jetty-server/src/main/dist/bin/jmxPermissions.vbs
deleted file mode 100644
index 0184607..0000000
--- a/packaging/jetty-server/src/main/dist/bin/jmxPermissions.vbs
+++ /dev/null
@@ -1,81 +0,0 @@
-configFolder = Wscript.Arguments.Item(0)
-
-'WScript.Echo "Fixing permissions on " & configFolder
-
-Set objWMIService = GetObject("winmgmts:\\.\root\CIMV2") 'Load up WMI with the right dll
-
-Dim files(0)
-files(0) = "org.eclipse.virgo.kernel.jmxremote.access.properties"
-
-For Each file In files
-	updateInheritance(configFolder & file)
-	updateOwnership(configFolder & file)
-	updatePermissions(configFolder & file)
-Next 
-
-Sub updateInheritance(file)
-	'WScript.Echo "Updating inheritance of " & file
-	
-	Const SE_DACL_PRESENT = 4
-	Const SE_DACL_PROTECTED = 4096
-	Const SE_SELF_RELATIVE = 32768
-
-	Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
-    objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
-	objSecurityDescriptor.ControlFlags = SE_DACL_PRESENT + SE_DACL_PROTECTED + SE_SELF_RELATIVE
-
-	Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
-	Set objInParam = objMethod.inParameters.SpawnInstance_()
-	objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
-	objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-	
-	'WScript.Echo "Updated inheritance of " & file
-End Sub
-
-Sub updateOwnership(file)
-	'WScript.Echo "Updating ownership of " & file
-	Set objDataFile = objWMIService.Get("CIM_DataFile.Name='" & file & "'")
-
-	Set objMethod = objDataFile.Methods_("TakeOwnerShipEx")
-	Set objInParam = objMethod.inParameters.SpawnInstance_()
-
-	objDataFile.ExecMethod_ "TakeOwnerShipEx", objInParam
-
-	'WScript.Echo "Updated ownership of " & file
-End Sub
-
-Sub updatePermissions(file)	
-	'WScript.Echo "Updating permissions of " & file
-	
-	Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
-    objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
-	Set WshNetwork = WScript.CreateObject("WScript.Network")
-	
-	Dim foundAce
-	foundAce = "false"
-	
-	'Search for an ACE for the current user as there is no robust, portable way of creating such an ACE from scratch in VBScript.
-	Dim specificAce(0)
-	For Each ace in objSecurityDescriptor.DACL
-		If ace.Trustee.Name = WshNetwork.UserName Then
-			Set specificAce(0) = ace
-			foundAce = "true"
-		End If
-	Next
-	
-	If foundAce = "true" Then
-		objSecurityDescriptor.DACL = specificAce
-
-		Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
-		Set objInParam = objMethod.inParameters.SpawnInstance_()
-		objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
-		objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-		
-		'WScript.Echo "Updated permissions of " & file
-	Else
-		WScript.Echo "WARNING: jmxPermissions.vbs did not update the permissions of " & file & ". Check the file has the correct permissions."
-	End If
-	
-End Sub
diff --git a/packaging/jetty-server/src/main/dist/bin/setupClasspath.bat b/packaging/jetty-server/src/main/dist/bin/setupClasspath.bat
deleted file mode 100644
index 30e157c..0000000
--- a/packaging/jetty-server/src/main/dist/bin/setupClasspath.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Check JAVA_HOME and KERNEL_HOME variables
-if "%JAVA_HOME%" == "" (
-  echo The JAVA_HOME environment variable is not defined.
-  exit /B 1
-)
-if "%KERNEL_HOME%" == "" (
-  echo The KERNEL_HOME environment variable is not defined.
-  exit /B 1
-)
-
-rem Construct the CLASSPATH list from the Kernel lib directory.
-for %%G in ("%KERNEL_HOME%\lib\*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.osgi_*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.equinox.console.ssh_*.jar") do call :AppendToClasspath "%%G"
-
-rem Check if there are JAR files in the lib directory.
-if "%CLASSPATH%" == "" (
-  echo No JAR files found in %KERNEL_HOME%\lib
-  exit /B 1
-)
-
-rem Remove leading semi-colon if present
-if "%CLASSPATH:~0,1%"==";" set CLASSPATH=%CLASSPATH:~1%
-if "%FWCLASSPATH:~0,1%"=="," set FWCLASSPATH=%FWCLASSPATH:~1%
-exit /B 0
-
-:AppendToClasspath
-  set CLASSPATH=%CLASSPATH%;%~1
-  set FWCLASSPATH=%FWCLASSPATH%,file:///%~1
-  goto :eof
diff --git a/packaging/jetty-server/src/main/dist/bin/setupVars.bat b/packaging/jetty-server/src/main/dist/bin/setupVars.bat
deleted file mode 100644
index a5d7772..0000000
--- a/packaging/jetty-server/src/main/dist/bin/setupVars.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Set up env vars needed for dmk.bat and jconsole.bat (with user-pluggable mods if present)
-
-if "%SCRIPT_DIR%"=="" (
-  echo Called setupVars.bat out of context.
-  exit /B 1
-)
-
-rem Derive KERNEL_HOME full path from script's parent (no backslash)
-  for %%I in ("%SCRIPT_DIR%..") do set KERNEL_HOME=%%~fsI
-
-rem Check files exist (exit if not)
-  set ChkLst="%KERNEL_HOME%\bin\setupClasspath.bat","%KERNEL_HOME%\bin\checkJava.bat"
-
-  for %%I in (%ChkLst%) do if not exist "%%~I" (
-    echo File "%%~I" does not exist but is required.
-    exit /B 1
-  )
-
-rem set up the classpath (check result)
-  call "%KERNEL_HOME%\bin\setupClasspath.bat"
-  if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-rem Run Java Version check (uses JAVA_HOME) (check result)
-  call "%KERNEL_HOME%\bin\checkJava.bat"
-  if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-	
-rem Execute user setenv script if needed (ignore result)
-  if exist "%KERNEL_HOME%\bin\setenv.bat" call "%KERNEL_HOME%\bin\setenv.bat"
-
-goto :eof
diff --git a/packaging/jetty-server/src/main/dist/bin/shutdown.bat b/packaging/jetty-server/src/main/dist/bin/shutdown.bat
deleted file mode 100644
index a2a1ff4..0000000
--- a/packaging/jetty-server/src/main/dist/bin/shutdown.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" stop %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/jetty-server/src/main/dist/bin/startup.bat b/packaging/jetty-server/src/main/dist/bin/startup.bat
deleted file mode 100644
index 76e1618..0000000
--- a/packaging/jetty-server/src/main/dist/bin/startup.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" start %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/jetty-server/src/main/dist/configuration/etc/gosh_profile b/packaging/jetty-server/src/main/dist/configuration/etc/gosh_profile
deleted file mode 100644
index f0c9b5e..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/etc/gosh_profile
+++ /dev/null
@@ -1,39 +0,0 @@
-# default gosh_profile
-# only read if etc/gosh_profile doesn't exist relative to the System property
-# gosh.home or failing that the current directory.
-
-# catch all exceptions from this script to avoid it aborting startup
-try {
-
-  # ensure equinox commands are found first
-  SCOPE = equinox:*
-
-  # add methods on BundleContext object as commands
-  #addcommand context ${.context} (${.context} class)
-  # bug: above invokes (String, Object, String) instead of (String, Object, Class)
-  addcommand context ${.context}
-
-  # add methods on System object as commands
-  addcommand system (((${.context} bundles) 0) loadclass java.lang.System)
-
-  # alias to print full stack trace
-  e = { $exception printStackTrace }
-
-  ## disable console auto-formatting of each result
-  #  you will then need to explicitly use the 'format' command
-  #  to print the result of commands that don't write to stdout.
-  #.Gogo.format = false
-
-  ## disable printing the formatted result of a command into pipelines
-  #.Format.Pipe = false
-
-  # set prompt
-  prompt = 'osgi> '
-
-  # print welcome message
-  # cat ($0 resolve motd)
-} {
-    echo "$0: ERROR: $exception"
-}
-
-# end
diff --git a/packaging/jetty-server/src/main/dist/configuration/java-server.profile b/packaging/jetty-server/src/main/dist/configuration/java-server.profile
deleted file mode 100644
index f52afba..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/java-server.profile
+++ /dev/null
@@ -1,234 +0,0 @@
-org.osgi.framework.system.packages = \
- javax.accessibility,\
- javax.activation,\
- javax.activation;version="1.1.1",\
- javax.activity,\
- javax.annotation,\
- javax.annotation;version="1.0.0",\
- javax.annotation;version="1.1.0",\
- javax.annotation.processing,\
- javax.crypto,\
- javax.crypto.interfaces,\
- javax.crypto.spec,\
- javax.imageio,\
- javax.imageio.event,\
- javax.imageio.metadata,\
- javax.imageio.plugins.bmp,\
- javax.imageio.plugins.jpeg,\
- javax.imageio.spi,\
- javax.imageio.stream,\
- javax.jws,\
- javax.jws;version="2.0",\
- javax.jws.soap,\
- javax.jws.soap;version="2.0",\
- javax.lang.model,\
- javax.lang.model.element,\
- javax.lang.model.type,\
- javax.lang.model.util,\
- javax.management,\
- javax.management.loading,\
- javax.management.modelmbean,\
- javax.management.monitor,\
- javax.management.openmbean,\
- javax.management.relation,\
- javax.management.remote,\
- javax.management.remote.rmi,\
- javax.management.timer,\
- javax.naming,\
- javax.naming.directory,\
- javax.naming.event,\
- javax.naming.ldap,\
- javax.naming.spi,\
- javax.net,\
- javax.net.ssl,\
- javax.print,\
- javax.print.attribute,\
- javax.print.attribute.standard,\
- javax.print.event,\
- javax.rmi,\
- javax.rmi.CORBA,\
- javax.rmi.ssl,\
- javax.script,\
- javax.script;version="1.1",\
- javax.security.auth,\
- javax.security.auth.callback,\
- javax.security.auth.kerberos,\
- javax.security.auth.login,\
- javax.security.auth.spi,\
- javax.security.auth.x500,\
- javax.security.cert,\
- javax.security.sasl,\
- javax.sound.midi,\
- javax.sound.midi.spi,\
- javax.sound.sampled,\
- javax.sound.sampled.spi,\
- javax.sql,\
- javax.sql.rowset,\
- javax.sql.rowset.serial,\
- javax.sql.rowset.spi,\
- javax.swing,\
- javax.swing.border,\
- javax.swing.colorchooser,\
- javax.swing.event,\
- javax.swing.filechooser,\
- javax.swing.plaf,\
- javax.swing.plaf.basic,\
- javax.swing.plaf.metal,\
- javax.swing.plaf.multi,\
- javax.swing.plaf.nimbus,\
- javax.swing.plaf.synth,\
- javax.swing.table,\
- javax.swing.text,\
- javax.swing.text.html,\
- javax.swing.text.html.parser,\
- javax.swing.text.rtf,\
- javax.swing.tree,\
- javax.swing.undo,\
- javax.tools,\
- javax.transaction,\
- javax.transaction;version="1.0.1",\
- javax.transaction;version="1.1.0",\
- javax.transaction.xa,\
- javax.transaction.xa;version="1.0.1",\
- javax.transaction.xa;version="1.1.0",\
- javax.xml,\
- javax.xml;version="1.0.1",\
- javax.xml.bind,\
- javax.xml.bind;version="2.0",\
- javax.xml.bind.annotation,\
- javax.xml.bind.annotation;version="2.0",\
- javax.xml.bind.annotation.adapters,\
- javax.xml.bind.annotation.adapters;version="2.0",\
- javax.xml.bind.attachment,\
- javax.xml.bind.attachment;version="2.0",\
- javax.xml.bind.helpers,\
- javax.xml.bind.helpers;version="2.0",\
- javax.xml.bind.util,\
- javax.xml.bind.util;version="2.0",\
- javax.xml.crypto,\
- javax.xml.crypto;version="1.0",\
- javax.xml.crypto.dom,\
- javax.xml.crypto.dom;version="1.0",\
- javax.xml.crypto.dsig,\
- javax.xml.crypto.dsig;version="1.0",\
- javax.xml.crypto.dsig.dom,\
- javax.xml.crypto.dsig.dom;version="1.0",\
- javax.xml.crypto.dsig.keyinfo,\
- javax.xml.crypto.dsig.keyinfo;version="1.0",\
- javax.xml.crypto.dsig.spec,\
- javax.xml.crypto.dsig.spec;version="1.0",\
- javax.xml.datatype,\
- javax.xml.namespace,\
- javax.xml.parsers,\
- javax.xml.soap,\
- javax.xml.soap;version="1.3.0",\
- javax.xml.stream,\
- javax.xml.stream;version="1.0.1",\
- javax.xml.stream.events,\
- javax.xml.stream.events;version="1.0.1",\
- javax.xml.stream.util,\
- javax.xml.stream.util;version="1.0.1",\
- javax.xml.transform,\
- javax.xml.transform.dom,\
- javax.xml.transform.sax,\
- javax.xml.transform.stax,\
- javax.xml.transform.stream,\
- javax.xml.validation,\
- javax.xml.ws,\
- javax.xml.ws;version="2.1.1",\
- javax.xml.ws.handler,\
- javax.xml.ws.handler;version="2.1.1",\
- javax.xml.ws.handler.soap,\
- javax.xml.ws.handler.soap;version="2.1.1",\
- javax.xml.ws.http,\
- javax.xml.ws.http;version="2.1.1",\
- javax.xml.ws.soap,\
- javax.xml.ws.soap;version="2.1.1",\
- javax.xml.ws.spi,\
- javax.xml.ws.spi;version="2.1.1",\
- javax.xml.ws.spi.http,\
- javax.xml.ws.spi.http;version="2.1.1",\
- javax.xml.ws.wsaddressing,\
- javax.xml.ws.wsaddressing;version="2.1.1",\
- javax.xml.xpath,\
- org.eclipse.virgo.kernel.equinox.extensions,\
- org.eclipse.virgo.kernel.equinox.extensions;version="3.7.0",\
- org.eclipse.virgo.kernel.equinox.extensions.hooks,\
- org.eclipse.virgo.kernel.equinox.extensions.hooks;version="3.7.0",\
- org.ietf.jgss,\
- org.omg.CORBA,\
- org.omg.CORBA_2_3,\
- org.omg.CORBA_2_3.portable,\
- org.omg.CORBA.DynAnyPackage,\
- org.omg.CORBA.ORBPackage,\
- org.omg.CORBA.portable,\
- org.omg.CORBA.TypeCodePackage,\
- org.omg.CosNaming,\
- org.omg.CosNaming.NamingContextExtPackage,\
- org.omg.CosNaming.NamingContextPackage,\
- org.omg.Dynamic,\
- org.omg.DynamicAny,\
- org.omg.DynamicAny.DynAnyFactoryPackage,\
- org.omg.DynamicAny.DynAnyPackage,\
- org.omg.IOP,\
- org.omg.IOP.CodecFactoryPackage,\
- org.omg.IOP.CodecPackage,\
- org.omg.Messaging,\
- org.omg.PortableInterceptor,\
- org.omg.PortableInterceptor.ORBInitInfoPackage,\
- org.omg.PortableServer,\
- org.omg.PortableServer.CurrentPackage,\
- org.omg.PortableServer.POAManagerPackage,\
- org.omg.PortableServer.POAPackage,\
- org.omg.PortableServer.portable,\
- org.omg.PortableServer.ServantLocatorPackage,\
- org.omg.SendingContext,\
- org.omg.stub.java.rmi,\
- org.w3c.dom,\
- org.w3c.dom.bootstrap,\
- org.w3c.dom.css,\
- org.w3c.dom.events,\
- org.w3c.dom.html,\
- org.w3c.dom.ls,\
- org.w3c.dom.ranges,\
- org.w3c.dom.stylesheets,\
- org.w3c.dom.traversal,\
- org.w3c.dom.views,\
- org.w3c.dom.xpath,\
- org.xml.sax,\
- org.xml.sax.ext,\
- org.xml.sax.helpers
-org.osgi.framework.bootdelegation = \
- org.eclipse.virgo.nano.authentication,\
- javax.*,\
- javax.xml.*,\
- org.apache.xerces.jaxp.*,\
- org.ietf.jgss,\
- org.omg.*,\
- org.w3c.*,\
- org.xml.*,\
- sun.*,\
- com.sun.*
-org.osgi.framework.executionenvironment = \
- OSGi/Minimum-1.0,\
- OSGi/Minimum-1.1,\
- OSGi/Minimum-1.2,\
- JavaSE/compact1-1.8,\
- JavaSE/compact2-1.8,\
- JavaSE/compact3-1.8,\
- JRE-1.1,\
- J2SE-1.2,\
- J2SE-1.3,\
- J2SE-1.4,\
- J2SE-1.5,\
- JavaSE-1.6,\
- JavaSE-1.7,\
- JavaSE-1.8
-org.osgi.framework.system.capabilities = \
- osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
- osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8",\
- osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8",\
- osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8",\
- osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8"
-osgi.java.profile.name = Virgo-Java8
diff --git a/packaging/jetty-server/src/main/dist/configuration/keystore b/packaging/jetty-server/src/main/dist/configuration/keystore
deleted file mode 100644
index 9684caa..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/keystore
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.authentication.config b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.authentication.config
deleted file mode 100644
index 44c5d21..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.authentication.config
+++ /dev/null
@@ -1,6 +0,0 @@
-virgo-kernel {
-	org.eclipse.virgo.nano.authentication.KernelLoginModule REQUIRED;
-};
-equinox_console {
-	org.eclipse.virgo.nano.authentication.KernelLoginModule REQUIRED;
-};
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties
deleted file mode 100644
index ba89979..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties
+++ /dev/null
@@ -1 +0,0 @@
-admin=readwrite
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.properties b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.properties
deleted file mode 100644
index c72631f..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-########################
-# Deployer Configuration
-########################
-# Note: use 0 to disable deployment timeouts
-deployer.timeout=300
-deployer.pickupDirectory=pickup
-deployer.scanIntervalMillis=1000
-deployer.unpackBundles=true
-
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.users.properties b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.users.properties
deleted file mode 100644
index 7ab19e1..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.kernel.users.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-##################
-# User definitions
-##################
-user.admin=admin
-
-##################
-# Role definitions
-##################
-role.admin=admin
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.medic.properties b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.medic.properties
deleted file mode 100644
index 5c5f1cf..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.medic.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-dump.root.directory=serviceability/dump
-log.wrapSysOut=true
-log.wrapSysErr=true
-log.dump.level=DEBUG
-log.dump.bufferSize=10000
-log.dump.pattern=[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n
-log.jul.consoleHandler=false
diff --git a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.repository.properties b/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.repository.properties
deleted file mode 100644
index 5e7de2b..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/org.eclipse.virgo.repository.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-ext.type=external
-ext.searchPattern=repository/ext/{artifact}
-
-usr.type=watched
-usr.watchDirectory=repository/usr
-
-chain=ext,usr
diff --git a/packaging/jetty-server/src/main/dist/configuration/osgi.console.properties b/packaging/jetty-server/src/main/dist/configuration/osgi.console.properties
deleted file mode 100644
index 5400fc1..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/osgi.console.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-telnet.enabled=false
-telnet.port=2401
-telnet.host=localhost
-ssh.enabled=false
-ssh.port=2402
-ssh.host=localhost
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/configuration/serviceability.xml b/packaging/jetty-server/src/main/dist/configuration/serviceability.xml
deleted file mode 100644
index 05e9d49..0000000
--- a/packaging/jetty-server/src/main/dist/configuration/serviceability.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<configuration>
-
-	<jmxConfigurator />
-
-	<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
-
-	<appender name="SIFTED_LOG_FILE" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator>
-			<Key>applicationName</Key>
-			<DefaultValue>virgo-jetty-server</DefaultValue>
-		</discriminator>
-		<sift>
-			<appender name="${applicationName}_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>serviceability/logs/${applicationName}/log.log</file>
-				<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-					<FileNamePattern>serviceability/logs/${applicationName}/log_%i.log</FileNamePattern>
-					<MinIndex>1</MinIndex>
-					<MaxIndex>4</MaxIndex>
-				</rollingPolicy>
-				<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-					<MaxFileSize>10MB</MaxFileSize>
-				</triggeringPolicy>
-				<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-					<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n</Pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>
-	
-	<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>serviceability/logs/log.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<FileNamePattern>serviceability/logs/log_%i.log</FileNamePattern>
-			<MinIndex>1</MinIndex>
-			<MaxIndex>4</MaxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<MaxFileSize>10MB</MaxFileSize>
-		</triggeringPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n</Pattern>
-		</encoder>
-	</appender>
-
-	<appender name="EVENT_LOG_STDOUT" class="org.eclipse.virgo.medic.log.logback.ReroutingAwareConsoleAppender">
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
-		</encoder>
-	</appender>
-
-	<appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>serviceability/eventlogs/eventlog.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<FileNamePattern>serviceability/eventlogs/eventlog_%i.log</FileNamePattern>
-			<MinIndex>1</MinIndex>
-			<MaxIndex>4</MaxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<MaxFileSize>10MB</MaxFileSize>
-		</triggeringPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
-		</encoder>
-	</appender>
-
-	<logger level="INFO" additivity="false" name="org.eclipse.virgo.medic.eventlog.localized">
-		<appender-ref ref="EVENT_LOG_STDOUT" />
-		<appender-ref ref="EVENT_LOG_FILE" />
-	</logger>
-	
-	<logger level="INFO" additivity="false" name="org.eclipse.virgo.medic.eventlog.default">
-		<appender-ref ref="SIFTED_LOG_FILE" />
-		<appender-ref ref="LOG_FILE" />
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="SIFTED_LOG_FILE" />
-		<appender-ref ref="LOG_FILE" />
-	</root>
-
-</configuration>
diff --git a/packaging/jetty-server/src/main/dist/epl-v10.html b/packaging/jetty-server/src/main/dist/epl-v10.html
deleted file mode 100644
index eecc800..0000000
--- a/packaging/jetty-server/src/main/dist/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/jetty/etc/jetty.xml b/packaging/jetty-server/src/main/dist/jetty/etc/jetty.xml
deleted file mode 100644
index 4851924..0000000
--- a/packaging/jetty-server/src/main/dist/jetty/etc/jetty.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!-- =============================================================== -->
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-	<!-- jetty.xml -->
-
-    <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
-    <!-- =========================================================== -->
-    <Set name="ThreadPool">
-      <!-- Default queued blocking threadpool -->
-      <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-        <Set name="minThreads">10</Set>
-        <Set name="maxThreads">200</Set>
-        <Set name="detailedDump">false</Set>
-      </New>
-    </Set>
-
-
-    <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            --> 
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.eclipse.jetty.server.Handler">
-           <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
-           <Item>
-             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <Set name="sendServerVersion">true</Set>
-    <Set name="sendDateHeader">true</Set>
-    <Set name="gracefulShutdown">1000</Set>
-    <Set name="dumpAfterStart">false</Set>
-    <Set name="dumpBeforeStop">false</Set>
-
-
-    <!-- =========================================================== -->
-    <!-- Add connector                                               -->
-    <!-- =========================================================== -->
-
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-            <Set name="host"><Property name="jetty.host" /></Set>
-            <Set name="port"><Property name="jetty.port" default="8080"/></Set>
-            <Set name="maxIdleTime">300000</Set>
-            <Set name="Acceptors">2</Set>
-            <Set name="statsOn">false</Set>
-            <Set name="confidentialPort">8443</Set>
-        <Set name="lowResourcesConnections">20000</Set>
-        <Set name="lowResourcesMaxIdleTime">5000</Set>
-          </New>
-      </Arg>
-    </Call>
-
-	<Call name="addConnector">
-		<Arg>
-			<New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-				<Set name="Port">
-					<Property name="jetty.port.ssl" default="8443"/>
-				</Set>
-				<Set name="maxIdleTime">30000</Set>
-				<Set name="Acceptors">2</Set>
-				<Set name="AcceptQueueSize">100</Set>
-				<Set name="Keystore"><Property name="jetty.home" default="."/>/etc/keystore</Set>
-				<Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-				<Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
-				<Set name="truststore"><Property name="jetty.home" default="."/>/etc/keystore</Set>
-				<Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
-			</New>
-		</Arg>
-	</Call>
-
-	<!-- jetty-deployer.xml -->
-
-    <!-- =========================================================== -->
-    <!-- Configure the deployment manager                            -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-          <Set name="useStandardBindings">false</Set>
-          <Set name="lifeCycleBindings">
-            <Array type="org.eclipse.jetty.deploy.AppLifeCycle$Binding">
-              <Item>
-                <New class="org.eclipse.jetty.osgi.boot.OSGiDeployer"/>
-              </Item>
-              <Item>
-               <New class="org.eclipse.jetty.deploy.bindings.StandardStarter"/>
-              </Item>
-              <Item>
-                <New class="org.eclipse.jetty.deploy.bindings.StandardStopper"/>
-              </Item>
-              <Item>
-              <New class="org.eclipse.jetty.osgi.boot.OSGiUndeployer"/>
-              </Item>
-            </Array>
-          </Set>
-          <Set name="contexts">
-            <Ref id="Contexts" />
-          </Set>
-          <Call name="setContextAttribute">
-            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
-          </Call>
-          <!-- Providers of OSGi Apps -->
-          <!-- Call name="addAppProvider" -->
-            <!-- Arg -->
-              <!-- New class="org.eclipse.jetty.osgi.boot.OSGiAppProvider" -->
-              <!--
-                <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-              -->
-              <!--
-                <Set name="scanInterval">5</Set>
-                <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
-                -->
-                <!-- comma separated list of bundle symbolic names that contain custom tag libraries (*.tld files) -->
-                <!-- if those bundles don't exist or can't be loaded no errors or warning will be issued!          -->
-                <!-- This default value plugs in the tld files of the reference implementation of JSF              -->
-                <!--
-                 <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldbundles" default="javax.faces.jsf-impl" /></Set>
-              </New>
-            </Arg>
-          </Call>
-          -->
-        </New>
-      </Arg>
-    </Call>
-
-	<!-- =========================================================== -->
-	<!-- Enable support for tlds in other bundles                    -->
-	<!-- =========================================================== -->
-	<Call name="setAttribute">
-          <Arg>org.eclipse.jetty.webapp.configuration</Arg>
-          <Arg>
-            <Array id="plusConfigOSGi" type="java.lang.String">
-              <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
-              <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
-              <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
-              <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
-              <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
-              <Item>org.eclipse.jetty.osgi.boot.jsp.TagLibOSGiConfiguration</Item>
-            </Array>
-          </Arg>
-	</Call>
-
-	<!-- =========================================================== -->
-	<!-- Configure Authentication Login Service                      -->
-	<!-- Realms may be configured for the entire server here, or     -->
-	<!-- they can be configured for a specific web app in a context  -->
-	<!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
-	<!-- example).                                                   -->
-	<!-- =========================================================== -->
-	<Call name="addBean">
-		<Arg>
-			<New class="org.eclipse.jetty.security.HashLoginService">
-				<Set name="name">Virgo Admin Console</Set>
-				<Set name="config"><Property name="jetty.home" default="."/>/etc/realm.properties</Set>
-				<Set name="refreshInterval">0</Set>
-			</New>
-		</Arg>
-	</Call>
-	
-	<!-- =========================================================== -->
-	<!-- Configure Request Log                                       -->
-	<!-- Request logs  may be configured for the entire server here, -->
-	<!-- or they can be configured for a specific web app in a       -->
-	<!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
-	<!-- for an example).                                            -->
-	<!-- =========================================================== -->
-	<Ref id="RequestLog">
-		<Set name="requestLog">
-			<New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-				<Set name="filename"><Property name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Set>
-				<Set name="filenameDateFormat">yyyy_MM_dd</Set>
-				<Set name="retainDays">90</Set>
-				<Set name="append">true</Set>
-				<Set name="extended">false</Set>
-				<Set name="logCookies">false</Set>
-				<Set name="LogTimeZone">GMT</Set>
-			</New>
-		</Set>
-	</Ref>
-
-</Configure>
diff --git a/packaging/jetty-server/src/main/dist/jetty/etc/keystore b/packaging/jetty-server/src/main/dist/jetty/etc/keystore
deleted file mode 100644
index 08f6cda..0000000
--- a/packaging/jetty-server/src/main/dist/jetty/etc/keystore
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/jetty/etc/realm.properties b/packaging/jetty-server/src/main/dist/jetty/etc/realm.properties
deleted file mode 100644
index 9ebdf2d..0000000
--- a/packaging/jetty-server/src/main/dist/jetty/etc/realm.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-#  <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.eclipse.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-admin: OBF:1u2a1toa1w8v1tok1u30,user,admin
-
-# This entry is for digest auth.  The credential is a MD5 hash of username:realmname:password
-digest: MD5:6e120743ad67abfbc385bc2bb754e297,user
diff --git a/packaging/jetty-server/src/main/dist/jetty/etc/webdefault.xml b/packaging/jetty-server/src/main/dist/jetty/etc/webdefault.xml
deleted file mode 100644
index 482b12d..0000000
--- a/packaging/jetty-server/src/main/dist/jetty/etc/webdefault.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- ===================================================================== -->
-<!-- This file contains the default descriptor for web applications.       -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The intent of this descriptor is to include jetty specific or common  -->
-<!-- configuration for all webapps.   If a context has a webdefault.xml    -->
-<!-- descriptor, it is applied before the contexts own web.xml file        -->
-<!--                                                                       -->
-<!-- A context may be assigned a default descriptor by:                    -->
-<!--  + Calling WebApplicationContext.setDefaultsDescriptor                -->
-<!--  + Passed an arg to addWebApplications                                -->
-<!--                                                                       -->
-<!-- This file is used both as the resource within the jetty.jar (which is -->
-<!-- used as the default if no explicit defaults descriptor is set) and it -->
-<!-- is copied to the etc directory of the Jetty distro and explicitly     -->
-<!-- by the jetty.xml file.                                                -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-<web-app 
-   xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
-   metadata-complete="true"
-   version="2.5"> 
-
-  <description>
-    Default web.xml file.  
-    This file is applied to a Web application before it's own WEB_INF/web.xml file
-  </description>
-
-  <!-- ==================================================================== -->
-  <!-- Removes static references to beans from javax.el.BeanELResolver to   -->
-  <!-- ensure webapp classloader can be released on undeploy                -->
-  <!-- ==================================================================== -->
-  <listener>
-   <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
-  </listener>
-  
-  <!-- ==================================================================== -->
-  <!-- Removes static cache of Methods from java.beans.Introspector to      -->
-  <!-- ensure webapp classloader can be released on undeploy                -->
-  <!-- ==================================================================== -->  
-  <listener>
-   <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
-  </listener>
-  
-
-  <!-- ==================================================================== -->
-  <!-- Context params to control Session Cookies                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name>
-    <param-value>127.0.0.1</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.SessionPath</param-name>
-    <param-value>/</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
-    <param-value>-1</param-value>
-  </context-param>
-  -->
-
-
-  <!-- ==================================================================== -->
-  <!-- The default servlet.                                                 -->
-  <!-- This servlet, normally mapped to /, provides the handling for static -->
-  <!-- content, OPTIONS and TRACE methods for the context.                  -->
-  <!-- The following initParameters are supported:                          -->
-  <!--                                                                      -->
-  <!--   acceptRanges     If true, range requests and responses are         -->
-  <!--                    supported                                         -->
-  <!--                                                                      -->
-  <!--   dirAllowed       If true, directory listings are returned if no    -->
-  <!--                    welcome file is found. Else 403 Forbidden.        -->
-  <!--                                                                      -->
-  <!--   welcomeServlets  If true, attempt to dispatch to welcome files     -->
-  <!--                    that are servlets, if no matching static          -->
-  <!--                    resources can be found.                           -->
-  <!--                                                                      -->
-  <!--   redirectWelcome  If true, redirect welcome file requests           -->
-  <!--                    else use request dispatcher forwards              -->
-  <!--                                                                      -->
-  <!--   gzip             If set to true, then static content will be served--> 
-  <!--                    as gzip content encoded if a matching resource is -->
-  <!--                    found ending with ".gz"                           -->
-  <!--                                                                      -->
-  <!--   resoureBase      Can be set to replace the context resource base   -->
-  <!--                                                                      -->
-  <!--   relativeResourceBase                                               -->
-  <!--                    Set with a pathname relative to the base of the   -->
-  <!--                    servlet context root. Useful for only serving     -->
-  <!--                    static content from only specific subdirectories. -->
-  <!--                                                                      -->
-  <!--   useFileMappedBuffer                                                -->
-  <!--                    If set to true (the default), a  memory mapped    -->
-  <!--                    file buffer will be used to serve static content  -->
-  <!--                    when using an NIO connector. Setting this value   -->
-  <!--                    to false means that a direct buffer will be used  -->
-  <!--                    instead. If you are having trouble with Windows   -->
-  <!--                    file locking, set this to false.                  -->
-  <!--                                                                      -->
-  <!--  cacheControl      If set, all static content will have this value   -->
-  <!--                    set as the cache-control header.                  -->
-  <!--                                                                      -->
-  <!--  maxCacheSize      Maximum size of the static resource cache         -->
-  <!--                                                                      -->
-  <!--  maxCachedFileSize Maximum size of any single file in the cache      -->
-  <!--                                                                      -->
-  <!--  maxCachedFiles    Maximum number of files in the cache              -->
-  <!--                                                                      -->
-  <!--  cacheType         "nio", "bio" or "both" to determine the type(s)   -->
-  <!--                    of resource cache. A bio cached buffer may be used-->
-  <!--                    by nio but is not as efficient as a nio buffer.   -->
-  <!--                    An nio cached buffer may not be used by bio.      -->
-  <!--                                                                      -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>aliases</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>acceptRanges</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dirAllowed</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>welcomeServlets</param-name>
-        <param-value>false</param-value>
-      </init-param>
-    <init-param>
-      <param-name>redirectWelcome</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCacheSize</param-name>
-      <param-value>256000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFileSize</param-name>
-      <param-value>10000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFiles</param-name>
-      <param-value>2048</param-value>
-    </init-param>
-    <init-param>
-      <param-name>gzip</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>useFileMappedBuffer</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <!--
-    <init-param>
-      <param-name>resourceCache</param-name>
-      <param-value>resourceCache</param-value>
-    </init-param>
-    -->
-    <!--
-    <init-param>
-      <param-name>cacheControl</param-name>
-      <param-value>max-age=3600,public</param-value>
-    </init-param>
-    -->
-    <load-on-startup>0</load-on-startup>
-  </servlet> 
-
-  <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping>
-  
-
-  <!-- ==================================================================== -->
-  <!-- JSP Servlet                                                          -->
-  <!-- This is the jasper JSP servlet from the jakarta project              -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Glassfish to support JSP pages.  Traditionally, this servlet -->
-  <!-- is mapped to URL patterh "*.jsp".  This servlet supports the         -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   checkInterval       If development is false and reloading is true, -->
-  <!--                       background compiles are enabled. checkInterval -->
-  <!--                       is the time in seconds between checks to see   -->
-  <!--                       if a JSP page needs to be recompiled. [300]    -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the Ant documenation for more      -->
-  <!--                       information. [javac]                           -->
-  <!--                                                                      -->
-  <!--   classdebuginfo      Should the class file be compiled with         -->
-  <!--                       debugging information?  [true]                 -->
-  <!--                                                                      -->
-  <!--   classpath           What class path should I use while compiling   -->
-  <!--                       generated servlets?  [Created dynamically      -->
-  <!--                       based on the current web application]          -->
-  <!--                       Set to ? to make the container explicitly set  -->
-  <!--                       this parameter.                                -->
-  <!--                                                                      -->
-  <!--   development         Is Jasper used in development mode (will check -->
-  <!--                       for JSP modification on every access)?  [true] -->
-  <!--                                                                      -->
-  <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled  [true]                                -->
-  <!--                                                                      -->
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-  <!--                       a separate JVM is used for JSP page compiles   -->
-  <!--                       from the one Tomcat is running in. [true]      -->
-  <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
-  <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF-8]                          -->
-  <!--                                                                      -->
-  <!--   keepgenerated       Should we keep the generated Java source code  -->
-  <!--                       for each page instead of deleting it? [true]   -->
-  <!--                                                                      -->
-  <!--   logVerbosityLevel   The level of detailed messages to be produced  -->
-  <!--                       by this servlet.  Increasing levels cause the  -->
-  <!--                       generation of more messages.  Valid values are -->
-  <!--                       FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
-  <!--                       [WARNING]                                      -->
-  <!--                                                                      -->
-  <!--   mappedfile          Should we generate static content with one     -->
-  <!--                       print statement per input line, to ease        -->
-  <!--                       debugging?  [false]                            -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-  <!--   reloading           Should Jasper check for modified JSPs?  [true] -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
-  <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
-  <!--                                                                      -->
-  <!--   scratchdir          What scratch directory should we use when      -->
-  <!--                       compiling JSP pages?  [default work directory  -->
-  <!--                       for the current web application]               -->
-  <!--                                                                      -->
-  <!--   tagpoolMaxSize      The maximum tag handler pool size  [5]         -->
-  <!--                                                                      -->
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet  [false]  -->
-  <!--                                                                      -->
-  <!-- If you wish to use Jikes to compile JSP pages:                       -->
-  <!--   Set the init parameter "compiler" to "jikes".  Define              -->
-  <!--   the property "-Dbuild.compiler.emacs=true" when starting Jetty     -->
-  <!--   to cause Jikes to emit error messages in a format compatible with  -->
-  <!--   Jasper.                                                            -->
-  <!--   If you get an error reporting that jikes can't use UTF-8 encoding, -->
-  <!--   try setting the init parameter "javaEncoding" to "ISO-8859-1".     -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    <init-param>
-        <param-name>logVerbosityLevel</param-name>
-        <param-value>DEBUG</param-value>
-    </init-param>
-    <init-param>
-        <param-name>fork</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <init-param>
-        <param-name>xpoweredBy</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <!--  
-    <init-param>
-        <param-name>classpath</param-name>
-        <param-value>?</param-value>
-    </init-param>
-    -->
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping> 
-    <servlet-name>jsp</servlet-name> 
-    <url-pattern>*.jsp</url-pattern> 
-    <url-pattern>*.jspf</url-pattern>
-    <url-pattern>*.jspx</url-pattern>
-    <url-pattern>*.xsp</url-pattern>
-    <url-pattern>*.JSP</url-pattern> 
-    <url-pattern>*.JSPF</url-pattern>
-    <url-pattern>*.JSPX</url-pattern>
-    <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-  
-  <!-- ==================================================================== -->
-  <!-- Dynamic Servlet Invoker.                                             -->
-  <!-- This servlet invokes anonymous servlets that have not been defined   -->
-  <!-- in the web.xml or by other means. The first element of the pathInfo  -->
-  <!-- of a request passed to the envoker is treated as a servlet name for  -->
-  <!-- an existing servlet, or as a class name of a new servlet.            -->
-  <!-- This servlet is normally mapped to /servlet/*                        -->
-  <!-- This servlet support the following initParams:                       -->
-  <!--                                                                      -->
-  <!--  nonContextServlets       If false, the invoker can only load        -->
-  <!--                           servlets from the contexts classloader.    -->
-  <!--                           This is false by default and setting this  -->
-  <!--                           to true may have security implications.    -->
-  <!--                                                                      -->
-  <!--  verbose                  If true, log dynamic loads                 -->
-  <!--                                                                      -->
-  <!--  *                        All other parameters are copied to the     -->
-  <!--                           each dynamic servlet as init parameters    -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- Uncomment for dynamic invocation
-  <servlet>
-    <servlet-name>invoker</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlet.Invoker</servlet-class>
-    <init-param>
-      <param-name>verbose</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>nonContextServlets</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dynamicParam</param-name>
-      <param-value>anyValue</param-value>
-    </init-param>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
-  -->
-
-
-
-  <!-- ==================================================================== -->
-  <session-config>
-    <session-timeout>30</session-timeout>
-  </session-config>
-
-  <!-- ==================================================================== -->
-  <!-- Default MIME mappings                                                -->
-  <!-- The default MIME mappings are provided by the mime.properties        -->
-  <!-- resource in the org.eclipse.jetty.server.jar file.  Additional or modified  -->
-  <!-- mappings may be specified here                                       -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <mime-mapping>
-    <extension>mysuffix</extension>
-    <mime-type>mymime/type</mime-type>
-  </mime-mapping>
-  -->
-
-  <!-- ==================================================================== -->
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-  <!-- ==================================================================== -->
-  <locale-encoding-mapping-list>
-    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
-    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
-  </locale-encoding-mapping-list>
-  
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>Disable TRACE</web-resource-name>
-      <url-pattern>/</url-pattern>
-      <http-method>TRACE</http-method>
-    </web-resource-collection>
-    <auth-constraint/>
-  </security-constraint>
-  
-</web-app>
-
diff --git a/packaging/jetty-server/src/main/dist/jetty/logs/placeholder b/packaging/jetty-server/src/main/dist/jetty/logs/placeholder
deleted file mode 100644
index 8e1a7d7..0000000
--- a/packaging/jetty-server/src/main/dist/jetty/logs/placeholder
+++ /dev/null
@@ -1 +0,0 @@
-ignore placeholder to create empty jetty/logs folder in distribution
diff --git a/packaging/jetty-server/src/main/dist/notice.html b/packaging/jetty-server/src/main/dist/notice.html
deleted file mode 100644
index 0ee73f4..0000000
--- a/packaging/jetty-server/src/main/dist/notice.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Foundation Software User Agreement</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>April 14, 2010</P>
-
-<H3>Usage Of Content</H3>
-
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</P>
-
-<H3>Applicable Licenses</H3>
-
-<P>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-   For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</P>
-
-<UL>
-       <LI>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</LI>
-       <LI>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java¬ô ARchive) in a directory named "plugins".</LI>
-       <LI>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</LI>
-       <LI>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</LI>
-</UL>
-
-<P>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</P>
-
-<UL>
-       <LI>The top-level (root) directory</LI>
-       <LI>Plug-in and Fragment directories</LI>
-       <LI>Inside Plug-ins and Fragments packaged as JARs</LI>
-       <LI>Sub-directories of the directory named "src" of certain Plug-ins</LI>
-       <LI>Feature directories</LI>
-</UL>
-
-<P>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</P>
-
-<P>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-
-<UL>
-       <LI>Common Public License Version 1.0 (available at <A href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)</LI>
-       <LI>Apache Software License 1.1 (available at <A href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)</LI>
-       <LI>Apache Software License 2.0 (available at <A href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)</LI>
-       <LI>Metro Link Public License 1.00 (available at <A href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)</LI>
-       <LI>Mozilla Public License Version 1.1 (available at <A href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)</LI>
-</UL>
-
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</P>
-
-
-<H3>Use of Provisioning Technology</H3>
-
-<P>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <A href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</A>
-   ("Specification").</P>
-
-<P>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</P>
-
-<OL>
-       <LI>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</LI>
-       <LI>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</LI>
-       <LI>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</LI>
-</OL>
-
-<H3>Cryptography</H3>
-
-<P>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</P>
-
-<P><SMALL>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</SMALL></P>
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/com.springsource.org.apache.commons.httpclient-3.1.0.jar b/packaging/jetty-server/src/main/dist/repository/ext/com.springsource.org.apache.commons.httpclient-3.1.0.jar
deleted file mode 100644
index ae8b9e9..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/com.springsource.org.apache.commons.httpclient-3.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/com.sun.el-2.2.0.v201108011116.jar b/packaging/jetty-server/src/main/dist/repository/ext/com.sun.el-2.2.0.v201108011116.jar
deleted file mode 100644
index 856fba9..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/com.sun.el-2.2.0.v201108011116.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.activation-1.1.0.v201105071233.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.activation-1.1.0.v201105071233.jar
deleted file mode 100644
index cb35913..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.activation-1.1.0.v201105071233.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.annotation-1.1.0.v201108011116.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.annotation-1.1.0.v201108011116.jar
deleted file mode 100644
index 10dce5a..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.annotation-1.1.0.v201108011116.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.el-2.2.0.v201108011116.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.el-2.2.0.v201108011116.jar
deleted file mode 100644
index cb98282..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.el-2.2.0.v201108011116.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.mail.glassfish-1.4.1.v201005082020.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
deleted file mode 100644
index f2dda8a..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet.jsp-2.2.0.v201112011158.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet.jsp-2.2.0.v201112011158.jar
deleted file mode 100644
index dc2fbb0..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet.jsp-2.2.0.v201112011158.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet_3.0.0.v201112011016.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet_3.0.0.v201112011016.jar
deleted file mode 100644
index 4904343..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.servlet_3.0.0.v201112011016.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/javax.transaction-1.1.1.v201105210645.jar b/packaging/jetty-server/src/main/dist/repository/ext/javax.transaction-1.1.1.v201105210645.jar
deleted file mode 100644
index d142d5f..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/javax.transaction-1.1.1.v201105210645.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/org.apache.jasper.glassfish-2.2.2.v201112011158.jar b/packaging/jetty-server/src/main/dist/repository/ext/org.apache.jasper.glassfish-2.2.2.v201112011158.jar
deleted file mode 100644
index 8415c70..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/org.apache.jasper.glassfish-2.2.2.v201112011158.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar b/packaging/jetty-server/src/main/dist/repository/ext/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar
deleted file mode 100644
index 27682db..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/org.eclipse.jdt.core-3.7.1.jar b/packaging/jetty-server/src/main/dist/repository/ext/org.eclipse.jdt.core-3.7.1.jar
deleted file mode 100644
index a76e9da..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/org.eclipse.jdt.core-3.7.1.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/org.objectweb.asm-3.1.0.v200803061910.jar b/packaging/jetty-server/src/main/dist/repository/ext/org.objectweb.asm-3.1.0.v200803061910.jar
deleted file mode 100644
index 6803610..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/org.objectweb.asm-3.1.0.v200803061910.jar
+++ /dev/null
Binary files differ
diff --git a/packaging/jetty-server/src/main/dist/repository/ext/osgi.console.properties b/packaging/jetty-server/src/main/dist/repository/ext/osgi.console.properties
deleted file mode 100644
index 310943b..0000000
--- a/packaging/jetty-server/src/main/dist/repository/ext/osgi.console.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-telnet.enabled=false
-telnet.port=2501
-telnet.host=localhost
-ssh.enabled=false
-ssh.port=2502
-ssh.host=localhost
\ No newline at end of file
diff --git a/packaging/jetty-server/src/main/filtered/bin/checkJava.sh b/packaging/jetty-server/src/main/filtered/bin/checkJava.sh
deleted file mode 100644
index a06ecd5..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/checkJava.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-#
-# make adjustment when running under cygwin
-#
-if $cygwin; then
-    CLASSPATH=$(cygpath -wp "$CLASSPATH")
-fi
-
-if [ -z "$JAVA_HOME" ]
-then
-  	JAVA_EXECUTABLE=java
-else
-  	JAVA_EXECUTABLE=$JAVA_HOME/bin/java
-fi
-
-# Run java version check with the discovered java jvm.
-$JAVA_EXECUTABLE \
-	-classpath "$CLASSPATH" \
-	org.eclipse.virgo.util.env.JavaVersionChecker
-
-# If non-zero exit then either we cannot find the check or the java version is incorrect.
-if [ $? != 0 ]
-then
-	exit 1
-fi
diff --git a/packaging/jetty-server/src/main/filtered/bin/dmk.sh b/packaging/jetty-server/src/main/filtered/bin/dmk.sh
deleted file mode 100755
index 0937afb..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/dmk.sh
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-# determine kernel home
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-
-# make KERNEL_HOME absolute
-KERNEL_HOME=`cd "$KERNEL_HOME"; pwd`
-
-# execute user setenv script if needed
-if [ -r "$KERNEL_HOME/bin/setenv.sh" ]
-then
-	. $KERNEL_HOME/bin/setenv.sh
-fi
-
-# setup classpath and java environment
-. "$KERNEL_HOME/bin/setupClasspath.sh"
-
-# Run java version check with the discovered java jvm.
-. "$KERNEL_HOME/bin/checkJava.sh"
-
-shopt -s extglob
-	
-# parse the command we executing
-COMMAND=$1
-shift;
-	
-if [ "$COMMAND" = "start" ]
-then
-	
-	# parse the standard arguments
-	CONFIG_DIR=$KERNEL_HOME/configuration
-	CLEAN_FLAG=
-	NO_START_FLAG=
-
-	SHELL_FLAG=
-	
-	DEBUG_FLAG=
-	DEBUG_PORT=8000
-	SUSPEND=n
-	if [ -z "$JMX_PORT" ]
-	then
-		JMX_PORT=9875
-	fi
-	
-	if [ -z "$KEYSTORE_PASSWORD" ]
-	then
-		KEYSTORE_PASSWORD=changeit
-	fi
-	
-	ADDITIONAL_ARGS=
-
-	while (($# > 0))
-		do
-		case $1 in
-		-debug)
-				DEBUG_FLAG=1
-				if [[ "$2" == +([0-9]) ]]
-				then
-					DEBUG_PORT=$2
-					shift;
-				fi
-				;;
-		-clean)
-				CLEAN_FLAG=1
-				;;
-		-configDir)
-				CONFIG_DIR=$2
-				shift;
-				;;
-		-jmxport)
-				JMX_PORT=$2
-				shift;
-				;;
-		-keystore)
-				KEYSTORE_PATH=$2
-				shift;
-				;;
-		-keystorePassword)
-				KEYSTORE_PASSWORD=$2
-				shift;
-				;;
-		-noStart)
-				NO_START_FLAG=1
-				;;
-				
-		-suspend)
-				SUSPEND=y
-				;;
-		-shell)
-				SHELL_FLAG=1
-				;;
-		*)
-				ADDITIONAL_ARGS="$ADDITIONAL_ARGS $1"
-				;;
-		esac
-		shift
-	done
-	
-	# start the kernel
-	if [[ "$CONFIG_DIR" != /* ]]
-	then
-	    CONFIG_DIR=$KERNEL_HOME/$CONFIG_DIR
-	fi
-
-	if [ -z "$KEYSTORE_PATH" ]
-	then
-	    KEYSTORE_PATH=$CONFIG_DIR/keystore
-	fi
-
-	if [ "$DEBUG_FLAG" ]
-	then
-		DEBUG_OPTS=" \
-			-Xdebug \
-			-Xrunjdwp:transport=dt_socket,address=$DEBUG_PORT,server=y,suspend=$SUSPEND"
-	fi
-
-	if [ "$CLEAN_FLAG" ]
-	then
-        echo "Cleaning the serviceability and working directories..."
-        rm -rf "$KERNEL_HOME/work"
-        rm -rf "$KERNEL_HOME/serviceability"
-
-        LAUNCH_OPTS="$LAUNCH_OPTS -clean" #equivalent to setting osgi.clean to "true"
-	fi
-	
-	if [ "$SHELL_FLAG" ]
-	then
-	    echo "Warning: Kernel shell not supported; -shell option ignored."
-		# LAUNCH_OPTS="$LAUNCH_OPTS -Forg.eclipse.virgo.kernel.shell.local=true"
-	fi
-
-    ACCESS_PROPERTIES=$CONFIG_DIR/org.eclipse.virgo.kernel.jmxremote.access.properties
-    AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config
-    AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties
-    CONFIG_AREA=$KERNEL_HOME/work
-    JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile
-
-    if $cygwin; then
-        ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
-        AUTH_LOGIN=$(cygpath -wp $AUTH_LOGIN)
-        AUTH_FILE=$(cygpath -wp $AUTH_FILE)
-        KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
-        CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
-        CONFIG_AREA=$(cygpath -wp $CONFIG_AREA)
-        JAVA_PROFILE=$(cygpath -wp $JAVA_PROFILE)
-    fi
-	
-	# Set the required permissions on the JMX configuration files
-	chmod 600 "$ACCESS_PROPERTIES"
-
-   	if [ -z "$JAVA_HOME" ]
-    then
-      	JAVA_EXECUTABLE=java
-    else
-     	JAVA_EXECUTABLE=$JAVA_HOME/bin/java
-    fi
-
-	# If we get here we have the correct Java version.
-	
-	if [ -z "$NO_START_FLAG" ]
-	then
-		TMP_DIR=$KERNEL_HOME/work/tmp
-		# Ensure that the tmp directory exists
-		mkdir -p "$TMP_DIR"
-
-        JAVA_OPTS="-Xmx1024m \
-                    -XX:MaxMetaspaceSize=512m $JAVA_OPTS"
-
-		cd "$KERNEL_HOME"; exec $JAVA_EXECUTABLE \
-			$JAVA_OPTS \
-			$DEBUG_OPTS \
-			$JMX_OPTS \
-			-XX:+HeapDumpOnOutOfMemoryError \
-			-XX:ErrorFile="$KERNEL_HOME/serviceability/error.log" \
-            -Djdk.management.heapdump.allowAnyFileSuffix=true \
-            -XX:HeapDumpPath="$KERNEL_HOME/serviceability/heap_dump.hprof" \
-			-Djava.security.auth.login.config="$AUTH_LOGIN" \
-			-Dorg.eclipse.virgo.kernel.authentication.file="$AUTH_FILE" \
-			-Djava.io.tmpdir="$TMP_DIR" \
-			-Dorg.eclipse.virgo.kernel.home="$KERNEL_HOME" \
-			-Dorg.eclipse.virgo.kernel.config="$CONFIG_DIR" \
-			-Dosgi.sharedConfiguration.area="$CONFIG_DIR" \
-			-Dosgi.java.profile="file:$JAVA_PROFILE" \
-            -Declipse.ignoreApp=true \
-            -Dosgi.install.area="$KERNEL_HOME" \
-            -Dosgi.configuration.area="$CONFIG_AREA" \
-            -Dssh.server.keystore="$CONFIG_DIR/hostkey.ser" \
-            -Dosgi.frameworkClassPath="$FWCLASSPATH" \
-            -Djava.endorsed.dirs="$KERNEL_HOME/lib/endorsed" \
-            -Dcom.sun.management.jmxremote.port=$JMX_PORT \
-		    -Dcom.sun.management.jmxremote.authenticate=true \
-	    	-Dcom.sun.management.jmxremote.login.config=virgo-kernel \
-    		-Dcom.sun.management.jmxremote.access.file="$ACCESS_PROPERTIES" \
-		    -Djavax.net.ssl.keyStore="$KEYSTORE_PATH" \
-		    -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWORD" \
-		    -Dcom.sun.management.jmxremote.ssl=true \
-		    -Dcom.sun.management.jmxremote.ssl.need.client.auth=false \
-            -classpath "$CLASSPATH" \
-			org.eclipse.equinox.launcher.Main \
-            -noExit \
-			$LAUNCH_OPTS \
-			$ADDITIONAL_ARGS
-	fi
-elif [ "$COMMAND" = "stop" ]
-then
-
-	CONFIG_DIR="$KERNEL_HOME/configuration"
-
-	#parse args for the script
-	if [ -z "$TRUSTSTORE_PATH" ]
-	then
-		TRUSTSTORE_PATH=$CONFIG_DIR/keystore
-	fi
-	
-	if [ -z "$TRUSTSTORE_PASSWORD" ]	
-	then
-		TRUSTSTORE_PASSWORD=changeit
-	fi
-
-	if [ -z "$JMX_PORT" ]
-	then
-		JMX_PORT=9875
-	fi
-
-	shopt -s extglob
-
-	while (($# > 0))
-		do
-		case $1 in
-		-truststore)
-				TRUSTSTORE_PATH=$2
-				shift;
-				;;
-		-truststorePassword)
-				TRUSTSTORE_PASSWORD=$2
-				shift;
-				;;
-		-configDir)
-				CONFIG_DIR=$2
-				shift;
-				;;
-		-jmxport)
-				JMX_PORT=$2
-				shift;
-				;;
-		*)
-			OTHER_ARGS+=" $1"
-			;;
-		esac
-		shift
-	done
-
-	OTHER_ARGS+=" -jmxport $JMX_PORT"
-
-    if $cygwin; then
-        KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
-        CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
-    fi
-
-	exec $JAVA_EXECUTABLE \
-	     $JAVA_OPTS \
-	     $JMX_OPTS \
-		-classpath "$CLASSPATH" \
-		-Djavax.net.ssl.trustStore="$TRUSTSTORE_PATH" \
-		-Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWORD" \
-		-Dorg.eclipse.virgo.kernel.home="$KERNEL_HOME" \
-		-Dorg.eclipse.virgo.kernel.authentication.file="$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties" \
-		org.eclipse.virgo.nano.shutdown.ShutdownClient $OTHER_ARGS
-	
-else
-	echo "Unknown command: ${COMMAND}"
-fi
-
diff --git a/packaging/jetty-server/src/main/filtered/bin/jconsole.sh b/packaging/jetty-server/src/main/filtered/bin/jconsole.sh
deleted file mode 100644
index 0dfbcbf..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/jconsole.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-if [ -z "$JAVA_HOME" ]
-then
-    echo The JAVA_HOME environment variable is not defined
-    exit 1
-fi
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do 
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
- 
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-KERNEL_HOME=`cd $KERNEL_HOME; pwd`
-
-#parse args for the script
-TRUSTSTORE_PATH=$KERNEL_HOME/configuration/keystore
-TRUSTSTORE_PASSWORD=changeit
-
-shopt -s extglob
-
-while (($# > 0))
-	do
-	case $1 in
-	-truststore)
-			TRUSTSTORE_PATH=$2
-			shift;
-			;;
-	-truststorePassword)
-			TRUSTSTORE_PASSWORD=$2
-			shift;
-			;;
-	esac
-	shift
-done
-
-JMX_OPTS=" \
-	$JMX_OPTS \
-	-J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type \
-	-J-Djavax.net.ssl.trustStore=$TRUSTSTORE_PATH \
-	-J-Djavax.net.ssl.trustStorePassword=$TRUSTSTORE_PASSWORD"
-
-$JAVA_HOME/bin/jconsole $JMX_OPTS
diff --git a/packaging/jetty-server/src/main/filtered/bin/setupClasspath.sh b/packaging/jetty-server/src/main/filtered/bin/setupClasspath.sh
deleted file mode 100644
index 741e0e3..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/setupClasspath.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# make sure we have JAVA_HOME set
-if [ -z "$JAVA_HOME" ]
-then
-	echo The JAVA_HOME environment variable is not defined. Using PATH instead.
-fi
-
-CLASSPATH=
-FWCLASSPATH=
-
-#  Create the classpath for bootstrapping the Server from all the JARs in lib
-for file in "$KERNEL_HOME"/lib/*
-do
-	if [[ $file == *.jar ]]
-	then
-		CLASSPATH=$CLASSPATH:$KERNEL_HOME/lib/${file##*/}
-		FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/lib/${file##*/}
-	fi
-done
-
-#  Append the osgi jar to the classpath
-for file in "$KERNEL_HOME"/plugins/org.eclipse.osgi_*.jar
-do
-	CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
-	FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/plugins/${file##*/}
-done
-
-#  Append the console.supportability jar to the classpath to enable ssh
-for file in "$KERNEL_HOME"/plugins/org.eclipse.equinox.console.ssh_*.jar
-do
-	CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
-done
-
-# make sure we have CLASSPATH set
-if [ -z "$CLASSPATH" ]
-then
-	echo No JAR files found in $KERNEL_HOME/lib
-	exit 1
-fi
diff --git a/packaging/jetty-server/src/main/filtered/bin/shutdown.sh b/packaging/jetty-server/src/main/filtered/bin/shutdown.sh
deleted file mode 100644
index 1960446..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/shutdown.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
-    CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" stop "$@"
diff --git a/packaging/jetty-server/src/main/filtered/bin/startup.sh b/packaging/jetty-server/src/main/filtered/bin/startup.sh
deleted file mode 100644
index 69e43b7..0000000
--- a/packaging/jetty-server/src/main/filtered/bin/startup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
-    CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" start "$@"
diff --git a/packaging/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties b/packaging/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
deleted file mode 100644
index 9b80d58..0000000
--- a/packaging/jetty-server/src/main/filtered/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-baseBundles = \
- file:plugins/org.eclipse.equinox.cm_@EQUINOX.CONFIGADMIN.VERSION@.jar@start,\
- file:plugins/org.eclipse.virgo.kernel.userregion_@VIRGO.VERSION@.jar@start,\
- file:plugins/org.eclipse.virgo.shell.command_@VIRGO.VERSION@.jar@start,\
- file:plugins/org.eclipse.osgi.services_@OSGI.SERVICES.VERSION@.jar@start,\
- file:plugins/org.apache.mina.core_@MINA.CORE.VERSION@.jar@start,\
- file:plugins/org.apache.felix.gogo.command_@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
- file:plugins/org.apache.felix.gogo.runtime_@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
- file:plugins/org.apache.felix.gogo.shell_@FELIX.GOGO.SHELL.VERSION@.jar@start,\
- file:plugins/org.eclipse.equinox.console_@EQUINOX.CONSOLE.VERSION@.jar@start,\
- file:plugins/org.eclipse.equinox.console.ssh_@EQUINOX.CONSOLE.SSH.VERSION@.jar@start,\
- file:plugins/org.apache.sshd.core_@SSHD.CORE.VERSION@.jar@start
-
-bundleImports = org.eclipse.osgi;bundle-version="0"
-
-packageImports =\
- org.eclipse.virgo.kernel.artifact.*;version="0",\
- org.eclipse.virgo.nano.core;version="0",\
- org.eclipse.virgo.nano.deployer.api.*;version="0",\
- org.eclipse.virgo.nano.deployer.api;version="0",\
- org.eclipse.virgo.nano.deployer;version="0",\
- org.eclipse.virgo.kernel.deployer.core.event;version="0",\
- org.eclipse.virgo.kernel.install.*;version="0",\
- org.eclipse.virgo.kernel.osgi.*;version="0",\
- org.eclipse.virgo.kernel.model;version="0",\
- org.eclipse.virgo.kernel.model.management;version="0",\
- org.eclipse.virgo.kernel.module;version="0",\
- org.eclipse.virgo.kernel.equinox.extensions.hooks;version="0",\
- org.eclipse.virgo.nano.serviceability;version="0",\
- org.eclipse.virgo.nano.serviceability.*;version="0",\
- org.eclipse.virgo.kernel.services.work;version="0",\
- org.eclipse.virgo.nano.shim.*;version="0",\
- org.eclipse.virgo.medic.*;version="0",\
- org.eclipse.virgo.repository;version="0",\
- org.eclipse.virgo.repository.*;version="0",\
- org.eclipse.virgo.util.*;version="0",\
- org.apache.commons.logging;version="[1.2,2)",\
- org.apache.commons.logging.impl;version="[1.2,2)",\
- org.aspectj.*;version="[1.6.5.RELEASE,2.0.0)",\
- org.osgi.service.event;version="0",\
- org.osgi.service.log;version="0",\
- org.osgi.service.http;version="0",\
- javax.servlet;version="2.6.0",\
- org.eclipse.equinox.region;version="1",\
- ch.qos.logback.*;version="[1.0.0,2.0.0)",\
- org.slf4j;version="[1.6.4,2)",\
- org.slf4j.helpers;version="[1.6.4,2)",\
- org.slf4j.spi;version="[1.6.4,2)",\
- org.springframework.util;version="[5.0.8,6)"
-
-serviceImports =\
- org.eclipse.equinox.region.Region,\
- org.eclipse.equinox.region.RegionDigraph,\
- org.osgi.framework.hooks.resolver.ResolverHookFactory,\
- org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer,\
- org.eclipse.virgo.nano.deployer.api.core.DeployUriNormaliser,\
- org.eclipse.virgo.kernel.install.artifact.ScopeServiceRepository,\
- org.eclipse.virgo.kernel.services.work.WorkArea,\
- org.eclipse.virgo.repository.ArtifactBridge,\
- org.eclipse.virgo.repository.RepositoryFactory,\
- org.eclipse.virgo.repository.HashGenerator,\
- org.eclipse.virgo.medic.eventlog.EventLoggerFactory,\
- org.eclipse.virgo.repository.Repository,\
- org.eclipse.virgo.nano.core.Shutdown,\
- org.osgi.service.event.EventAdmin,\
- org.osgi.service.log.LogService,\
- org.osgi.service.http.HttpService,\
- org.eclipse.virgo.medic.eventlog.EventLogger,\
- org.eclipse.virgo.medic.dump.DumpGenerator,\
- org.eclipse.virgo.nano.shim.scope.ScopeFactory,\
- org.eclipse.virgo.nano.shim.serviceability.TracingService,\
- org.eclipse.virgo.kernel.model.RuntimeArtifactRepository,\
- org.eclipse.virgo.kernel.model.management.RuntimeArtifactModelObjectNameCreator,\
- org.eclipse.osgi.service.resolver.PlatformAdmin,\
- org.osgi.service.packageadmin.PackageAdmin,\
- org.eclipse.virgo.nano.core.ConfigurationExporter,\
- javax.management.MBeanServer
-
-serviceExports =\
- org.eclipse.virgo.kernel.install.artifact.InstallArtifactLifecycleListener,\
- org.eclipse.virgo.kernel.install.artifact.ArtifactIdentityDeterminer,\
- org.eclipse.virgo.kernel.install.pipeline.stage.transform.Transformer,\
- org.eclipse.virgo.kernel.module.ModuleContextAccessor,\
- org.eclipse.virgo.medic.dump.DumpContributor,\
- org.eclipse.virgo.kernel.osgi.quasi.QuasiFrameworkFactory,\
- org.eclipse.virgo.kernel.osgi.framework.OsgiFramework,\
- org.eclipse.virgo.kernel.osgi.framework.ImportExpander,\
- org.eclipse.virgo.kernel.osgi.framework.PackageAdminUtil,\
- org.eclipse.equinox.region.Region,\
- org.osgi.service.event.EventHandler,\
- org.osgi.framework.BundleContext,\
- org.eclipse.virgo.nano.deployer.api.config.ConfigurationDeployer
-
-initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.web.jetty,repository:plan/org.eclipse.virgo.management
diff --git a/packaging/jetty-server/src/main/filtered/lib/.version b/packaging/jetty-server/src/main/filtered/lib/.version
deleted file mode 100644
index 57985f4..0000000
--- a/packaging/jetty-server/src/main/filtered/lib/.version
+++ /dev/null
@@ -1 +0,0 @@
-virgo.server.version=@VIRGO.VERSION@
diff --git a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
deleted file mode 100644
index 57ea166..0000000
--- a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ /dev/null
@@ -1,17 +0,0 @@
-<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="@VIRGO.VERSION@" scoped="false" atomic="false"
-	  xmlns="http://www.eclipse.org/virgo/schema/plan"
-	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	  xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
-
-	<artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[3, 4)"/>
-	<artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[3, 4)"/>
-	<artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[3, 4)"/>
-	<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[3, 4)"/>
-
-	<artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[@VIRGO.VERSION.LOWER_BOUND@, @VIRGO.VERSION.UPPER_BOUND@)"/>
-	<artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[@VIRGO.VERSION.LOWER_BOUND@, @VIRGO.VERSION.UPPER_BOUND@)"/>
-
-	<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
-	<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
-	<artifact type="configuration" name="osgi.console" version="0"/>
-</plan>
diff --git a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.management.plan b/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.management.plan
deleted file mode 100644
index 7382702..0000000
--- a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.management.plan
+++ /dev/null
@@ -1,11 +0,0 @@
-<plan name="org.eclipse.virgo.management" version="@VIRGO.VERSION@" scoped="false" atomic="false"
-			xmlns="http://www.eclipse.org/virgo/schema/plan"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
-
-		<artifact type="bundle" name="osgi.enterprise" version="[4.2, 5)"/>
-		<artifact type="bundle" name="org.eclipse.gemini.management" version="[1.0, 2)"/>
-
-		<artifact type="bundle" name="org.eclipse.virgo.management.fragment" version="[@VIRGO.VERSION.LOWER_BOUND@, @VIRGO.VERSION.UPPER_BOUND@)"/>
-
-</plan>
diff --git a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.web.jetty.plan b/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.web.jetty.plan
deleted file mode 100644
index cd6432f..0000000
--- a/packaging/jetty-server/src/main/filtered/repository/ext/org.eclipse.virgo.web.jetty.plan
+++ /dev/null
@@ -1,12 +0,0 @@
-<plan name="org.eclipse.virgo.web.jetty" version="@VIRGO.VERSION@" scoped="false" atomic="false"
-                xmlns="http://www.eclipse.org/virgo/schema/plan"
-				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-				xsi:schemaLocation="
-				        http://www.eclipse.org/virgo/schema/plan 
-				        http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
-		
-		<artifact type="bundle" name="org.eclipse.jetty.osgi.boot" version="[8.1, 9.0)"/>
-
-		<artifact type="bundle" name="org.eclipse.virgo.web.dm" version="[@VIRGO.VERSION.LOWER_BOUND@, @VIRGO.VERSION.UPPER_BOUND@)"/>
-        <artifact type="bundle" name="org.eclipse.virgo.web.servlet.adapter" version="[@VIRGO.VERSION.LOWER_BOUND@, @VIRGO.VERSION.UPPER_BOUND@)"/>
-</plan>
diff --git a/packaging/jetty-server/src/main/filtered/repository/ext/org.springframework.spring-library.libd b/packaging/jetty-server/src/main/filtered/repository/ext/org.springframework.spring-library.libd
deleted file mode 100644
index 7982560..0000000
--- a/packaging/jetty-server/src/main/filtered/repository/ext/org.springframework.spring-library.libd
+++ /dev/null
@@ -1,22 +0,0 @@
-Library-SymbolicName: org.springframework.spring
-Library-Version: @SPRING.VERSION@
-Library-Name: Spring Framework
-Import-Bundle: 
- org.springframework.aop;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.aspects;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.beans;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.context;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.context.support;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.core;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.expression;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.jdbc;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.jms;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.orm;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.oxm;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.transaction;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.web;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.webflux;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.webmvc;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- org.springframework.websocket;version="[@SPRING.VERSION@, @SPRING.VERSION@]",
- oevm.org.aopalliance;version="[1.0.0, 1.0.0]",
- javax.jms;version="[1,2)"
diff --git a/packaging/jetty-server/test-package.xml b/packaging/jetty-server/test-package.xml
deleted file mode 100644
index d6bebd9..0000000
--- a/packaging/jetty-server/test-package.xml
+++ /dev/null
@@ -1,91 +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-jetty-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>
-
-		<waitfor maxwait="5" maxwaitunit="minute" timeoutproperty="start.failed">
-			<http url="http://localhost:8080/"/>
-		</waitfor>
-		<fail if="start.failed" message="Virgo Jetty Server start up failed"/>
-	</target>
-	
-	<target name="startup.clean" depends="shutdown">
-		<echo message="Clean Starting of Virgo Server" />
-
-		<exec dir="${test.package.dir}" osfamily="unix" spawn="true" executable="bin/startup.sh">
-			<arg line="-clean" />
-		</exec>
-		
-		<exec dir="${test.package.dir}" osfamily="windows" spawn="true" executable="cmd">
-			<arg line="/c bin\startup.bat" />
-			<arg line="-clean" />
-		</exec>
-
-		<waitfor maxwait="5" maxwaitunit="minute" timeoutproperty="start.failed">
-			<http url="http://localhost:8080/"/>
-		</waitfor>
-		<fail if="start.failed" message="Virgo Jetty Server clean start up failed"/>
-	</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>
-
-		<waitfor maxwait="5" maxwaitunit="minute" timeoutproperty="shutdown.failed">
-			<not>
-				<http url="http://localhost:8080/"/>
-			</not>
-		</waitfor>
-		<fail if="shutdown.failed" message="Virgo Jetty Server shutdown failed"/>
-	</target>
-
-</project>
diff --git a/settings.gradle b/settings.gradle
index 849c314..5ebaab6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -112,7 +112,6 @@
 
 include ':packaging:nano'
 include ':packaging:kernel'
-include ':packaging:jetty-server'
 include ':packaging:tomcat-server'
 
 include ':test:org.eclipse.virgo.test.launcher'
@@ -123,7 +122,6 @@
 	include ':test:org.eclipse.virgo.test.tools'
 	include ':packaging:nano:org.eclipse.virgo.nano.smoketest'
 	include ':packaging:kernel:org.eclipse.virgo.kernel.smoketest'
-	include ':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'
 	include ':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'
 
 	// TODO - check if this module is still needed - only in unused?! feature org.eclipse.virgo.nano.detailed