Merge remote branch 'origin/master' into 364571-introduce-nano
diff --git a/build-tomcat-server/build.xml b/build-tomcat-server/build.xml
index 83acaeb..201aea9 100644
--- a/build-tomcat-server/build.xml
+++ b/build-tomcat-server/build.xml
@@ -7,19 +7,10 @@
 	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
 
-    <!--P2 publishing properties-->
-    <property name="publishing.dir" value="${basedir}/target/repository"/>
-    <property name="distro.res" value="${basedir}/distro_resources"/>
-    <property name="p2.repo.url" value="file:///${publishing.dir}"/>
-    <property name="product.file" value="${basedir}/org.eclipse.virgo.kernel.product"/>
-    <property name="lib.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.product"/>
-    <property name="lib.kernel.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.kernel.product"/>
-    <property name="repository.ext.product.file" value="${basedir}/org.eclipse.virgo.kernel.repository.ext.product"/>
-
 	<target name="precommit" depends="clean, clean-integration, test, package, smoke-test"
 		description="Performs a CI server-like build, should be run prior to performing a Git push"/>
-
-	<target name="fetch-kernel">
+    
+    <target name="fetch-kernel-updatesite">
 		<mkdir dir="${target.dir}"/>
 		
 		<condition property="dependancy.folder" value="milestone" else="${adjusted.release.type}">
@@ -33,98 +24,141 @@
 			<contains string="${org.eclipse.virgo.kernel}" substring=".RELEASE"/>
 		</condition>
 		
-		<get src="http://build.eclipse.org/rt/virgo/zips/${dependancy.folder}/VK/${org.eclipse.virgo.kernel}/virgo-kernel-${org.eclipse.virgo.kernel}.zip"
-				dest="${target.dir}/virgo-kernel-${org.eclipse.virgo.kernel}.zip" 
-				usetimestamp="true" />
+		<get src="http://build.eclipse.org/rt/virgo/zips/${dependancy.folder}/VK/${org.eclipse.virgo.kernel}/virgo-kernel-updatesite-${org.eclipse.virgo.kernel}.zip"
+			dest="${target.dir}/virgo-kernel-updatesite-${org.eclipse.virgo.kernel}.zip" 
+			usetimestamp="true" />
 
-		<echo message="Fetched the Kernel zip to ${target.dir}/virgo-kernel-${org.eclipse.virgo.kernel}.zip"/>
+		<echo message="Fetched the Kernel updatesite zip to ${target.dir}/virgo-kernel-updatesite-${org.eclipse.virgo.kernel}.zip"/>
 	</target>
 
-	<target name="package" depends="fetch-kernel">
+	<target name="package" depends="fetch-kernel-updatesite">
 		<delete dir="${package.output.dir}" quiet="true"/>
 		<mkdir dir="${package.output.dir}"/>
 
 		<property name="kernel.stage.file" value=""/>
-		<property name="repository.dir" value="${package.output.dir}/repository"/>
-		<property name="repository.ext" value="${repository.dir}/ext"/>
-		<property name="repository.usr" value="${repository.dir}/usr"/>
+        <property name="tomcat.server.resources" value="${target.dir}/tomcat_server_resources"/>
+        <property name="repository.ext" value="${tomcat.server.resources}/repository/ext"/>
+        <property name="repository.usr" value="${tomcat.server.resources}/repository/usr"/>
 
-		<unzip src="${target.dir}/virgo-kernel-${org.eclipse.virgo.kernel}.zip" dest="${package.output.dir}">
-			<globmapper from="virgo-kernel-${org.eclipse.virgo.kernel}/*" to="*"/>
+        <unzip src="${target.dir}/virgo-kernel-updatesite-${org.eclipse.virgo.kernel}.zip" dest="${p2.repository.dir}">
+			<globmapper from="virgo-kernel-updatesite-${org.eclipse.virgo.kernel}/*" to="*"/>
 		</unzip>
-		
-		<antcall target="package.bin"/>
+        <delete file="${target.dir}/virgo-kernel-updatesite-${org.eclipse.virgo.kernel}.zip" quiet="true"/>
+        
+        <unzip src="${p2.repository.dir}/binary/kernel_specific_resources_1.0.0" dest="${tomcat.server.resources}">
+			<globmapper from="kernel_specific_resources_1.0.0/*" to="*"/>
+		</unzip>
+        
+		<mkdir dir="${repository.usr}"/>
+        
 		<antcall target="package.config"/>
 		<antcall target="package.docs"/>
 		<antcall target="package.lib"/>
 		<antcall target="package.pickup"/>
 		<antcall target="package.repository"/>
 		<antcall target="package.resources"/>
+        <antcall target="package.publish"/>
 
-		<mkdir dir="${package.output.dir}/work"/>
-		<mkdir dir="${repository.usr}"/>
+	</target>
+    
+    <target name="package.publish">
+        <property name="tomcat.server.resources.location" value="${target.dir}/tomcat_server_resources_zipped"/>
+		<zip destfile="${tomcat.server.resources.location}/binary/tomcat_server_resources">
+			<zipfileset dir="${tomcat.server.resources}"/>
+		</zip>
+        <delete dir="${tomcat.server.resources}" quiet="true"/>
+        
+        <!--prepare tomcat server feature for publishing -->
+        <copy todir="${target.dir}/assembly/features" failonerror="false">
+			<fileset dir="${basedir}/publish_resources/features"/>
+		</copy>
+        
+        <!-- proceed with publish -->
+        <antcall target="fetch-unzipped-virgo-build-tools"/>
+        
+        <property name="p2.products.location" value="${basedir}/publish_resources/products"/>
+        <antcall target="p2.publish-binary">
+            <param name="repository" value="${p2.repository.dir}"/>
+            <param name="source" value="${tomcat.server.resources.location}"/>
+        </antcall>
+        <echo message="Published the tomcat server resources to ${p2.repository.dir}."/>
+        
+        <antcall target="p2.publish-bundles-features">
+            <param name="repository" value="${p2.repository.dir}"/>
+            <param name="source" value="${target.dir}/assembly"/>
+        </antcall>
+        <echo message="Published bundles and features to ${p2.repository.dir}."/>
+        
+        <antcall target="p2.publish-product">
+            <param name="repository" value="${p2.repository.dir}"/>
+            <param name="product.file.location" value="${p2.products.location}/tomcat-server/tomcat-server.product"/>
+        </antcall>
+        <echo message="Published tomcat server product to ${p2.repository.dir}."/>
 
-		<mkdir dir="${artifacts.dir}"/>
+        <antcall target="p2.install-virgo-product">
+            <param name="repository" value="${p2.repository.dir}"/>
+            <param name="destination" value="${package.output.dir}"/>
+            <param name="product.iu" value="tomcat-server.product"/>
+        </antcall>
+        <echo message="Installed Virgo Tomcat Server for distribution purposes."/>
+        
+        <mkdir dir="${artifacts.dir}"/>
+        
+        <delete dir="${package.output.dir}/Eclipse.app" quiet="true"/>
+        
 		<zip destfile="${package.output.file}">
 			<zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
-			<zipfileset dir="${package.dir}" includes="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
+			<zipfileset dir="${package.dir}" includes="${package.basename}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
 			<zipfileset dir="${package.dir}">
 				<exclude name="${package.basename}/bin/*.sh"/>
-				<exclude name="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
+				<exclude name="${package.basename}/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
 			</zipfileset>
 		</zip>
-	</target>
-
-	<target name="package.bin">
-		<chmod perm="755">
-			<fileset dir="${package.output.dir}/bin">
-				<include name="*.sh"/>
-			</fileset>
-		</chmod>
-	</target>
+        <zip destfile="${updatesite.output.file}">
+			<zipfileset dir="${p2.repository.dir}"/>
+		</zip>
+        
+        <delete dir="${tomcat.server.resources.location}" quiet="true"/>
+        <delete dir="${target.dir}/assembly" quiet="true"/>
+        <delete dir="${tools.dir}" quiet="true"/>
+    </target>
 
 	<target name="package.config">
-		<copy todir="${package.output.dir}/config" failonerror="false" overwrite="true">
-			<fileset dir="${basedir}/config"/>
+		<copy todir="${tomcat.server.resources}/configuration" failonerror="false" overwrite="true">
+			<fileset dir="${basedir}/configuration"/>
 		</copy>
-
-		<chmod perm="600">
-			<fileset dir="${package.output.dir}/config">
-				<include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
-			</fileset>
-		</chmod>
-
-		<replaceregexp match="initialArtifacts =.*\.springdm"
+        
+        <replaceregexp match="initialArtifacts =.*\.springdm"
 				replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.springdm, repository:plan/org.eclipse.virgo.web.tomcat" flags="s"
-				file="${package.output.dir}/config/org.eclipse.virgo.kernel.userregion.properties"/>
-
-		<replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
-				file="${package.output.dir}/config/serviceability.xml"/>
+				file="${tomcat.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
+                
+        <replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
+				file="${tomcat.server.resources}/configuration/serviceability.xml"/>
 	</target>
 
 	<target name="package.docs" depends="ivy.init">
 		<ivy:resolve resolveId="copy.path" file="${basedir}/docs-ivy.xml" transitive="false" conf="docs"/>
 		<ivy:retrieve resolveId="copy.path" pattern="${basedir}/target/docs/[artifact]-[revision].[ext]" conf="docs" type="zip, pdf"/>
 
-		<copy todir="${package.output.dir}/docs/virgo-user-guide/pdf" flatten="true">
+		<copy todir="${tomcat.server.resources}/docs/virgo-user-guide/pdf" flatten="true">
 			<fileset dir="${basedir}/target/docs">
 				<include name="**/virgo-user-guide*.pdf"/>
 			</fileset>
 		</copy>
 
-		<copy todir="${package.output.dir}/docs/virgo-programmer-guide/pdf" flatten="true">
+		<copy todir="${tomcat.server.resources}/docs/virgo-programmer-guide/pdf" flatten="true">
 			<fileset dir="${basedir}/target/docs">
 				<include name="**/virgo-programmer-guide*.pdf"/>
 			</fileset>
 		</copy>
 
-		<unzip dest="${package.output.dir}/docs/virgo-user-guide">
+		<unzip dest="${tomcat.server.resources}/docs/virgo-user-guide">
 			<fileset dir="${basedir}/target/docs">
 		        <include name="**/virgo-user-guide*.zip"/>
 		    </fileset>
 		</unzip>
 
-		<unzip dest="${package.output.dir}/docs/virgo-programmer-guide">
+		<unzip dest="${tomcat.server.resources}/docs/virgo-programmer-guide">
 			<fileset dir="${basedir}/target/docs">
 		        <include name="**/virgo-programmer-guide*.zip"/>
 		    </fileset>
@@ -133,34 +167,29 @@
 	</target>
 
 	<target name="package.lib">
-		<echo file="${package.output.dir}/lib/.version" append="true"
+		<echo file="${tomcat.server.resources}/lib/.version" append="true"
 				message="virgo.server.version=${bundle.version}&#xa;"/>
-
-		<replaceregexp match="virgo-kernel" replace="virgo-server" flags="g"
-				file="${package.output.dir}/lib/java6-server.profile"/>
 	</target>
 
 	<target name="package.pickup" depends="ivy.init">
 		<ivy:resolve resolveId="copy.path" file="${basedir}/pickup-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/pickup/[artifact]-[revision].[ext]" type="jar, war, wab" conf="pickup"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/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"/>
+		<ivy:retrieve resolveId="copy.path" pattern="${tomcat.server.resources}/pickup/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup"/>
+		<ivy:retrieve resolveId="copy.path" pattern="${tomcat.server.resources}/pickup/[artifact]_[revision].[ext]" type="plan" conf="pickup-plan"/>
+		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" type="jar, war, wab" conf="pickup-plan"/>
 	</target>
 
 	<target name="package.repository" depends="ivy.init">
 		<ivy:resolve resolveId="copy.path" file="${basedir}/repository-ivy.xml" transitive="false"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]-[revision].[ext]" conf="ext" type="library,jar,plan"/>
+		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" conf="ext" type="library,jar,plan"/>
 		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact].[ext]" conf="ext" type="configuration"/>
 
 		<ivy:resolve resolveId="copy.path" file="${basedir}/repository-ivy.xml" transitive="true"/>
-		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]-[revision].[ext]" conf="transitive" type="library,jar,plan" />
+		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact]_[revision].[ext]" conf="transitive" type="library,jar,plan" />
 		<ivy:retrieve resolveId="copy.path" pattern="${repository.ext}/[artifact].[ext]" conf="transitive" type="configuration" />
 	</target>
 
 	<target name="package.resources">
-		<move file="${package.output.dir}/About.html" tofile="${package.output.dir}/AboutKernel.html"/>
-
-		<copy todir="${package.output.dir}" failonerror="false">
+		<copy todir="${tomcat.server.resources}" failonerror="false">
 			<fileset dir="${basedir}/resources"/>
 		</copy>
 	</target>
@@ -178,72 +207,4 @@
 		<antcall target="test.post"/>
 	</target>
 
-
-    <target name="p2.publish" depends="package.resources, p2.extract-publisher"
-            description="Publishes bundles, features and product">
-        <java jar="${p2.launcher.jar}" fork="true" taskname="p2bundles" failonerror="true" maxmemory="256m">
-            <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher"/>
-            <arg line="-metadataRepository ${p2.repo.url}"/>
-            <arg line="-artifactRepository ${p2.repo.url}"/>
-            <arg line="-bundles ${package.output.dir}/lib,${package.output.dir}/repository/ext"/>
-            <arg line="-publishArtifacts"/>
-            <arg line="-configs all"/>
-        </java>
-
-        <sshexec host="build.eclipse.org" 
-                username="${eclipse.buildId}" 
-                keyfile="${key.file}" 
-                passphrase="${passphrase}"
-                command="mkdir -pv /opt/public/rt/virgo/update-site/${release.type}/${build.stamp}"/>
-
-        <scp todir="${eclipse.buildId}@build.eclipse.org:/opt/public/rt/virgo/update-site/${release.type}/${build.stamp}/" 
-                keyfile="${key.file}"
-                passphrase="${passphrase}">
-            <fileset dir="${publishing.dir}"/>
-        </scp>
-        
-        <!-- <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
-                 <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
-                 <arg line="-metadataRepository ${p2.repo.url}"/>
-                 <arg line="-artifactRepository ${p2.repo.url}"/>
-                 <arg line="-productFile ${product.file}"/>
-                 <arg line="-append"/>
-                 <arg line="-publishArtifacts"/>
-                 <arg line="-flavor tooling"/>
-                 <arg line="-configs all"/>
-             </java>
-             <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
-                 <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
-                 <arg line="-metadataRepository ${p2.repo.url}"/>
-                 <arg line="-artifactRepository ${p2.repo.url}"/>
-                 <arg line="-productFile ${lib.product.file}"/>
-                 <arg line="-append"/>
-                 <arg line="-publishArtifacts"/>
-                 <arg line="-flavor tooling"/>
-                 <arg line="-configs all"/>
-             </java>
-             <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
-                 <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
-                 <arg line="-metadataRepository ${p2.repo.url}"/>
-                 <arg line="-artifactRepository ${p2.repo.url}"/>
-                 <arg line="-productFile ${lib.kernel.product.file}"/>
-                 <arg line="-append"/>
-                 <arg line="-publishArtifacts"/>
-                 <arg line="-flavor tooling"/>
-                 <arg line="-configs all"/>
-             </java>
-             <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
-                 <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
-                 <arg line="-metadataRepository ${p2.repo.url}"/>
-                 <arg line="-artifactRepository ${p2.repo.url}"/>
-                 <arg line="-productFile ${repository.ext.product.file}"/>
-                 <arg line="-append"/>
-                 <arg line="-publishArtifacts"/>
-                 <arg line="-flavor tooling"/>
-                 <arg line="-configs all"/>
-             </java> -->
-             <delete dir="${p2.publishing.dir}" excludes="p2agent.zip" includeemptydirs="true" quiet="true"/>
-    </target>
-
-
 </project>
diff --git a/build-tomcat-server/config/org.eclipse.virgo.repository.properties b/build-tomcat-server/config/org.eclipse.virgo.repository.properties
deleted file mode 100644
index 5e7de2b..0000000
--- a/build-tomcat-server/config/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/build-tomcat-server/config/org.eclipse.virgo.apps.repository.properties b/build-tomcat-server/configuration/org.eclipse.virgo.apps.repository.properties
similarity index 100%
rename from build-tomcat-server/config/org.eclipse.virgo.apps.repository.properties
rename to build-tomcat-server/configuration/org.eclipse.virgo.apps.repository.properties
diff --git a/build-tomcat-server/config/tomcat-server.xml b/build-tomcat-server/configuration/tomcat-server.xml
similarity index 100%
rename from build-tomcat-server/config/tomcat-server.xml
rename to build-tomcat-server/configuration/tomcat-server.xml
diff --git a/build-tomcat-server/distro_resources/META-INF/MANIFEST.MF b/build-tomcat-server/distro_resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ad0658f..0000000
--- a/build-tomcat-server/distro_resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: Virgo Resources

-Bundle-SymbolicName: org.eclipse.virgo.kernel.resources

-Bundle-Version: 1.0.0

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/build-tomcat-server/distro_resources/META-INF/p2.inf b/build-tomcat-server/distro_resources/META-INF/p2.inf
deleted file mode 100644
index f28f7c3..0000000
--- a/build-tomcat-server/distro_resources/META-INF/p2.inf
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################

-# Copyright (c) 2010 SAP AG

-# 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:

-#    Hristo Iliev, SAP AG - initial contribution

-################################################################################

-

-instructions.configure=\

-org.eclipse.equinox.p2.touchpoint.natives.unzip(source:@artifact,target:${installFolder});\

-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/META-INF);

diff --git a/build-tomcat-server/org.eclipse.virgo.kernel.lib.kernel.product b/build-tomcat-server/org.eclipse.virgo.kernel.lib.kernel.product
deleted file mode 100644
index fa23621..0000000
--- a/build-tomcat-server/org.eclipse.virgo.kernel.lib.kernel.product
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>

-<?pde version="3.5"?>

-

-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-  ~ Copyright (c) 2010 SAP AG

-  ~ 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:

-  ~    Hristo Iliev, SAP AG - initial contribution

-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

-

-<product name="Virgo Kernel Distribution (kernel region)" uid="org.eclipse.virgo.kernel.lib.kernel.product" version="1.0.0"

-         useFeatures="false" includeLaunchers="false">

-

-    <plugins>

-        <plugin id="com.springsource.org.aopalliance"/>

-        <plugin id="com.springsource.org.apache.commons.codec"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient"/>

-		<plugin id="com.springsource.org.apache.mina.core"/>

-		<plugin id="com.springsource.org.apache.sshd"/>

-		<plugin id="com.springsource.org.aspectj.weaver"/>

-        <plugin id="com.springsource.slf4j.api"/>

-        <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>

-        <plugin id="org.apache.felix.configadmin"/>

-        <plugin id="org.apache.felix.eventadmin"/>

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

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

-        <plugin id="org.eclipse.virgo.kernel.core"/>

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

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

-        <plugin id="org.eclipse.virgo.kernel.kerneldmfragment"/>

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

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

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

-        <plugin id="org.eclipse.virgo.kernel.shell"/>

-		<plugin id="org.eclipse.virgo.kernel.userregion"/>

-        <plugin id="org.eclipse.virgo.medic"/>

-        <plugin id="org.eclipse.virgo.medic.core"/>

-		<plugin id="org.eclipse.virgo.osgi.launcher"/>

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

-        <plugin id="org.eclipse.virgo.util.osgi"/>

-        <plugin id="org.eclipse.virgo.util.common"/>

-        <plugin id="org.eclipse.virgo.util.io"/>

-        <plugin id="org.eclipse.virgo.util.jmx"/>

-        <plugin id="org.eclipse.virgo.util.math"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest"/>

-        <plugin id="org.springframework.aop"/>

-        <plugin id="org.springframework.asm"/>

-        <plugin id="org.springframework.expression"/>

-        <plugin id="org.springframework.beans"/>

-        <plugin id="org.springframework.core"/>

-        <plugin id="org.springframework.context"/>

-		<plugin id="org.springframework.context.support"/>

-        <plugin id="org.springframework.osgi.core"/>

-        <plugin id="org.springframework.osgi.extender"/>

-        <plugin id="org.springframework.osgi.io"/>

-    </plugins>

-

-    <configurations>

-        <plugin id="com.springsource.slf4j.api" autostart="true"/>

-        <plugin id="com.springsource.slf4j.org.apache.commons.logging" autostart="true"/>

-        <plugin id="com.springsource.org.aspectj.weaver" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic" autostart="true"/>

-        <plugin id="org.apache.felix.configadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>

-        <plugin id="org.apache.felix.eventadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.common" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.io" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>

-        <plugin id="org.eclipse.virgo.util.math" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>

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

-        <plugin id="org.springframework.aop" autostart="false"/>

-        <plugin id="org.springframework.asm" autostart="false"/>

-        <plugin id="org.springframework.expression" autostart="false"/>

-        <plugin id="org.springframework.beans" autostart="false"/>

-        <plugin id="org.springframework.core" autostart="false"/>

-        <plugin id="org.springframework.context" autostart="false"/>

-        <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>

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

-        <plugin id="org.springframework.osgi.core" autostart="false"/>

-        <plugin id="org.springframework.osgi.extender" autostart="true"/>

-        <plugin id="org.springframework.osgi.io" autostart="false"/>

-        <plugin id="com.springsource.org.aopalliance" autostart="false"/>

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

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

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

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

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

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

-        <plugin id="org.eclipse.virgo.kernel.kerneldmfragment" autostart="true"/>

-        <plugin id="org.eclipse.virgo.kernel.shell" autostart="true"/>

-    </configurations>

-

-</product>
\ No newline at end of file
diff --git a/build-tomcat-server/org.eclipse.virgo.kernel.lib.product b/build-tomcat-server/org.eclipse.virgo.kernel.lib.product
deleted file mode 100644
index 2d30625..0000000
--- a/build-tomcat-server/org.eclipse.virgo.kernel.lib.product
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>

-<?pde version="3.5"?>

-

-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-  ~ Copyright (c) 2010 SAP AG

-  ~ 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:

-  ~    Hristo Iliev, SAP AG - initial contribution

-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

-

-<product name="Virgo Kernel Distribution (user region)" uid="org.eclipse.virgo.kernel.lib.product" version="1.0.0"

-         useFeatures="false" includeLaunchers="false">

-

-    <plugins>

-		<plugin id="org.eclipse.virgo.kernel.resources"/>

-		<plugin id="com.springsource.javax.transaction"/>

-		<plugin id="com.springsource.org.aopalliance"/>

-        <plugin id="com.springsource.org.apache.commons.codec"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient"/>

-        <plugin id="com.springsource.org.apache.commons.logging"/>

-		<plugin id="com.springsource.org.apache.mina.core"/>

-		<plugin id="com.springsource.org.apache.sshd"/>

-		<plugin id="com.springsource.org.aspectj.runtime"/>

-        <plugin id="com.springsource.slf4j.api"/>

-        <plugin id="org.apache.felix.configadmin"/>

-        <plugin id="org.apache.felix.eventadmin"/>

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

-		<plugin id="org.eclipse.virgo.kernel.authentication"/>

-        <plugin id="org.eclipse.virgo.kernel.core"/>

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

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

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

-		<plugin id="org.eclipse.virgo.kernel.osgicommand"/>

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

-        <plugin id="org.eclipse.virgo.kernel.shell"/>

-        <plugin id="org.eclipse.virgo.medic"/>

-        <plugin id="org.eclipse.virgo.medic.core"/>

-		<plugin id="org.eclipse.virgo.osgi.extensions.equinox"/>

-		<plugin id="org.eclipse.virgo.osgi.launcher"/>

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

-        <plugin id="org.eclipse.virgo.util.common"/>

-        <plugin id="org.eclipse.virgo.util.io"/>

-        <plugin id="org.eclipse.virgo.util.jmx"/>

-        <plugin id="org.eclipse.virgo.util.math"/>

-        <plugin id="org.eclipse.virgo.util.osgi"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest"/>

-        <plugin id="org.springframework.aop"/>

-        <plugin id="org.springframework.asm"/>

-        <plugin id="org.springframework.expression"/>

-        <plugin id="org.springframework.beans"/>

-        <plugin id="org.springframework.core"/>

-        <plugin id="org.springframework.context"/>

-        <plugin id="org.springframework.osgi.core"/>

-        <plugin id="org.springframework.osgi.extender"/>

-        <plugin id="org.springframework.osgi.io"/>

-    </plugins>

-

-    <configurations>

-        <plugin id="com.springsource.slf4j.api" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic" autostart="true"/>

-        <plugin id="org.apache.felix.configadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>

-        <plugin id="org.apache.felix.eventadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.common" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.io" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>

-        <plugin id="org.eclipse.virgo.util.math" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>

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

-        <plugin id="org.springframework.aop" autostart="false"/>

-        <plugin id="org.springframework.asm" autostart="false"/>

-        <plugin id="org.springframework.expression" autostart="false"/>

-        <plugin id="org.springframework.beans" autostart="false"/>

-        <plugin id="org.springframework.core" autostart="false"/>

-        <plugin id="org.springframework.context" autostart="false"/>

-        <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>

-        <plugin id="org.springframework.osgi.core" autostart="false"/>

-        <plugin id="org.springframework.osgi.extender" autostart="true"/>

-        <plugin id="org.springframework.osgi.io" autostart="false"/>

-        <plugin id="com.springsource.org.aopalliance" autostart="false"/>

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

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

-        <plugin id="org.eclipse.virgo.kernel.osgi" 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.shell" autostart="true"/>

-    </configurations>

-

-</product>
\ No newline at end of file
diff --git a/build-tomcat-server/org.eclipse.virgo.kernel.product b/build-tomcat-server/org.eclipse.virgo.kernel.product
deleted file mode 100644
index 403a082..0000000
--- a/build-tomcat-server/org.eclipse.virgo.kernel.product
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>

-<?pde version="3.5"?>

-

-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-  ~ Copyright (c) 2010 SAP AG

-  ~ 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:

-  ~    Hristo Iliev, SAP AG - initial contribution

-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

-

-<product name="Virgo Kernel Distribution" uid="org.eclipse.virgo.kernel.product" version="1.0.0"

-         useFeatures="false" includeLaunchers="false">

-

-    <plugins>

-		<plugin id="org.eclipse.virgo.kernel.resources"/>

-        <plugin id="com.springsource.slf4j.api"/>

-        <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>

-        <plugin id="com.springsource.org.aspectj.weaver"/>

-        <plugin id="org.eclipse.virgo.medic"/>

-        <plugin id="org.apache.felix.configadmin"/>

-        <plugin id="org.eclipse.virgo.medic.core"/>

-        <plugin id="org.eclipse.virgo.util.osgi"/>

-        <plugin id="org.apache.felix.eventadmin"/>

-        <plugin id="org.eclipse.virgo.util.common"/>

-        <plugin id="org.eclipse.virgo.util.io"/>

-        <plugin id="org.eclipse.virgo.util.jmx"/>

-        <plugin id="org.eclipse.virgo.util.math"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest"/>

-        <plugin id="com.springsource.org.apache.commons.codec"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient"/>

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

-        <plugin id="org.springframework.aop"/>

-        <plugin id="org.springframework.asm"/>

-        <plugin id="org.springframework.expression"/>

-        <plugin id="org.springframework.beans"/>

-        <plugin id="org.springframework.core"/>

-        <plugin id="org.springframework.context"/>

-        <plugin id="org.eclipse.virgo.kernel.core"/>

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

-        <plugin id="org.springframework.osgi.core"/>

-        <plugin id="org.springframework.osgi.extender"/>

-        <plugin id="org.springframework.osgi.io"/>

-        <plugin id="com.springsource.org.aopalliance"/>

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

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

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

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

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

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

-        <plugin id="org.eclipse.virgo.kernel.kerneldmfragment"/>

-        <plugin id="org.eclipse.virgo.kernel.shell"/>

-    </plugins>

-

-    <configurations>

-        <plugin id="com.springsource.slf4j.api" autostart="true"/>

-        <plugin id="com.springsource.slf4j.org.apache.commons.logging" autostart="true"/>

-        <plugin id="com.springsource.org.aspectj.weaver" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic" autostart="true"/>

-        <plugin id="org.apache.felix.configadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>

-        <plugin id="org.apache.felix.eventadmin" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.common" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.io" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>

-        <plugin id="org.eclipse.virgo.util.math" autostart="true"/>

-        <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>

-        <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>

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

-        <plugin id="org.springframework.aop" autostart="false"/>

-        <plugin id="org.springframework.asm" autostart="false"/>

-        <plugin id="org.springframework.expression" autostart="false"/>

-        <plugin id="org.springframework.beans" autostart="false"/>

-        <plugin id="org.springframework.core" autostart="false"/>

-        <plugin id="org.springframework.context" autostart="false"/>

-        <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>

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

-        <plugin id="org.springframework.osgi.core" autostart="false"/>

-        <plugin id="org.springframework.osgi.extender" autostart="true"/>

-        <plugin id="org.springframework.osgi.io" autostart="false"/>

-        <plugin id="com.springsource.org.aopalliance" autostart="false"/>

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

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

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

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

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

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

-        <plugin id="org.eclipse.virgo.kernel.kerneldmfragment" autostart="true"/>

-        <plugin id="org.eclipse.virgo.kernel.shell" autostart="true"/>

-    </configurations>

-

-</product>
\ No newline at end of file
diff --git a/build-tomcat-server/org.eclipse.virgo.kernel.repository.ext.product b/build-tomcat-server/org.eclipse.virgo.kernel.repository.ext.product
deleted file mode 100644
index ffe64ee..0000000
--- a/build-tomcat-server/org.eclipse.virgo.kernel.repository.ext.product
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>

-<?pde version="3.5"?>

-

-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-  ~ Copyright (c) 2010 SAP AG

-  ~ 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:

-  ~    Hristo Iliev, SAP AG - initial contribution

-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->

-

-<product name="Virgo Kernel Distribution (repository/ext)" uid="org.eclipse.virgo.kernel.repository.ext.product" version="1.0.0"

-         useFeatures="false" includeLaunchers="false">

-

-    <plugins>

-        <plugin id="com.springsource.org.aopalliance"/>

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

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

-        <plugin id="org.eclipse.virgo.kernel.dmfragment"/>

-        <plugin id="org.springframework.aop"/>

-        <plugin id="org.springframework.asm"/>

-        <plugin id="org.springframework.expression"/>

-        <plugin id="org.springframework.beans"/>

-        <plugin id="org.springframework.core"/>

-        <plugin id="org.springframework.context"/>

-        <plugin id="org.springframework.osgi.core"/>

-        <plugin id="org.springframework.osgi.extender"/>

-        <plugin id="org.springframework.osgi.io"/>

-    </plugins>

-

-    <configurations>

-        <plugin id="com.springsource.org.aopalliance" autostart="false"/>

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

-        <plugin id="org.springframework.aop" autostart="false"/>

-        <plugin id="org.springframework.asm" autostart="false"/>

-        <plugin id="org.springframework.expression" autostart="false"/>

-        <plugin id="org.springframework.beans" autostart="false"/>

-        <plugin id="org.springframework.core" autostart="false"/>

-        <plugin id="org.springframework.context" autostart="false"/>

-        <plugin id="org.springframework.osgi.core" autostart="false"/>

-        <plugin id="org.springframework.osgi.extender" autostart="true"/>

-        <plugin id="org.springframework.osgi.io" autostart="false"/>

-    </configurations>

-

-</product>
\ No newline at end of file
diff --git a/build-tomcat-server/p2.inf b/build-tomcat-server/p2.inf
deleted file mode 100644
index e09ad72..0000000
--- a/build-tomcat-server/p2.inf
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################

-# Copyright (c) 2010 SAP AG

-# 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:

-#    Hristo Iliev, SAP AG - initial contribution

-################################################################################

-

-properties.1.name = org.eclipse.equinox.p2.type.category

-properties.1.value = true

diff --git a/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/.project b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/.project
new file mode 100644
index 0000000..0d8264b
--- /dev/null
+++ b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.virgo.core.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/build.properties b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/eclipse_update_120.jpg b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/eclipse_update_120.jpg
Binary files differ
diff --git a/build-tomcat-server/resources/epl-v10.html b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/epl-v10.html
old mode 100644
new mode 100755
similarity index 100%
rename from build-tomcat-server/resources/epl-v10.html
rename to build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/epl-v10.html
diff --git a/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.properties b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.properties
new file mode 100644
index 0000000..6734b53
--- /dev/null
+++ b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# 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
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Tomcat Server Resources Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides configurations such as tomcat's configuration and updates to the user region artifacts.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.xml b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.xml
new file mode 100755
index 0000000..b6e730b
--- /dev/null
+++ b/build-tomcat-server/publish_resources/features/org.eclipse.virgo.tomcat.resources/feature.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.tomcat.resources"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+    
+    <plugin
+         id="tomcat_server_resources"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+</feature>
diff --git a/build-tomcat-server/publish_resources/products/tomcat-server/p2.inf b/build-tomcat-server/publish_resources/products/tomcat-server/p2.inf
new file mode 100644
index 0000000..4c6f109
--- /dev/null
+++ b/build-tomcat-server/publish_resources/products/tomcat-server/p2.inf
@@ -0,0 +1,18 @@
+###############################################################################
+# 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/build-tomcat-server/publish_resources/products/tomcat-server/tomcat-server.product b/build-tomcat-server/publish_resources/products/tomcat-server/tomcat-server.product
new file mode 100755
index 0000000..92ca003
--- /dev/null
+++ b/build-tomcat-server/publish_resources/products/tomcat-server/tomcat-server.product
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

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

+

+   <configIni use="default">

+   </configIni>

+   

+   <vm>

+   </vm>

+

+   <plugins>

+   </plugins>

+

+   <features>

+      <feature id="org.eclipse.virgo.tomcat.resources" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.scripts" version="0.0.0"/>

+   </features>

+   

+   <configurations>

+		<property name="org.eclipse.gemini.web.tomcat.config.path" value="configuration/tomcat-server.xml"/>

+	</configurations>

+

+</product>

diff --git a/build-tomcat-server/resources/about_files/LICENSE-dojo.txt b/build-tomcat-server/resources/about_files/LICENSE-dojo.txt
deleted file mode 100644
index ad1676a..0000000
--- a/build-tomcat-server/resources/about_files/LICENSE-dojo.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-Dojo is available under *either* the terms of the modified BSD license *or* the
-Academic Free License version 2.1. As a recipient of Dojo, you may choose which
-license to receive this code under (except as noted in per-module LICENSE
-files). Some modules may not be the copyright of the Dojo Foundation. These
-modules contain explicit declarations of copyright in both the LICENSE files in
-the directories in which they reside and in the code itself. No external
-contributions are allowed under licenses which are fundamentally incompatible
-with the AFL or BSD licenses that Dojo is distributed under.
-
-The text of the AFL and BSD licenses is reproduced below. 
-
--------------------------------------------------------------------------------
-The "New" BSD License:
-**********************
-
-Copyright (c) 2005-2009, The Dojo Foundation
-All rights reserved.
-
-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.
-  * Neither the name of the Dojo Foundation 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.
-
--------------------------------------------------------------------------------
-The Academic Free License, v. 2.1:
-**********************************
-
-This Academic Free License (the "License") applies to any original work of
-authorship (the "Original Work") whose owner (the "Licensor") has placed the
-following notice immediately following the copyright notice for the Original
-Work:
-
-Licensed under the Academic Free License version 2.1
-
-1) Grant of Copyright License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license to do the
-following:
-
-a) to reproduce the Original Work in copies;
-
-b) to prepare derivative works ("Derivative Works") based upon the Original
-Work;
-
-c) to distribute copies of the Original Work and Derivative Works to the
-public;
-
-d) to perform the Original Work publicly; and
-
-e) to display the Original Work publicly.
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide,
-royalty-free, non-exclusive, perpetual, sublicenseable license, under patent
-claims owned or controlled by the Licensor that are embodied in the Original
-Work as furnished by the Licensor, to make, use, sell and offer for sale the
-Original Work and Derivative Works.
-
-3) Grant of Source Code License. The term "Source Code" means the preferred
-form of the Original Work for making modifications to it and all available
-documentation describing how to modify the Original Work. Licensor hereby
-agrees to provide a machine-readable copy of the Source Code of the Original
-Work along with each copy of the Original Work that Licensor distributes.
-Licensor reserves the right to satisfy this obligation by placing a
-machine-readable copy of the Source Code in an information repository
-reasonably calculated to permit inexpensive and convenient access by You for as
-long as Licensor continues to distribute the Original Work, and by publishing
-the address of that information repository in a notice immediately following
-the copyright notice that applies to the Original Work.
-
-4) Exclusions From License Grant. Neither the names of Licensor, nor the names
-of any contributors to the Original Work, nor any of their trademarks or
-service marks, may be used to endorse or promote products derived from this
-Original Work without express prior written permission of the Licensor. Nothing
-in this License shall be deemed to grant any rights to trademarks, copyrights,
-patents, trade secrets or any other intellectual property of Licensor except as
-expressly stated herein. No patent license is granted to make, use, sell or
-offer to sell embodiments of any patent claims other than the licensed claims
-defined in Section 2. No right is granted to the trademarks of Licensor even if
-such marks are included in the Original Work. Nothing in this License shall be
-interpreted to prohibit Licensor from licensing under different terms from this
-License any Original Work that Licensor otherwise would have a right to
-license.
-
-5) This section intentionally omitted.
-
-6) Attribution Rights. You must retain, in the Source Code of any Derivative
-Works that You create, all copyright, patent or trademark notices from the
-Source Code of the Original Work, as well as any notices of licensing and any
-descriptive text identified therein as an "Attribution Notice." You must cause
-the Source Code for any Derivative Works that You create to carry a prominent
-Attribution Notice reasonably calculated to inform recipients that You have
-modified the Original Work.
-
-7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that
-the copyright in and to the Original Work and the patent rights granted herein
-by Licensor are owned by the Licensor or are sublicensed to You under the terms
-of this License with the permission of the contributor(s) of those copyrights
-and patent rights. Except as expressly stated in the immediately proceeding
-sentence, the Original Work is provided under this License on an "AS IS" BASIS
-and WITHOUT WARRANTY, either express or implied, including, without limitation,
-the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
-This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No
-license to Original Work is granted hereunder except under this disclaimer.
-
-8) Limitation of Liability. Under no circumstances and under no legal theory,
-whether in tort (including negligence), contract, or otherwise, shall the
-Licensor be liable to any person for any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License
-or the use of the Original Work including, without limitation, damages for loss
-of goodwill, work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses. This limitation of liability shall not
-apply to liability for death or personal injury resulting from Licensor'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.
-
-9) Acceptance and Termination. If You distribute copies of the Original Work or
-a Derivative Work, You must make a reasonable effort under the circumstances to
-obtain the express assent of recipients to the terms of this License. Nothing
-else but this License (or another written agreement between Licensor and You)
-grants You permission to create Derivative Works based upon the Original Work
-or to exercise any of the rights granted in Section 1 herein, and any attempt
-to do so except under the terms of this License (or another written agreement
-between Licensor and You) is expressly prohibited by U.S. copyright law, the
-equivalent laws of other countries, and by international treaty. Therefore, by
-exercising any of the rights granted to You in Section 1 herein, You indicate
-Your acceptance of this License and all of its terms and conditions.
-
-10) Termination for Patent Action. This License shall terminate automatically
-and You may no longer exercise any of the rights granted to You by this License
-as of the date You commence an action, including a cross-claim or counterclaim,
-against Licensor or any licensee alleging that the Original Work infringes a
-patent. This termination provision shall not apply for an action alleging
-patent infringement by combinations of the Original Work with other software or
-hardware.
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this
-License may be brought only in the courts of a jurisdiction wherein the
-Licensor resides or in which Licensor conducts its primary business, and under
-the laws of that jurisdiction excluding its conflict-of-law provisions. The
-application of the United Nations Convention on Contracts for the International
-Sale of Goods is expressly excluded. Any use of the Original Work outside the
-scope of this License or after its termination shall be subject to the
-requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et
-seq., the equivalent laws of other countries, and international treaty. This
-section shall survive the termination of this License.
-
-12) Attorneys Fees. In any action to enforce the terms of this License or
-seeking damages relating thereto, the prevailing party shall be entitled to
-recover its costs and expenses, including, without limitation, reasonable
-attorneys' fees and costs incurred in connection with such action, including
-any appeal of such action. This section shall survive the termination of this
-License.
-
-13) Miscellaneous. This License represents the complete agreement concerning
-the 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.
-
-14) Definition of "You" in This License. "You" throughout this License, whether
-in upper or lower case, 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 that controls, is controlled by, or is
-under common control with you. For 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.
-
-15) Right to Use. You may use the Original Work in all ways not otherwise
-restricted or conditioned by this License or by law, and Licensor promises not
-to interfere with or be responsible for such uses by You.
-
-This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved.
-Permission is hereby granted to copy and distribute this license without
-modification. This license may not be modified without the express written
-permission of its copyright owner.
diff --git a/build-tomcat-server/resources/about_files/apache-v20.txt b/build-tomcat-server/resources/about_files/apache-v20.txt
deleted file mode 100644
index d645695..0000000
--- a/build-tomcat-server/resources/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/build-tomcat-server/resources/about_files/cddl-10.txt b/build-tomcat-server/resources/about_files/cddl-10.txt
deleted file mode 100644
index 9709055..0000000
--- a/build-tomcat-server/resources/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/build-tomcat-server/resources/notice.html b/build-tomcat-server/resources/notice.html
deleted file mode 100644
index 0ee73f4..0000000
--- a/build-tomcat-server/resources/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/build-tomcat-server/test-package.xml b/build-tomcat-server/test-package.xml
index 1c6fffc..748f21d 100644
--- a/build-tomcat-server/test-package.xml
+++ b/build-tomcat-server/test-package.xml
@@ -27,7 +27,7 @@
 			</fileset>
 		</chmod>
 		<chmod perm="600">
-			<fileset dir="${test.package.dir}/config">
+			<fileset dir="${test.package.dir}/configuration">
 				<include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
 			</fileset>
 		</chmod>
diff --git a/build.versions b/build.versions
index 7b8f63d..0d33edf 100644
--- a/build.versions
+++ b/build.versions
@@ -1,11 +1,11 @@
-org.eclipse.virgo.osgi=3.1.0.D-20111205151528
-org.eclipse.virgo.medic=3.1.0.D-20111223113430
-org.eclipse.virgo.kernel=3.1.0.D-20111223114541
-org.eclipse.virgo.repository=3.1.0.D-20111223114028
-org.eclipse.virgo.documentation=3.1.0.D-20111223131456
-org.eclipse.virgo.apps=3.1.0.D-20111223130114
-org.eclipse.virgo.web=3.1.0.D-20111223122651
-org.eclipse.virgo.util=3.1.0.D-20111205151812
+org.eclipse.virgo.osgi=3.1.0.M01
+org.eclipse.virgo.medic=3.1.0.M01
+org.eclipse.virgo.kernel=3.1.0.D-20120105235247
+org.eclipse.virgo.repository=3.1.0.M01
+org.eclipse.virgo.documentation=3.1.0.D-20120106014840
+org.eclipse.virgo.apps=3.1.0.D-20120106012711
+org.eclipse.virgo.web=3.1.0.D-20120106003439
+org.eclipse.virgo.util=3.1.0.M01
 javax.ejb=3.0.0
 javax.jms=1.1.0
 javax.portlet=2.0.0.v20110525
@@ -32,4 +32,5 @@
 org.apache.log4j=1.2.15
 org.slf4j.test=1.5.0
 com.dumbster=1.6.0
-
+org.eclipse.virgo.build.tools=1.1.0.RELEASE
+org.eclipse.equinox.launcher=1.3.0.v20111003-1644
diff --git a/scripts/releaselor/releaselor.rb b/scripts/releaselor/releaselor.rb
index 2caf5fa..b6b113d 100755
--- a/scripts/releaselor/releaselor.rb
+++ b/scripts/releaselor/releaselor.rb
@@ -32,6 +32,7 @@
     'test' => 'test',
     'medic' => 'medic',
     'artifact-repository' => 'artifact-repository',
+    'nano' => 'nano',
     'kernel' => 'kernel',
     'kernel-tools' => 'kernel-tools',
     'gemini-web' => 'gemini-web',
@@ -58,15 +59,16 @@
     Repository.new(virgo_eclipse_repo_root,  'test',                 paths['test'],                'org.eclipse.virgo.test',            bundle_version, release_from_branch,        default_targets),
     Repository.new(virgo_eclipse_repo_root,  'medic',                paths['medic'],               'org.eclipse.virgo.medic',           bundle_version, release_from_branch,        default_targets),
     Repository.new(virgo_eclipse_repo_root,  'artifact-repository',  paths['artifact-repository'], 'org.eclipse.virgo.repository',      bundle_version, release_from_branch,        default_targets),
-    Repository.new(virgo_eclipse_repo_root,  'kernel',               paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root,  'nano',               paths['nano'],              'org.eclipse.virgo.nano',          bundle_version, release_from_branch,        'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
+    Repository.new(virgo_eclipse_repo_root,  'kernel',               paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root,  'kernel-tools',         paths['kernel-tools'],        'org.eclipse.virgo.kernel-tools',    bundle_version, release_from_branch,        default_targets),
     Repository.new(gemini_eclipse_repo_root, 'gemini-web-container', paths['gemini-web'],          'org.eclipse.gemini.web',            gemini_version, gemini_release_from_branch, 'clean clean-integration test doc package publish-ivy publish-maven'), 
     Repository.new(virgo_eclipse_repo_root,  'web',                  paths['web'],                 'org.eclipse.virgo.web',             bundle_version, release_from_branch,        default_targets),
     Repository.new(virgo_eclipse_repo_root,  'snaps',                paths['snaps'],               'org.eclipse.virgo.snaps',           bundle_version, release_from_branch,        'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root,  'apps',                 paths['apps'],                'org.eclipse.virgo.apps',            bundle_version, release_from_branch,        default_targets),
     Repository.new(virgo_eclipse_repo_root,  'documentation',        paths['documentation'],       'org.eclipse.virgo.documentation',   bundle_version, release_from_branch,        'clean clean-integration doc-html package publish-ivy publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root,  'web-server',           paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root,  'jetty-server',         paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-package-download')
+    Repository.new(virgo_eclipse_repo_root,  'web-server',           paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root,  'jetty-server',         paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch,        'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
   ]
 
 elsif args[:product_release] == 'kernel' 
@@ -78,7 +80,8 @@
     Repository.new(virgo_eclipse_repo_root, 'test',                paths['test'],                'org.eclipse.virgo.test',            bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'medic',               paths['medic'],               'org.eclipse.virgo.medic',           bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository',      bundle_version, release_from_branch, default_targets),
-    Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root,  'nano',               paths['nano'],              'org.eclipse.virgo.nano',          bundle_version, release_from_branch,        'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
+    Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root, 'kernel-tools',        paths['kernel-tools'],        'org.eclipse.virgo.kernel-tools',    bundle_version, release_from_branch, default_targets)
   ]
 
@@ -89,8 +92,8 @@
     Repository.new(virgo_eclipse_repo_root, 'snaps',               paths['snaps'],               'org.eclipse.virgo.snaps',           bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root, 'apps',                paths['apps'],                'org.eclipse.virgo.apps',            bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'documentation',       paths['documentation'],       'org.eclipse.virgo.documentation',   bundle_version, release_from_branch, 'clean clean-integration doc-html package publish-ivy publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-package-download')
+    Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
   ]
   
 elsif args[:product_release] == 'virgo' 
@@ -102,14 +105,15 @@
     Repository.new(virgo_eclipse_repo_root, 'test',                paths['test'],                'org.eclipse.virgo.test',            bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'medic',               paths['medic'],               'org.eclipse.virgo.medic',           bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository',      bundle_version, release_from_branch, default_targets),
-    Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root,  'nano',               paths['nano'],              'org.eclipse.virgo.nano',          bundle_version, release_from_branch,        'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
+    Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root, 'kernel-tools',        paths['kernel-tools'],        'org.eclipse.virgo.kernel-tools',    bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'web',                 paths['web'],                 'org.eclipse.virgo.web',             bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'snaps',               paths['snaps'],               'org.eclipse.virgo.snaps',           bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
     Repository.new(virgo_eclipse_repo_root, 'apps',                paths['apps'],                'org.eclipse.virgo.apps',            bundle_version, release_from_branch, default_targets),
     Repository.new(virgo_eclipse_repo_root, 'documentation',       paths['documentation'],       'org.eclipse.virgo.documentation',   bundle_version, release_from_branch, 'clean clean-integration doc-html package publish-ivy publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
-    Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-package-download')
+    Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+    Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
   ]
 
 else
@@ -121,14 +125,15 @@
       Repository.new(virgo_eclipse_repo_root, 'test',                paths['test'],                'org.eclipse.virgo.test',            bundle_version, release_from_branch, default_targets),
       Repository.new(virgo_eclipse_repo_root, 'medic',               paths['medic'],               'org.eclipse.virgo.medic',           bundle_version, release_from_branch, default_targets),
       Repository.new(virgo_eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository',      bundle_version, release_from_branch, default_targets),
-      Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
+      Repository.new(virgo_eclipse_repo_root,  'nano',               paths['nano'],              'org.eclipse.virgo.nano',          bundle_version, release_from_branch,        'clean clean-integration test package publish-ivy publish-maven publish-multiple-nano-packages-build publish-updatesite-build publish-multiple-nano-packages-download'),
+      Repository.new(virgo_eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',          bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
       Repository.new(virgo_eclipse_repo_root, 'kernel-tools',        paths['kernel-tools'],        'org.eclipse.virgo.kernel-tools',    bundle_version, release_from_branch, default_targets),
       Repository.new(virgo_eclipse_repo_root, 'web',                 paths['web'],                 'org.eclipse.virgo.web',             bundle_version, release_from_branch, default_targets),
       Repository.new(virgo_eclipse_repo_root, 'snaps',               paths['snaps'],               'org.eclipse.virgo.snaps',           bundle_version, release_from_branch, 'clean clean-integration test package publish-ivy publish-maven publish-package-build publish-package-download'),
       Repository.new(virgo_eclipse_repo_root, 'apps',                paths['apps'],                'org.eclipse.virgo.apps',            bundle_version, release_from_branch, default_targets),
       Repository.new(virgo_eclipse_repo_root, 'documentation',       paths['documentation'],       'org.eclipse.virgo.documentation',   bundle_version, release_from_branch, 'clean clean-integration doc-html package publish-ivy publish-package-download'),
-      Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-package-download'),
-      Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-package-download')
+      Repository.new(virgo_eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',      bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-maven publish-package-build publish-updatesite-build publish-package-download'),
+      Repository.new(virgo_eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',    bundle_version, release_from_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build publish-package-download publish-updatesite-download')
     ]
 
 end
diff --git a/scripts/ripplor/ripplor.rb b/scripts/ripplor/ripplor.rb
index a482251..a4d9bb8 100755
--- a/scripts/ripplor/ripplor.rb
+++ b/scripts/ripplor/ripplor.rb
@@ -25,6 +25,7 @@
     'test' => 'test',
     'medic' => 'medic',
     'artifact-repository' => 'artifact-repository',
+    'nano' => 'nano',
     'kernel' => 'kernel',
     'kernel-tools' => 'kernel-tools',
     'web' => 'web',
@@ -46,14 +47,15 @@
   Repository.new(eclipse_repo_root, 'test',                paths['test'],                'org.eclipse.virgo.test',          nil, ripple_branch),
   Repository.new(eclipse_repo_root, 'medic',               paths['medic'],               'org.eclipse.virgo.medic',         nil, ripple_branch),
   Repository.new(eclipse_repo_root, 'artifact-repository', paths['artifact-repository'], 'org.eclipse.virgo.repository',    nil, ripple_branch),
-  Repository.new(eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',        nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build'),
+  Repository.new(eclipse_repo_root, 'nano',                paths['nano'],                'org.eclipse.virgo.nano',          nil, ripple_branch, 'clean clean-integration test package publish-ivy publish-multiple-nano-packages-build publish-updatesite-build'),
+  Repository.new(eclipse_repo_root, 'kernel',              paths['kernel'],              'org.eclipse.virgo.kernel',        nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build'),
   Repository.new(eclipse_repo_root, 'kernel-tools',        paths['kernel-tools'],        'org.eclipse.virgo.kernel-tools',  nil, ripple_branch),
   Repository.new(eclipse_repo_root, 'web',                 paths['web'],                 'org.eclipse.virgo.web',           nil, ripple_branch),
   Repository.new(eclipse_repo_root, 'snaps',               paths['snaps'],               'org.eclipse.virgo.snaps',         nil, ripple_branch, 'clean clean-integration test package publish-ivy publish-package-build'),
   Repository.new(eclipse_repo_root, 'apps',                paths['apps'],                'org.eclipse.virgo.apps',          nil, ripple_branch),
   Repository.new(eclipse_repo_root, 'documentation',       paths['documentation'],       'org.eclipse.virgo.documentation', nil, ripple_branch, 'clean clean-integration doc-html publish-ivy'),
-  Repository.new(eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',    nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build'),
-  Repository.new(eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',  nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build')
+  Repository.new(eclipse_repo_root, 'web-server',          paths['web-server'],          'org.eclipse.virgo.web-server',    nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build'),
+  Repository.new(eclipse_repo_root, 'jetty-server',        paths['jetty-server'],        'org.eclipse.virgo.jetty-server',  nil, ripple_branch, 'clean clean-integration test package smoke-test publish-ivy publish-package-build publish-updatesite-build')
 ]
 
 repos = Array.new
diff --git a/scripts/virgo-build-updatlor/update-virgo-build-all.rb b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
index 172eb01..cef6fd4 100755
--- a/scripts/virgo-build-updatlor/update-virgo-build-all.rb
+++ b/scripts/virgo-build-updatlor/update-virgo-build-all.rb
@@ -37,9 +37,7 @@
     'sample-greenpages' => 'sample-greenpages',
     'sample-configuration-properties' => 'sample-configuration-properties',
     'sample-formtags' => 'sample-formtags',
-    'sample-osgi-examples' => 'sample-osgi-examples',
-    'gemini-web-container' => 'gemini-web-container',
-    'nano' => 'nano'
+    'sample-osgi-examples' => 'sample-osgi-examples'
   }
 end
 
@@ -51,7 +49,6 @@
 gemini_web_repo_root = 'ssh://' + args[:remote_user] + '@git.eclipse.org/gitroot/gemini.web/org.eclipse.gemini.web.'
 
 VIRGO_PERMISSION_REPOS = [
-  Repository.new(virgo_repo_root, 'nano',                                  paths['nano'],                             nil, nil, update_branch),
   Repository.new(virgo_repo_root, 'sample-greenpages',                     paths['sample-greenpages'],                nil, nil, update_branch),
   Repository.new(virgo_repo_root, 'sample-configuration-properties',       paths['sample-configuration-properties'],  nil, nil, update_branch),
   Repository.new(virgo_repo_root, 'sample-formtags',                       paths['sample-formtags'],                  nil, nil, update_branch),
@@ -75,11 +72,8 @@
   Repository.new(virgo_repo_root, 'kernel-tools',                          paths['kernel-tools'],                     nil, nil, update_branch)
 ]
 
-GEMINI_WEB_PERMISSION_REPOS = [
-  Repository.new(gemini_web_repo_root, 'gemini-web-container',             paths['gemini-web-container'],             nil, nil, gemini_update_branch)
-]
  
-ALL_REPOS = VIRGO_PERMISSION_REPOS + GEMINI_WEB_PERMISSION_REPOS
+ALL_REPOS = VIRGO_PERMISSION_REPOS
 
 start_time = Time.new