463462 - Switches Virgo Nano Server(s) to Gradle build
diff --git a/build-packaging/nano/bin/checkJava.bat b/build-packaging/nano/bin/checkJava.bat
deleted file mode 100644
index 8df7848..0000000
--- a/build-packaging/nano/bin/checkJava.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-rem Script for checking we have the right version of Java.
-
-if "%JAVA_HOME%" == "" (
-  echo The JAVA_HOME environment variable is not defined.
-  exit /B 1
-)
-if "%CLASSPATH%" == "" (
-  echo The CLASSPATH environment variable is not defined.
-  exit /B 1
-)
-
-rem Run java version check with the discovered java jvm.
-"%JAVA_HOME%\bin\java" -classpath "%CLASSPATH%" org.eclipse.virgo.util.env.JavaVersionChecker
-
-rem If non-zero exit then either we cannot find the checker or the Java version is incorrect.
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/build-packaging/nano/bin/checkJava.sh b/build-packaging/nano/bin/checkJava.sh
deleted file mode 100755
index a06ecd5..0000000
--- a/build-packaging/nano/bin/checkJava.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-#
-# make adjustment when running under cygwin
-#
-if $cygwin; then
-    CLASSPATH=$(cygpath -wp "$CLASSPATH")
-fi
-
-if [ -z "$JAVA_HOME" ]
-then
-  	JAVA_EXECUTABLE=java
-else
-  	JAVA_EXECUTABLE=$JAVA_HOME/bin/java
-fi
-
-# Run java version check with the discovered java jvm.
-$JAVA_EXECUTABLE \
-	-classpath "$CLASSPATH" \
-	org.eclipse.virgo.util.env.JavaVersionChecker
-
-# If non-zero exit then either we cannot find the check or the java version is incorrect.
-if [ $? != 0 ]
-then
-	exit 1
-fi
diff --git a/build-packaging/nano/bin/dmk.bat b/build-packaging/nano/bin/dmk.bat
deleted file mode 100644
index db94d6c..0000000
--- a/build-packaging/nano/bin/dmk.bat
+++ /dev/null
@@ -1,280 +0,0 @@
-@echo off
-rem Script for starting and stopping the kernel
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Derive full path for script (includes trailing backslash)
-  set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
-  call "%SCRIPT_DIR%setupVars.bat"
-  if not "%ERRORLEVEL%"=="0" (
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B %ERRORLEVEL%
-  )
-) else (
-  echo Cannot set up environment. "setupVars.bat" file missing.
-  if "%OS%" == "Windows_NT" endlocal
-  exit /B 1
-)
-
-rem Select command we are to run
-
-  rem First parm is command
-    set COMMAND=%~1
-    rem Rest are parameters - shift done in subroutines
-   
-  rem Switch on COMMAND in {"start","stop"}
-
-    if "%COMMAND%" == "start" (
-      call :doStartCommand %*
-      if "%OS%" == "Windows_NT" endlocal
-      exit /B 0
-    )
-
-    if "%COMMAND%" == "stop"  (
-      call :doStopCommand  %*
-      if "%OS%" == "Windows_NT" endlocal
-      exit /B 0
-    )
-
-    echo Unknown command: %COMMAND%
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B 1
-
-rem ------------------ Subroutines
-rem ------------------------------
-:doStartCommand
-
-  shift
-  rem The shift must be here :()
-
-  rem Check further file that needs to exist
-  for %%I in ("%KERNEL_HOME%\bin\jmxPermissions.vbs") do if not exist "%%~I" (
-    echo File "%%~I" does not exist but is required to continue.
-    exit /B 1
-  )
-
-  rem Set defaults
-    set CONFIG_DIR=%KERNEL_HOME%\configuration
-    set CLEAN_FLAG=
-    set NO_START_FLAG=
-    set DEBUG_FLAG=
-    set DEBUG_PORT=8000
-    set SUSPEND=n
-    if not defined JMX_PORT set JMX_PORT=9875
-    if not defined KEYSTORE_PASSWORD set KEYSTORE_PASSWORD=changeit
-    set ADDITIONAL_ARGS=
-
-  rem Loop through options
-
-  :startOptionLoop
-  if "%~1"=="" goto endStartOptionLoop
-  if "%~1"=="-debug"             goto debug
-  if "%~1"=="-clean"             goto clean
-  if "%~1"=="-configDir"         goto configDir
-  if "%~1"=="-jmxport"           goto jmxport
-  if "%~1"=="-keystore"          goto keystore
-  if "%~1"=="-keystorePassword"  goto keystorePassword
-  if "%~1"=="-noStart"           goto noStart
-  if "%~1"=="-suspend"           goto suspend
-  if "%~1"=="-shell"             goto shell
-
-  set ADDITIONAL_ARGS=%ADDITIONAL_ARGS% "%~1"
-
-  :continueStartOptionLoop
-    shift
-    goto startOptionLoop
-
-  :debug
-    set DEBUG_FLAG=1
-    set PORT_CANDIDATE=%~2
-    if not "%PORT_CANDIDATE:~0,1%"=="-" (
-      set DEBUG_PORT=%PORT_CANDIDATE%
-      shift
-    )
-    goto continueStartOptionLoop
-  :clean
-    set CLEAN_FLAG=1
-    goto continueStartOptionLoop
-  :configDir
-    set CONFIG_DIR=%~2
-    rem unless absolute, treat as relative to kernel home
-    if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDir
-    if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDir
-    set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
-  :absoluteConfigDir
-    shift
-    goto continueStartOptionLoop
-  :jmxport
-    set JMX_PORT=%~2
-    shift
-    goto continueStartOptionLoop
-  :keystore
-    set KEYSTORE_PATH=%~2
-    shift
-    goto continueStartOptionLoop
-  :keystorePassword
-    set KEYSTORE_PASSWORD=%~2
-    shift
-    goto continueStartOptionLoop
-  :noStart
-    set NO_START_FLAG=1
-    goto continueStartOptionLoop
-  :suspend
-    set SUSPEND=y
-    goto continueStartOptionLoop
-  :shell
-    set SHELL_FLAG=1
-    goto continueStartOptionLoop
-
-  :endStartOptionLoop
-
-  
-  rem Adjust permissions if necessary
-    cscript //NoLogo "%KERNEL_HOME%\bin\jmxPermissions.vbs" "%CONFIG_DIR%\"
-
-  rem Adjust options now all are known
-    if "%KEYSTORE_PATH%"=="" set KEYSTORE_PATH=%CONFIG_DIR%\keystore
-    if not "%DEBUG_FLAG%"=="" set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=%DEBUG_PORT%,server=y,suspend=%SUSPEND%
-
-  rem do Clean work:
-    if not "%CLEAN_FLAG%"=="" (
-      rmdir /Q /S "%KERNEL_HOME%\serviceability"
-      rmdir /Q /S "%KERNEL_HOME%\work"
-      
-      set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
-    )
-
-  rem do Shell work:
-    if not "%SHELL_FLAG%"=="" ( 
-      echo "Warning: Kernel shell not supported; -shell option ignored."
-      rem set LAUNCH_OPTS=%LAUNCH_OPTS% -Forg.eclipse.virgo.kernel.shell.local=true
-    )
-
-  rem Set JMX options
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT% 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.authenticate=true 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.login.config=virgo-kernel 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.access.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.jmxremote.access.properties" 
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStore="%KEYSTORE_PATH%" 
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWORD% 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl=true 
-    set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl.need.client.auth=false
-
-    if not "%NO_START_FLAG%"=="" goto :eof
-    rem ensure that the tmp directory exists:
-      set TMP_DIR="%KERNEL_HOME%\work\tmp"
-      if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
-
-       set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
-    rem Run the server
-  
-      rem Marshall parameters
-      set KERNEL_JAVA_PARMS=%JAVA_OPTS% %DEBUG_OPTS% %JMX_OPTS%
-
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:+HeapDumpOnOutOfMemoryError 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:ErrorFile="%KERNEL_HOME%\serviceability\error.log" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:HeapDumpPath="%KERNEL_HOME%\serviceability\heap_dump.hprof"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.security.auth.login.config="%CONFIG_DIR%\org.eclipse.virgo.kernel.authentication.config" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%" 
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java6-server.profile"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Declipse.ignoreApp="true" 
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.install.area="%KERNEL_HOME%"
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.configuration.area="%KERNEL_HOME%\work" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.frameworkClassPath="%FWCLASSPATH%"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.endorsed.dirs="%KERNEL_HOME%\lib\endorsed"
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%" 
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.equinox.launcher.Main
-	  set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %LAUNCH_OPTS%
-      set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %ADDITIONAL_ARGS%
-
-      rem Now run it
-        PUSHD %KERNEL_HOME%
-        "%JAVA_HOME%\bin\java" %KERNEL_JAVA_PARMS%
-        POPD
-
-goto :eof
-
-rem ------------------------------
-:doStopCommand
-  
-  shift
-  rem The shift must be here :()
-
-  rem Set defaults
-  set CONFIG_DIR=%KERNEL_HOME%\configuration
-  if not defined TRUSTSTORE_PATH set TRUSTSTORE_PATH=%CONFIG_DIR%\keystore
-  if not defined TRUSTSTORE_PASSWORD set TRUSTSTORE_PASSWORD=changeit
-  if not defined JMX_PORT set JMX_PORT=9875
-  set OTHER_ARGS=
-
-  rem Loop through options
-  :stopOptionLoop
-
-  if "%~1"=="" goto endStopOptionLoop  
-  if "%~1"=="-truststore" goto truststoreStop
-  if "%~1"=="-truststorePassword" goto truststorePasswordStop
-  if "%~1"=="-configDir" goto configDirStop 
-  if "%~1"=="-jmxport" goto jmxportStop
-  
-  set OTHER_ARGS=%OTHER_ARGS% "%~1"
-    
-  :continueStopOptionLoop
-  shift
-  goto stopOptionLoop
-
-  :truststoreStop
-  set TRUSTSTORE_PATH=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :truststorePasswordStop
-  set TRUSTSTORE_PASSWORD=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :configDirStop
-    set CONFIG_DIR=%~2
-    rem unless absolute, treat as relative to kernel home
-    if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDirStop
-    if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDirStop
-    set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
-  :absoluteConfigDirStop
-    shift
-    goto continueStopOptionLoop
-
-  :jmxportStop
-  set JMX_PORT=%~2
-  shift
-  goto continueStopOptionLoop
-
-  :endStopOptionLoop
-
-  rem Call shutdown client
-
-    rem Extend JMX options
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%"
-    set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
-    set OTHER_ARGS=%OTHER_ARGS% -jmxport %JMX_PORT%
-
-    rem Marshall parameters
-    set SHUTDOWN_PARMS= %JAVA_OPTS% %JMX_OPTS%
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -classpath "%CLASSPATH%"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% org.eclipse.virgo.nano.shutdown.ShutdownClient
-    set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% %OTHER_ARGS%
-
-    rem Run Java program
-    PUSHD %KERNEL_HOME%
-    "%JAVA_HOME%\bin\java" %SHUTDOWN_PARMS%
-    POPD
-
-goto :eof
diff --git a/build-packaging/nano/bin/dmk.sh b/build-packaging/nano/bin/dmk.sh
deleted file mode 100755
index 78f8089..0000000
--- a/build-packaging/nano/bin/dmk.sh
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-# determine kernel home
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-
-# make KERNEL_HOME absolute
-KERNEL_HOME=`cd "$KERNEL_HOME"; pwd`
-
-# setup classpath and java environment
-. "$KERNEL_HOME/bin/setupClasspath.sh"
-
-# execute user setenv script if needed
-if [ -r "$KERNEL_HOME/bin/setenv.sh" ]
-then
-	. $KERNEL_HOME/bin/setenv.sh
-fi
-
-
-# Run java version check with the discovered java jvm.
-. "$KERNEL_HOME/bin/checkJava.sh"
-
-shopt -s extglob
-	
-# parse the command we executing
-COMMAND=$1
-shift;
-	
-if [ "$COMMAND" = "start" ]
-then
-	
-	# parse the standard arguments
-	CONFIG_DIR=$KERNEL_HOME/configuration
-	CLEAN_FLAG=
-	NO_START_FLAG=
-
-	SHELL_FLAG=
-	
-	DEBUG_FLAG=
-	DEBUG_PORT=8000
-	SUSPEND=n
-	if [ -z "$JMX_PORT" ]
-	then
-		JMX_PORT=9875
-	fi
-	
-	if [ -z "$KEYSTORE_PASSWORD" ]
-	then
-		KEYSTORE_PASSWORD=changeit
-	fi
-	
-	ADDITIONAL_ARGS=
-
-	while (($# > 0))
-		do
-		case $1 in
-		-debug)
-				DEBUG_FLAG=1
-				if [[ "$2" == +([0-9]) ]]
-				then
-					DEBUG_PORT=$2
-					shift;
-				fi
-				;;
-		-clean)
-				CLEAN_FLAG=1
-				;;
-		-configDir)
-				CONFIG_DIR=$2
-				shift;
-				;;
-		-jmxport)
-				JMX_PORT=$2
-				shift;
-				;;
-		-keystore)
-				KEYSTORE_PATH=$2
-				shift;
-				;;
-		-keystorePassword)
-				KEYSTORE_PASSWORD=$2
-				shift;
-				;;
-		-noStart)
-				NO_START_FLAG=1
-				;;
-				
-		-suspend)
-				SUSPEND=y
-				;;
-		-shell)
-				SHELL_FLAG=1
-				;;
-		*)
-				ADDITIONAL_ARGS="$ADDITIONAL_ARGS $1"
-				;;
-		esac
-		shift
-	done
-	
-	# start the kernel
-	if [[ "$CONFIG_DIR" != /* ]]
-	then
-	    CONFIG_DIR=$KERNEL_HOME/$CONFIG_DIR
-	fi
-
-	if [ -z "$KEYSTORE_PATH" ]
-	then
-	    KEYSTORE_PATH=$CONFIG_DIR/keystore
-	fi
-
-	if [ "$DEBUG_FLAG" ]
-	then
-		DEBUG_OPTS=" \
-			-Xdebug \
-			-Xrunjdwp:transport=dt_socket,address=$DEBUG_PORT,server=y,suspend=$SUSPEND"
-	fi
-
-	if [ "$CLEAN_FLAG" ]
-	then
-        rm -rf $KERNEL_HOME/work
-        rm -rf $KERNEL_HOME/serviceability
-
-        LAUNCH_OPTS="$LAUNCH_OPTS -clean" #equivalent to setting osgi.clean to "true"
-	fi
-	
-	if [ "$SHELL_FLAG" ]
-	then
-	    echo "Warning: Kernel shell not supported; -shell option ignored."
-		# LAUNCH_OPTS="$LAUNCH_OPTS -Forg.eclipse.virgo.kernel.shell.local=true"
-	fi
-
-    ACCESS_PROPERTIES=$CONFIG_DIR/org.eclipse.virgo.kernel.jmxremote.access.properties
-    AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config
-    AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties
-    CONFIG_AREA=$KERNEL_HOME/work
-    JAVA_PROFILE=$KERNEL_HOME/configuration/java6-server.profile
-
-    if $cygwin; then
-        ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
-        AUTH_LOGIN=$(cygpath -wp $AUTH_LOGIN)
-        AUTH_FILE=$(cygpath -wp $AUTH_FILE)
-        KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
-        CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
-        CONFIG_AREA=$(cygpath -wp $CONFIG_AREA)
-        JAVA_PROFILE=$(cygpath -wp $JAVA_PROFILE)
-    fi
-	
-	# Set the required permissions on the JMX configuration files
-	chmod 600 "$ACCESS_PROPERTIES"
-
-	JMX_OPTS=" \
-		$JMX_OPTS \
-		-Dcom.sun.management.jmxremote.port=$JMX_PORT \
-		-Dcom.sun.management.jmxremote.authenticate=true \
-		-Dcom.sun.management.jmxremote.login.config=virgo-kernel \
-		-Dcom.sun.management.jmxremote.access.file="$ACCESS_PROPERTIES" \
-		-Djavax.net.ssl.keyStore=$KEYSTORE_PATH \
-		-Djavax.net.ssl.keyStorePassword=$KEYSTORE_PASSWORD \
-		-Dcom.sun.management.jmxremote.ssl=true \
-		-Dcom.sun.management.jmxremote.ssl.need.client.auth=false"
-
-   	if [ -z "$JAVA_HOME" ]
-    then
-      	JAVA_EXECUTABLE=java
-    else
-     	JAVA_EXECUTABLE=$JAVA_HOME/bin/java
-    fi
-
-	# If we get here we have the correct Java version.
-	
-	if [ -z "$NO_START_FLAG" ]
-	then
-		TMP_DIR=$KERNEL_HOME/work/tmp
-		# Ensure that the tmp directory exists
-		mkdir -p $TMP_DIR
-
-        JAVA_OPTS="-Xmx512m \
-                    -XX:MaxPermSize=512m $JAVA_OPTS"
-
-		cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
-			$JAVA_OPTS \
-			$DEBUG_OPTS \
-			$JMX_OPTS \
-			-XX:+HeapDumpOnOutOfMemoryError \
-			-XX:ErrorFile=$KERNEL_HOME/serviceability/error.log \
-			-XX:HeapDumpPath=$KERNEL_HOME/serviceability/heap_dump.hprof \
-			-Djava.security.auth.login.config=$AUTH_LOGIN \
-			-Dorg.eclipse.virgo.kernel.authentication.file=$AUTH_FILE \
-			-Djava.io.tmpdir=$TMP_DIR \
-			-Dorg.eclipse.virgo.kernel.home=$KERNEL_HOME \
-			-Dorg.eclipse.virgo.kernel.config=$CONFIG_DIR \
-			-Dosgi.sharedConfiguration.area=$CONFIG_DIR \
-			-Dosgi.java.profile="file:$JAVA_PROFILE" \
-            -Declipse.ignoreApp=true \
-            -Dosgi.install.area=$KERNEL_HOME \
-            -Dosgi.configuration.area=$CONFIG_AREA \
-            -Dssh.server.keystore="$CONFIG_DIR/hostkey.ser" \
-            -Dosgi.frameworkClassPath=$FWCLASSPATH \
-            -Djava.endorsed.dirs="$KERNEL_HOME/lib/endorsed" \
-            -classpath $CLASSPATH \
-			org.eclipse.equinox.launcher.Main \
-            -noExit \
-			$LAUNCH_OPTS \
-			$ADDITIONAL_ARGS
-	fi
-elif [ "$COMMAND" = "stop" ]
-then
-
-	CONFIG_DIR=$KERNEL_HOME/configuration
-
-	#parse args for the script
-	if [ -z "$TRUSTSTORE_PATH" ]
-	then
-		TRUSTSTORE_PATH=$CONFIG_DIR/keystore
-	fi
-	
-	if [ -z "$TRUSTSTORE_PASSWORD" ]	
-	then
-		TRUSTSTORE_PASSWORD=changeit
-	fi
-
-	if [ -z "$JMX_PORT" ]
-	then
-		JMX_PORT=9875
-	fi
-
-	shopt -s extglob
-
-	while (($# > 0))
-		do
-		case $1 in
-		-truststore)
-				TRUSTSTORE_PATH=$2
-				shift;
-				;;
-		-truststorePassword)
-				TRUSTSTORE_PASSWORD=$2
-				shift;
-				;;
-		-configDir)
-				CONFIG_DIR=$2
-				shift;
-				;;
-		-jmxport)
-				JMX_PORT=$2
-				shift;
-				;;
-		*)
-			OTHER_ARGS+=" $1"
-			;;
-		esac
-		shift
-	done
-	
-	JMX_OPTS=" \
-		$JMX_OPTS \
-		-Djavax.net.ssl.trustStore=${TRUSTSTORE_PATH} \
-		-Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWORD}"
-
-	OTHER_ARGS+=" -jmxport $JMX_PORT"
-
-    if $cygwin; then
-        KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
-        CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
-    fi
-
-	exec $JAVA_EXECUTABLE $JAVA_OPTS $JMX_OPTS \
-		-classpath $CLASSPATH \
-		-Dorg.eclipse.virgo.kernel.home=$KERNEL_HOME \
-		-Dorg.eclipse.virgo.kernel.authentication.file=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties \
-		org.eclipse.virgo.nano.shutdown.ShutdownClient $OTHER_ARGS
-	
-else
-	echo "Unknown command: ${COMMAND}"
-fi
-
diff --git a/build-packaging/nano/bin/jconsole.bat b/build-packaging/nano/bin/jconsole.bat
deleted file mode 100644
index 4cbe553..0000000
--- a/build-packaging/nano/bin/jconsole.bat
+++ /dev/null
@@ -1,54 +0,0 @@
-@echo off
-rem Script for starting jconsole
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Find root drive and path for current bat file directory (includes trailing backslash)
-  set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
-  call "%SCRIPT_DIR%setupVars.bat"
-  if not "%ERRORLEVEL%"=="0" (
-    if "%OS%" == "Windows_NT" endlocal
-    exit /B %ERRORLEVEL%
-  )
-) else (
-  echo Cannot set up environment. "setupVars.bat" file missing.
-  if "%OS%" == "Windows_NT" endlocal
-  exit /B 1
-)
-
-rem Set defaults
-  set TRUSTSTORE_PATH=%KERNEL_HOME%\configuration\keystore
-  set TRUSTSTORE_PASSWORD=changeit
-  set OTHER_ARGS=
-  
-:Loop
-  if "%~1"=="" goto EndLoop
-
-  if "%~1"=="-truststore" (
-    set TRUSTSTORE_PATH=%~2
-    shift
-    shift
-    goto Loop
-  ) 
-  if "%~1"=="-truststorePassword" (
-    set TRUSTSTORE_PASSWORD=%~2
-    shift
-    shift
-    goto Loop
-  )
-  rem Accumulate extra parameters.
-    set OTHER_ARGS=%OTHER_ARGS% "%~1"
-    shift
-  goto Loop
-:EndLoop
-
-set JMX_OPTS=%JMX_OPTS% -J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type 
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%" 
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
-
-"%JAVA_HOME%\bin\jconsole" %JMX_OPTS% %OTHER_ARGS%
-
-if "%OS%" == "Windows_NT" endlocal
-goto :eof
diff --git a/build-packaging/nano/bin/jconsole.sh b/build-packaging/nano/bin/jconsole.sh
deleted file mode 100755
index 0dfbcbf..0000000
--- a/build-packaging/nano/bin/jconsole.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-if [ -z "$JAVA_HOME" ]
-then
-    echo The JAVA_HOME environment variable is not defined
-    exit 1
-fi
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do 
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
- 
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-KERNEL_HOME=`cd $KERNEL_HOME; pwd`
-
-#parse args for the script
-TRUSTSTORE_PATH=$KERNEL_HOME/configuration/keystore
-TRUSTSTORE_PASSWORD=changeit
-
-shopt -s extglob
-
-while (($# > 0))
-	do
-	case $1 in
-	-truststore)
-			TRUSTSTORE_PATH=$2
-			shift;
-			;;
-	-truststorePassword)
-			TRUSTSTORE_PASSWORD=$2
-			shift;
-			;;
-	esac
-	shift
-done
-
-JMX_OPTS=" \
-	$JMX_OPTS \
-	-J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type \
-	-J-Djavax.net.ssl.trustStore=$TRUSTSTORE_PATH \
-	-J-Djavax.net.ssl.trustStorePassword=$TRUSTSTORE_PASSWORD"
-
-$JAVA_HOME/bin/jconsole $JMX_OPTS
diff --git a/build-packaging/nano/bin/jmxPermissions.vbs b/build-packaging/nano/bin/jmxPermissions.vbs
deleted file mode 100644
index 0184607..0000000
--- a/build-packaging/nano/bin/jmxPermissions.vbs
+++ /dev/null
@@ -1,81 +0,0 @@
-configFolder = Wscript.Arguments.Item(0)
-
-'WScript.Echo "Fixing permissions on " & configFolder
-
-Set objWMIService = GetObject("winmgmts:\\.\root\CIMV2") 'Load up WMI with the right dll
-
-Dim files(0)
-files(0) = "org.eclipse.virgo.kernel.jmxremote.access.properties"
-
-For Each file In files
-	updateInheritance(configFolder & file)
-	updateOwnership(configFolder & file)
-	updatePermissions(configFolder & file)
-Next 
-
-Sub updateInheritance(file)
-	'WScript.Echo "Updating inheritance of " & file
-	
-	Const SE_DACL_PRESENT = 4
-	Const SE_DACL_PROTECTED = 4096
-	Const SE_SELF_RELATIVE = 32768
-
-	Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
-    objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
-	objSecurityDescriptor.ControlFlags = SE_DACL_PRESENT + SE_DACL_PROTECTED + SE_SELF_RELATIVE
-
-	Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
-	Set objInParam = objMethod.inParameters.SpawnInstance_()
-	objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
-	objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-	
-	'WScript.Echo "Updated inheritance of " & file
-End Sub
-
-Sub updateOwnership(file)
-	'WScript.Echo "Updating ownership of " & file
-	Set objDataFile = objWMIService.Get("CIM_DataFile.Name='" & file & "'")
-
-	Set objMethod = objDataFile.Methods_("TakeOwnerShipEx")
-	Set objInParam = objMethod.inParameters.SpawnInstance_()
-
-	objDataFile.ExecMethod_ "TakeOwnerShipEx", objInParam
-
-	'WScript.Echo "Updated ownership of " & file
-End Sub
-
-Sub updatePermissions(file)	
-	'WScript.Echo "Updating permissions of " & file
-	
-	Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
-    objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
-	Set WshNetwork = WScript.CreateObject("WScript.Network")
-	
-	Dim foundAce
-	foundAce = "false"
-	
-	'Search for an ACE for the current user as there is no robust, portable way of creating such an ACE from scratch in VBScript.
-	Dim specificAce(0)
-	For Each ace in objSecurityDescriptor.DACL
-		If ace.Trustee.Name = WshNetwork.UserName Then
-			Set specificAce(0) = ace
-			foundAce = "true"
-		End If
-	Next
-	
-	If foundAce = "true" Then
-		objSecurityDescriptor.DACL = specificAce
-
-		Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
-		Set objInParam = objMethod.inParameters.SpawnInstance_()
-		objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
-		objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-		
-		'WScript.Echo "Updated permissions of " & file
-	Else
-		WScript.Echo "WARNING: jmxPermissions.vbs did not update the permissions of " & file & ". Check the file has the correct permissions."
-	End If
-	
-End Sub
diff --git a/build-packaging/nano/bin/setupClasspath.bat b/build-packaging/nano/bin/setupClasspath.bat
deleted file mode 100644
index 30e157c..0000000
--- a/build-packaging/nano/bin/setupClasspath.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Check JAVA_HOME and KERNEL_HOME variables
-if "%JAVA_HOME%" == "" (
-  echo The JAVA_HOME environment variable is not defined.
-  exit /B 1
-)
-if "%KERNEL_HOME%" == "" (
-  echo The KERNEL_HOME environment variable is not defined.
-  exit /B 1
-)
-
-rem Construct the CLASSPATH list from the Kernel lib directory.
-for %%G in ("%KERNEL_HOME%\lib\*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.osgi_*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.equinox.console.ssh_*.jar") do call :AppendToClasspath "%%G"
-
-rem Check if there are JAR files in the lib directory.
-if "%CLASSPATH%" == "" (
-  echo No JAR files found in %KERNEL_HOME%\lib
-  exit /B 1
-)
-
-rem Remove leading semi-colon if present
-if "%CLASSPATH:~0,1%"==";" set CLASSPATH=%CLASSPATH:~1%
-if "%FWCLASSPATH:~0,1%"=="," set FWCLASSPATH=%FWCLASSPATH:~1%
-exit /B 0
-
-:AppendToClasspath
-  set CLASSPATH=%CLASSPATH%;%~1
-  set FWCLASSPATH=%FWCLASSPATH%,file:///%~1
-  goto :eof
diff --git a/build-packaging/nano/bin/setupClasspath.sh b/build-packaging/nano/bin/setupClasspath.sh
deleted file mode 100755
index 741e0e3..0000000
--- a/build-packaging/nano/bin/setupClasspath.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# make sure we have JAVA_HOME set
-if [ -z "$JAVA_HOME" ]
-then
-	echo The JAVA_HOME environment variable is not defined. Using PATH instead.
-fi
-
-CLASSPATH=
-FWCLASSPATH=
-
-#  Create the classpath for bootstrapping the Server from all the JARs in lib
-for file in "$KERNEL_HOME"/lib/*
-do
-	if [[ $file == *.jar ]]
-	then
-		CLASSPATH=$CLASSPATH:$KERNEL_HOME/lib/${file##*/}
-		FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/lib/${file##*/}
-	fi
-done
-
-#  Append the osgi jar to the classpath
-for file in "$KERNEL_HOME"/plugins/org.eclipse.osgi_*.jar
-do
-	CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
-	FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/plugins/${file##*/}
-done
-
-#  Append the console.supportability jar to the classpath to enable ssh
-for file in "$KERNEL_HOME"/plugins/org.eclipse.equinox.console.ssh_*.jar
-do
-	CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
-done
-
-# make sure we have CLASSPATH set
-if [ -z "$CLASSPATH" ]
-then
-	echo No JAR files found in $KERNEL_HOME/lib
-	exit 1
-fi
diff --git a/build-packaging/nano/bin/setupVars.bat b/build-packaging/nano/bin/setupVars.bat
deleted file mode 100644
index a5d7772..0000000
--- a/build-packaging/nano/bin/setupVars.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Set up env vars needed for dmk.bat and jconsole.bat (with user-pluggable mods if present)
-
-if "%SCRIPT_DIR%"=="" (
-  echo Called setupVars.bat out of context.
-  exit /B 1
-)
-
-rem Derive KERNEL_HOME full path from script's parent (no backslash)
-  for %%I in ("%SCRIPT_DIR%..") do set KERNEL_HOME=%%~fsI
-
-rem Check files exist (exit if not)
-  set ChkLst="%KERNEL_HOME%\bin\setupClasspath.bat","%KERNEL_HOME%\bin\checkJava.bat"
-
-  for %%I in (%ChkLst%) do if not exist "%%~I" (
-    echo File "%%~I" does not exist but is required.
-    exit /B 1
-  )
-
-rem set up the classpath (check result)
-  call "%KERNEL_HOME%\bin\setupClasspath.bat"
-  if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-rem Run Java Version check (uses JAVA_HOME) (check result)
-  call "%KERNEL_HOME%\bin\checkJava.bat"
-  if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-	
-rem Execute user setenv script if needed (ignore result)
-  if exist "%KERNEL_HOME%\bin\setenv.bat" call "%KERNEL_HOME%\bin\setenv.bat"
-
-goto :eof
diff --git a/build-packaging/nano/bin/shutdown.bat b/build-packaging/nano/bin/shutdown.bat
deleted file mode 100644
index a2a1ff4..0000000
--- a/build-packaging/nano/bin/shutdown.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" stop %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/build-packaging/nano/bin/shutdown.sh b/build-packaging/nano/bin/shutdown.sh
deleted file mode 100755
index 1960446..0000000
--- a/build-packaging/nano/bin/shutdown.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
-    CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" stop "$@"
diff --git a/build-packaging/nano/bin/startup.bat b/build-packaging/nano/bin/startup.bat
deleted file mode 100644
index 76e1618..0000000
--- a/build-packaging/nano/bin/startup.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" start %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/build-packaging/nano/bin/startup.sh b/build-packaging/nano/bin/startup.sh
deleted file mode 100755
index 69e43b7..0000000
--- a/build-packaging/nano/bin/startup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
-    CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" start "$@"
diff --git a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/AbstractNanoTests.java b/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/AbstractNanoTests.java
deleted file mode 100644
index 6e3df5d..0000000
--- a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/AbstractNanoTests.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- *******************************************************************************/
-
-package org.eclipse.virgo.nano.smoketest;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
-import java.rmi.ConnectIOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.eclipse.virgo.util.io.FileCopyUtils;
-import org.eclipse.virgo.util.io.NetUtils;
-
-public class AbstractNanoTests {
-    
-    private MBeanServerConnection connection = null;
-    
-    private String srcDir = "src/test/resources";
-    
-    private File bundlesDir = null;
-    
-    private String binDir = null;
-    
-    private File pickupDir = null;
-    
-    private Process process = null;
-    
-    private ProcessBuilder pb = null;
-    
-    private File startup = null;
-    
-    private String startupFileName = null;
-    
-    private File shutdown = null;
-    
-    private String shutdownFileName = null;
-    
-    private File startupURI = null;
-    
-    private File shutdownURI = null;
-    
-    private OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();
-    
-    public final long HALF_SECOND = 500;
-    
-    public final long TWO_MINUTES = 120 * 1000;
-    
-    public final long THIRTY_SECONDS = 30 * 1000;
-    
-    public final String STATUS_STARTED = "STARTED";
-    
-    public final String STATUS_STARTING = "STARTING";
-    
-    protected MBeanServerConnection getMBeanServerConnection() throws Exception {
-        Map<String, String[]> env = new HashMap<String, String[]>();
-        
-        File testExpanded = new File("./target/test-expanded/");
-        String serverDir = null;
-        for (File candidate : testExpanded.listFiles()) {
-            if (candidate.isDirectory()) {
-                serverDir = candidate.getCanonicalPath();
-                break;
-            }
-        }
-        String[] creds = { "admin", "admin" };
-        env.put(JMXConnector.CREDENTIALS, creds);
-        
-        System.setProperty("javax.net.ssl.trustStore", serverDir + "/configuration/keystore");
-        System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
-        
-        JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:9875/jmxrmi");
-        connection = JMXConnectorFactory.connect(url, env).getMBeanServerConnection();
-        return connection;
-    }
-    
-    protected String getNanoStartUpStatus() throws Exception {
-        String nanoStartupStatus = (String) getMBeanServerConnection().getAttribute(new ObjectName("org.eclipse.virgo.kernel:type=KernelStatus"),
-                                                                                    "Status");
-        return nanoStartupStatus;
-    }
-    
-    private String getNanoBinDir() throws IOException {
-		if (binDir == null) {
-			File testExpanded = new File("./target/test-expanded/");
-			for (File candidate : testExpanded.listFiles()) {
-				if (candidate.isDirectory()) {
-					binDir = new File(candidate, "bin").getCanonicalPath();
-					break;
-				}
-			}
-		}
-		return binDir;
-    }
-    
-    private File setupNanoPickupDir() throws IOException {
-        if (pickupDir == null) {
-            File testExpanded = new File("./target/test-expanded/");
-			for (File candidate : testExpanded.listFiles()) {
-				if (candidate.isDirectory()) {
-					pickupDir = new File(candidate, "pickup");
-					break;
-				}
-			}
-        }
-        return pickupDir;
-    }
-    
-    private File setupBundleResourcesDir() throws IOException {
-        if (bundlesDir == null) {
-            File testExpanded = new File("./" + srcDir);
-            bundlesDir = new File(testExpanded, "bundles");
-        }
-        return bundlesDir;
-    }
-    
-    public void hotDeployTestBundles(String bundleName) throws IOException {
-        setupNanoPickupDir();
-        setupBundleResourcesDir();
-        FileCopyUtils.copy(new File(bundlesDir, bundleName), new File(pickupDir, bundleName));
-    }
-    
-    public void waitForNanoStartFully() throws Exception {
-        waitForNanoStartFully(THIRTY_SECONDS, HALF_SECOND);
-    }
-    
-    public void waitForNanoShutdownFully() throws Exception {
-        waitForNanoShutdownFully(THIRTY_SECONDS, HALF_SECOND);
-    }
-    
-    private void waitForNanoStartFully(long duration, long interval) throws Exception {
-        long startTime = System.currentTimeMillis();
-        while (System.currentTimeMillis() - startTime < duration) {
-            try {
-                if (getNanoStartUpStatus().equals(STATUS_STARTED)) {
-                    return;
-                } else if (getNanoStartUpStatus().equals(STATUS_STARTING)) {
-                    continue;
-                }
-            } catch (InstanceNotFoundException e) {
-                continue;
-            } catch (ConnectIOException e) {
-                continue;
-            } catch (IOException e) {
-                continue;
-            }
-            Thread.sleep(interval);
-        }
-    }
-    
-    private void waitForNanoShutdownFully(long duration, long interval) throws Exception {
-        long startTime = System.currentTimeMillis();
-        while (System.currentTimeMillis() - startTime < duration) {
-            try {
-                if (!getNanoStartUpStatus().equals(STATUS_STARTED)) {
-                    if (NetUtils.isPortAvailable(9875)) {
-                        return;
-                    }
-                }
-            } catch (InstanceNotFoundException e) {
-                return;
-            } catch (ConnectIOException e) {
-                return;
-            } catch (IOException e) {
-                return;
-            }
-            Thread.sleep(interval);
-        }
-    }
-    
-    protected class NanoStartUpThread implements Runnable {
-        
-        public NanoStartUpThread() {
-        }
-        
-        @Override
-        public void run() {
-            String[] args = null;
-            try {
-                if (os.getName().contains("Windows")) {
-                    startup = new File(getNanoBinDir(), "startup.bat");
-                    startupURI = new File(startup.toURI());
-                    startupFileName = startupURI.getCanonicalPath();
-                    
-                } else {
-                    startup = new File(getNanoBinDir(), "startup.sh");
-                    startupURI = new File(startup.toURI());
-                    startupFileName = startupURI.getCanonicalPath();
-                }
-                args = new String[] { startupFileName };
-                pb = new ProcessBuilder(args);
-                pb.redirectErrorStream(true);
-                Map<String, String> env = pb.environment();
-                env.put("JAVA_HOME", System.getProperty("java.home"));
-                
-                process = pb.start();
-                
-                InputStream is = process.getInputStream();
-                InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
-                String line;
-                while ((line = br.readLine()) != null) {
-                    System.out.println(line);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    protected class NanoShutdownThread implements Runnable {
-        
-        public NanoShutdownThread() {
-        }
-        
-        @Override
-        public void run() {
-            String[] args = null;
-            try {
-                if (os.getName().contains("Windows")) {
-                    shutdown = new File(getNanoBinDir(), "shutdown.bat");
-                    shutdownURI = new File(shutdown.toURI());
-                    shutdownFileName = shutdownURI.getCanonicalPath();
-                } else {
-                    shutdown = new File(getNanoBinDir(), "shutdown.sh");
-                    shutdownURI = new File(shutdown.toURI());
-                    shutdownFileName = shutdownURI.getCanonicalPath();
-                }
-                args = new String[] { shutdownFileName };
-                pb = new ProcessBuilder(args);
-                pb.redirectErrorStream(true);
-                Map<String, String> env = pb.environment();
-                env.put("JAVA_HOME", System.getProperty("java.home"));
-                
-                process = pb.start();
-                
-                InputStream is = process.getInputStream();
-                InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
-                String line;
-                while ((line = br.readLine()) != null) {
-                    System.out.println(line);
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java b/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java
deleted file mode 100644
index 3bb2e0f..0000000
--- a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2012 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- *   SAP AG - re-factoring
- *******************************************************************************/
-
-package org.eclipse.virgo.nano.smoketest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class NanoSmokeTests extends AbstractNanoTests {
-
-	@Test
-    public void testNanoStartAndStop() throws Exception {
-        new Thread(new NanoStartUpThread()).start();
-        waitForNanoStartFully();
-        Thread.sleep(20000); // wait for startup to complete in case it fails
-        assertEquals(STATUS_STARTED, getNanoStartUpStatus());
-        
-        new Thread(new NanoShutdownThread()).start();
-        waitForNanoShutdownFully();
-        Thread.sleep(10000); // wait for startup to complete in case it fails
-    }
-
-    @Test
-    public void testNanoJavaProfileSetCorrectly() throws Exception {
-        new Thread(new NanoStartUpThread()).start();
-        waitForNanoStartFully();
-        Thread.sleep(20000); // wait for startup to complete in case it fails
-        assertEquals(STATUS_STARTED, getNanoStartUpStatus());
-        
-        //deploy bundle that should kill the server if the test is successful
-        hotDeployTestBundles("java.profile.tester_1.0.0.jar");
-        
-        Thread.sleep(10000); //wait for deployment
-        
-        try {
-            getNanoStartUpStatus();
-            //the server is still running - shutdown and fail
-            new Thread(new NanoShutdownThread()).start();
-            waitForNanoShutdownFully();
-            Thread.sleep(10000);
-            fail("Virgo java profile not properly set - Nano was supposed to be killed if the test was successful.");
-        } catch (IOException e) { 
-            //Expected exception
-        }
-    }
-}
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/build.properties
deleted file mode 100644
index db80add..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties
deleted file mode 100644
index 0dbc479..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties
+++ /dev/null
@@ -1,181 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Nano Common 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 the common resources of an Eclipse Virgo OSGi container
-such as supportability and tomcat configurations.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml
deleted file mode 100755
index 6aa2f7b..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.nano.common.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="nano_common_resources"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.common.resources/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/build.properties
deleted file mode 100644
index 01b0213..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.properties
deleted file mode 100644
index dd1a0e0..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2012 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:
-#   Violeta Georgieva - 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 Web Enterprise JSF Integration
-
-# "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 the JSF enterprise Virgo Web features.\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2009, 2012 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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.xml
deleted file mode 100755
index f13250c..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.enterprise.jsf.internal"
-      label="%featureName"
-      version="@NANO.VERSION@"
-      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="org.glassfish.javax.faces"
-    download-size="0"
-    install-size="0"
-    version="@FACES.API@"
-    unpack="false"/>
-        
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf.internal/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/build.properties
deleted file mode 100644
index a13e18b..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               p2.inf
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.properties
deleted file mode 100644
index ad79a99..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Web Enterprise OpenEjb Internal Integration
-
-# "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 the openejb enterprise Virgo Web content for internal usage.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.xml
deleted file mode 100755
index 8d251ca..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/feature.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.enterprise.openejb.internal"
-      label="%featureName"
-      version="@NANO.VERSION@"
-      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="org.apache.openejb.api"
-    download-size="0"
-    install-size="0"
-    version="@OE.API@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.openejb.javaagent"
-    download-size="0"
-    install-size="0"
-    version="@OE.JAVAAGENT@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.openejb.jee"
-    download-size="0"
-    install-size="0"
-    version="@OE.JEE@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.openejb.loader"
-    download-size="0"
-    install-size="0"
-    version="@OE.LOADER@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.openejb.jpa-integration"
-    download-size="0"
-    install-size="0"
-    version="@OE.JPA.INTEGRATION@"
-    unpack="false"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb.internal/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/build.properties
deleted file mode 100755
index db80add..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.properties
deleted file mode 100755
index 0dbc479..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.properties
+++ /dev/null
@@ -1,181 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Nano Common 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 the common resources of an Eclipse Virgo OSGi container
-such as supportability and tomcat configurations.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.xml
deleted file mode 100755
index ddc70bb..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.nano.enterprise.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="nano_enterprise_resources"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.resources/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/build.properties
deleted file mode 100644
index a13e18b..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               p2.inf
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.properties
deleted file mode 100644
index 8e98c84..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Web Enterprise XBean Components
-
-# "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 the Xbean enterprise Virgo Web features.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.xml
deleted file mode 100755
index 9b25f52..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/feature.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.enterprise.xbean.internal"
-      label="%featureName"
-      version="@NANO.VERSION@"
-      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="org.apache.xbean.asm"
-    download-size="0"
-    install-size="0"
-    version="@XB.ASM@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.xbean.bundleutils"
-    download-size="0"
-    install-size="0"
-    version="@XB.BUNDLEUTILS@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.xbean.naming"
-    download-size="0"
-    install-size="0"
-    version="@XB.NAMING@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.apache.xbean.reflect"
-    download-size="0"
-    install-size="0"
-    version="@XB.REFLECT@"
-    unpack="false"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean.internal/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
deleted file mode 100755
index abf6433..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/build.properties
deleted file mode 100644
index db80add..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.properties
deleted file mode 100644
index 7a687c7..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Detailed 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=Directly references Virgo Nano bundles not described in other features - useful for target platforms.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.xml
deleted file mode 100755
index f0d6883..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/feature.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.nano.detailed"
-      label="%featureName"
-      version="@NANO.VERSION@"
-      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="org.eclipse.osgi"
-    download-size="0"
-    install-size="0"
-    version="@OSGI@"
-    unpack="false"/>
-    
-    <plugin
-    id="com.springsource.org.aspectj.weaver"
-    download-size="0"
-    install-size="0"
-    version="@ASPECTJ@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.transaction"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.TRANSACTION@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.annotation"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.ANNOTATION@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.ejb"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.EJB@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.el"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.EL@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.servlet.jsp"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.SERVLET.JSP@"
-    unpack="false"/>
-    
-    <plugin
-    id="javax.xml.rpc"
-    download-size="0"
-    install-size="0"
-    version="@JAVAX.XML.RPC@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.equinox.cm"
-    download-size="0"
-    install-size="0"
-    version="@EQUINOX.CM@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.equinox.event"
-    download-size="0"
-    install-size="0"
-    version="@EQUINOX.EVENT@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.equinox.region"
-    download-size="0"
-    install-size="0"
-    version="@EQUINOX.REGION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.equinox.util"
-    download-size="0"
-    install-size="0"
-    version="@EQUINOX.UTIL@"
-    unpack="false"/>
-
-    
-    <plugin
-    id="org.eclipse.jdt.core.compiler.batch"
-    download-size="0"
-    install-size="0"
-    version="@COMPILER.BATCH@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.osgi.services"
-    download-size="0"
-    install-size="0"
-    version="@OSGI.SERVICES@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.sat4j.core"
-    download-size="0"
-    install-size="0"
-    version="@SAT4J.CORE@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.sat4j.pb"
-    download-size="0"
-    install-size="0"
-    version="@SAT4J.PB@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.slf4j.api"
-    download-size="0"
-    install-size="0"
-    version="@SLF4J.API@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.slf4j.jul"
-    download-size="0"
-    install-size="0"
-    version="@SLF4J.JUL@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.slf4j.jcl"
-    download-size="0"
-    install-size="0"
-    version="@SLF4J.JCL@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.slf4j.log4j"
-    download-size="0"
-    install-size="0"
-    version="@SLF4J.LOG4J@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.equinox.ds"
-    download-size="0"
-    install-size="0"
-    version="@EQUINOX.DS.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.gemini.web.tomcat"
-    download-size="0"
-    install-size="0"
-    version="@GEMINI.WEB@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.gemini.web.extender"
-    download-size="0"
-    install-size="0"
-    version="@GEMINI.WEB@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.gemini.web.core"
-    download-size="0"
-    install-size="0"
-    version="@GEMINI.WEB@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.core"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.deployer"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.deployer.api"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.deployer.hot"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.services.concurrent"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.nano.services.ds"
-    download-size="0"
-    install-size="0"
-    version="@NANO.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.web.war.deployer"
-    download-size="0"
-    install-size="0"
-    version="@WEB.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.common"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.io"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.jmx"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.math"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.osgi"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.osgi.manifest"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.util.parser.manifest"
-    download-size="0"
-    install-size="0"
-    version="@UTIL.VERSION@"
-    unpack="false"/>
-    
-    <plugin
-    id="org.eclipse.virgo.kernel.equinox.extensions"
-    download-size="0"
-    install-size="0"
-    version="@KERNEL.VERSION@"
-    unpack="false"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.detailed/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/build.properties
deleted file mode 100644
index db80add..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.properties
deleted file mode 100644
index 6a94279..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Scripts 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 the startup scripts of an Eclipse Virgo OSGi container.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.xml
deleted file mode 100755
index 9601450..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.scripts"
-      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="scripts"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.scripts/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/build.properties
deleted file mode 100644
index db80add..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.properties
deleted file mode 100644
index 70eef7f..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Nano Specific 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 the specific resources of Eclipse Virgo Nano such as the versions file.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.xml
deleted file mode 100755
index 86a48e0..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.nano.specific.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="nano_specific_resources"
-         download-size="0"
-         install-size="0"
-         version="1.0.0"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.specific.resources/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.properties
deleted file mode 100644
index cd15877..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 SpringDM 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 a SpringDM add-on for Virgo. It includes the standard SpringDM bundles.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.xml
deleted file mode 100755
index 05c6dc3..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/feature.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.springdm"
-      label="%featureName"
-      version="@SPRING.DM.VERSION@"
-      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="org.eclipse.gemini.blueprint.core"
-         download-size="0"
-         install-size="0"
-         version="@SPRING.DM.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gemini.blueprint.extender"
-         download-size="0"
-         install-size="0"
-         version="@SPRING.DM.VERSION@"
-         unpack="false"
-         autostart="true"/>
-
-   <plugin
-         id="org.eclipse.gemini.blueprint.io"
-         download-size="0"
-         install-size="0"
-         version="@SPRING.DM.VERSION@"
-         unpack="false"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.springdm/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/build.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/eclipse_update_120.jpg b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/eclipse_update_120.jpg
deleted file mode 100755
index bfdf708..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/epl-v10.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/epl-v10.html
deleted file mode 100755
index eecc800..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.properties b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.properties
deleted file mode 100644
index e539085..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 SAP AG
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-# The Eclipse Public License is available at
-#   http://www.eclipse.org/legal/epl-v10.html
-# and the Apache License v2.0 is available at
-#   http://www.opensource.org/licenses/apache2.0.php.
-# You may elect to redistribute this code under either of these licenses.
-#
-# Contributors:
-#   Borislav Kapukaranov - initial contribution
-###############################################################################
-# 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 Utils 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 the Virgo Utils add-on. It includes the standard Utilities provided as part of the Eclipse Virgo project.\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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the 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 using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-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\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, 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 to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. 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\
-       3. 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") and such\n\
-          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\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          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, and\n\
-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
-########### end of license property ##########################################
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.xml b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.xml
deleted file mode 100755
index fe07fc3..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/feature.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.virgo.util"
-      label="%featureName"
-      version="@UTIL.VERSION@"
-      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="org.eclipse.virgo.util.io"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.osgi"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"
-         autostart="true"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.common"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.jmx"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.math"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.osgi.manifest"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.parser.manifest"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.virgo.util.parser.launcher"
-         download-size="0"
-         install-size="0"
-         version="@UTIL.VERSION@"
-         unpack="false"/>
-
-</feature>
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/license.html b/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/license.html
deleted file mode 100755
index f19c483..0000000
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.util/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<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>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</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 (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</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 &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; 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 (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; 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 &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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 &quot;src&quot; 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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <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 (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). 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>
-   (&quot;Specification&quot;).</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 (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) 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 (&quot;Installable Software Agreement&quot;) 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>
diff --git a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/MANIFEST.MF b/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 571c446..0000000
--- a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Virgo Common Resources
-Bundle-SymbolicName: org.eclipse.virgo.common.resources
-Bundle-Version: @NANO.VERSION@
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/p2.inf b/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/p2.inf
deleted file mode 100755
index 023c8c8..0000000
--- a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/META-INF/p2.inf
+++ /dev/null
@@ -1,17 +0,0 @@
-instructions.install= \

-unzip(source:@artifact,target:${installFolder}/plugins/temp);\

-copy(source:${installFolder}/plugins/temp/root_content,target:${installFolder}/,overwrite:true);\

-chmod(targetDir:${installFolder}/configuration,targetFile:org.eclipse.virgo.kernel.jmxremote.access.properties,permissions:600);\

-chmod(targetDir:${installFolder}/bin,targetFile:checkJava.sh,permissions:755);\

-chmod(targetDir:${installFolder}/bin,targetFile:dmk.sh,permissions:755);\

-chmod(targetDir:${installFolder}/bin,targetFile:jconsole.sh,permissions:755);\

-chmod(targetDir:${installFolder}/bin,targetFile:setupClasspath.sh,permissions:755);\

-chmod(targetDir:${installFolder}/bin,targetFile:shutdown.sh,permissions:755);\

-chmod(targetDir:${installFolder}/bin,targetFile:startup.sh,permissions:755);\

-remove(path:${installFolder}/plugins/temp);

-instructions.install.import= \

-org.eclipse.equinox.p2.touchpoint.natives.copy,\

-org.eclipse.equinox.p2.touchpoint.natives.chmod,\

-org.eclipse.equinox.p2.touchpoint.natives.remove,\

-org.eclipse.equinox.p2.touchpoint.natives.unzip

-

diff --git a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/about.html b/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/build-packaging/nano/publish_resources/org.eclipse.virgo.common.resources/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/build-packaging/nano/publish_resources/products/virgo-nano/p2.inf b/build-packaging/nano/publish_resources/products/virgo-nano/p2.inf
deleted file mode 100755
index 56d526d..0000000
--- a/build-packaging/nano/publish_resources/products/virgo-nano/p2.inf
+++ /dev/null
@@ -1,1380 +0,0 @@
-requires.0.name = tooling.virgo.org.eclipse.core.contenttype

-requires.0.namespace = org.eclipse.equinox.p2.iu

-requires.1.name = tooling.virgo.org.eclipse.core.jobs

-requires.1.namespace = org.eclipse.equinox.p2.iu

-requires.2.name = tooling.virgo.org.eclipse.core.runtime

-requires.2.namespace = org.eclipse.equinox.p2.iu

-requires.3.name = tooling.virgo.org.eclipse.ecf

-requires.3.namespace = org.eclipse.equinox.p2.iu

-requires.4.name = tooling.virgo.org.eclipse.ecf.filetransfer

-requires.4.namespace = org.eclipse.equinox.p2.iu

-requires.5.name = tooling.virgo.org.eclipse.ecf.identity

-requires.5.namespace = org.eclipse.equinox.p2.iu

-requires.6.name = tooling.virgo.org.eclipse.ecf.provider.filetransfer

-requires.6.namespace = org.eclipse.equinox.p2.iu

-requires.7.name = tooling.virgo.org.eclipse.ecf.ssl

-requires.7.namespace = org.eclipse.equinox.p2.iu

-requires.8.name = tooling.virgo.org.eclipse.equinox.app

-requires.8.namespace = org.eclipse.equinox.p2.iu

-requires.9.name = tooling.virgo.org.eclipse.equinox.common

-requires.9.namespace = org.eclipse.equinox.p2.iu

-requires.10.name = tooling.virgo.org.eclipse.equinox.frameworkadmin

-requires.10.namespace = org.eclipse.equinox.p2.iu

-requires.11.name = tooling.virgo.org.eclipse.equinox.frameworkadmin.equinox

-requires.11.namespace = org.eclipse.equinox.p2.iu

-requires.12.name = tooling.virgo.org.eclipse.equinox.p2.artifact.repository

-requires.12.namespace = org.eclipse.equinox.p2.iu

-requires.13.name = tooling.virgo.org.eclipse.equinox.p2.core

-requires.13.namespace = org.eclipse.equinox.p2.iu

-requires.14.name = tooling.virgo.org.eclipse.equinox.p2.director

-requires.14.namespace = org.eclipse.equinox.p2.iu

-requires.15.name = tooling.virgo.org.eclipse.equinox.p2.engine

-requires.15.namespace = org.eclipse.equinox.p2.iu

-requires.16.name = tooling.virgo.org.eclipse.equinox.p2.garbagecollector

-requires.16.namespace = org.eclipse.equinox.p2.iu

-requires.17.name = tooling.virgo.org.eclipse.equinox.p2.jarprocessor

-requires.17.namespace = org.eclipse.equinox.p2.iu

-requires.18.name = tooling.virgo.org.eclipse.equinox.p2.metadata

-requires.18.namespace = org.eclipse.equinox.p2.iu

-requires.19.name = tooling.virgo.org.eclipse.equinox.p2.metadata.repository

-requires.19.namespace = org.eclipse.equinox.p2.iu

-requires.20.name = tooling.virgo.org.eclipse.equinox.p2.publisher

-requires.20.namespace = org.eclipse.equinox.p2.iu

-requires.21.name = tooling.virgo.org.eclipse.equinox.p2.publisher.eclipse

-requires.21.namespace = org.eclipse.equinox.p2.iu

-requires.22.name = tooling.virgo.org.eclipse.equinox.p2.repository

-requires.22.namespace = org.eclipse.equinox.p2.iu

-requires.23.name = tooling.virgo.org.eclipse.equinox.p2.touchpoint.eclipse

-requires.23.namespace = org.eclipse.equinox.p2.iu

-requires.24.name = tooling.virgo.org.eclipse.equinox.p2.touchpoint.natives

-requires.24.namespace = org.eclipse.equinox.p2.iu

-requires.25.name = tooling.virgo.org.eclipse.equinox.p2.transport.ecf

-requires.25.namespace = org.eclipse.equinox.p2.iu

-requires.26.name = tooling.virgo.org.eclipse.equinox.preferences

-requires.26.namespace = org.eclipse.equinox.p2.iu

-requires.27.name = tooling.virgo.org.eclipse.equinox.registry

-requires.27.namespace = org.eclipse.equinox.p2.iu

-requires.28.name = tooling.virgo.org.eclipse.equinox.security

-requires.28.namespace = org.eclipse.equinox.p2.iu

-requires.30.name = tooling.virgo.org.eclipse.equinox.simpleconfigurator.manipulator

-requires.30.namespace = org.eclipse.equinox.p2.iu

-requires.31.name = tooling.virgo.org.eclipse.core.net

-requires.31.namespace = org.eclipse.equinox.p2.iu

-requires.32.name = tooling.virgo.org.eclipse.equinox.p2.console

-requires.32.namespace = org.eclipse.equinox.p2.iu

-requires.33.name = tooling.virgo.org.eclipse.equinox.cm

-requires.33.namespace = org.eclipse.equinox.p2.iu

-requires.34.name = tooling.virgo.org.eclipse.equinox.ds

-requires.34.namespace = org.eclipse.equinox.p2.iu

-requires.35.name = tooling.virgo.org.eclipse.equinox.simpleconfigurator

-requires.35.namespace = org.eclipse.equinox.p2.iu

-requires.36.name = tooling.virgo.org.eclipse.equinox.event

-requires.36.namespace = org.eclipse.equinox.p2.iu

-requires.37.name = tooling.virgo.org.eclipse.equinox.common

-requires.37.namespace = org.eclipse.equinox.p2.iu

-requires.38.name = tooling.virgo.org.eclipse.equinox.util

-requires.38.namespace = org.eclipse.equinox.p2.iu

-requires.39.name = tooling.virgo.org.eclipse.osgi.services

-requires.39.namespace = org.eclipse.equinox.p2.iu

-requires.40.name = tooling.virgo.org.eclipse.equinox.console

-requires.40.namespace = org.eclipse.equinox.p2.iu

-requires.41.name = tooling.virgo.org.eclipse.equinox.console.ssh

-requires.41.namespace = org.eclipse.equinox.p2.iu

-requires.42.name = tooling.virgo.org.apache.mina.core

-requires.42.namespace = org.eclipse.equinox.p2.iu

-requires.43.name = tooling.virgo.org.apache.sshd.core

-requires.43.namespace = org.eclipse.equinox.p2.iu

-requires.44.name = tooling.virgo.org.apache.felix.gogo.command

-requires.44.namespace = org.eclipse.equinox.p2.iu

-requires.45.name = tooling.virgo.org.apache.felix.gogo.runtime

-requires.45.namespace = org.eclipse.equinox.p2.iu

-requires.46.name = tooling.virgo.org.apache.felix.gogo.shell

-requires.46.namespace = org.eclipse.equinox.p2.iu

-

-units.0.id = tooling.virgo.org.eclipse.core.contenttype

-units.0.version = 1.0.0.tooling

-units.0.requires.0.name = org.eclipse.core.contenttype

-units.0.requires.0.namespace = osgi.bundle

-units.0.requires.1.name = bundle

-units.0.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.0.requires.1.greedy = false

-units.0.requires.1.range = 0.0.0

-units.0.hostRequirements.0.name = org.eclipse.core.contenttype

-units.0.hostRequirements.0.namespace = osgi.bundle

-units.0.hostRequirements.1.name = bundle

-units.0.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.0.hostRequirements.1.greedy = false

-units.0.hostRequirements.1.range = 0.0.0

-units.0.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.0.properties.0.value = true

-units.0.provides.0.name = tooling.virgo.org.eclipse.core.contenttype

-units.0.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.0.provides.1.name = tooling

-units.0.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.0.provides.1.version = 1.0.0.tooling

-units.0.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.0.touchpoint.version = 1.0.0

-units.0.instructions.install = installBundle(bundle:${artifact})

-units.0.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.0.instructions.configure = markStarted(started: true);

-units.0.instructions.unconfigure = markStarted(started: false);

-

-units.1.id = tooling.virgo.org.eclipse.core.jobs

-units.1.version = 1.0.0.tooling

-units.1.requires.0.name = org.eclipse.core.jobs

-units.1.requires.0.namespace = osgi.bundle

-units.1.requires.1.name = bundle

-units.1.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.1.requires.1.greedy = false

-units.1.requires.1.range = 0.0.0

-units.1.hostRequirements.0.name = org.eclipse.core.jobs

-units.1.hostRequirements.0.namespace = osgi.bundle

-units.1.hostRequirements.1.name = bundle

-units.1.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.1.hostRequirements.1.greedy = false

-units.1.hostRequirements.1.range = 0.0.0

-units.1.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.1.properties.0.value = true

-units.1.provides.0.name = tooling.virgo.org.eclipse.core.jobs

-units.1.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.1.provides.1.name = tooling

-units.1.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.1.provides.1.version = 1.0.0.tooling

-units.1.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.1.touchpoint.version = 1.0.0

-units.1.instructions.install = installBundle(bundle:${artifact})

-units.1.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.1.instructions.configure = markStarted(started: true);

-units.1.instructions.unconfigure = markStarted(started: false);

-

-units.2.id = tooling.virgo.org.eclipse.core.runtime

-units.2.version = 1.0.0.tooling

-units.2.requires.0.name = org.eclipse.core.runtime

-units.2.requires.0.namespace = osgi.bundle

-units.2.requires.1.name = bundle

-units.2.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.2.requires.1.greedy = false

-units.2.requires.1.range = 0.0.0

-units.2.hostRequirements.0.name = org.eclipse.core.runtime

-units.2.hostRequirements.0.namespace = osgi.bundle

-units.2.hostRequirements.1.name = bundle

-units.2.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.2.hostRequirements.1.greedy = false

-units.2.hostRequirements.1.range = 0.0.0

-units.2.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.2.properties.0.value = true

-units.2.provides.0.name = tooling.virgo.org.eclipse.core.runtime

-units.2.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.2.provides.1.name = tooling

-units.2.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.2.provides.1.version = 1.0.0.tooling

-units.2.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.2.touchpoint.version = 1.0.0

-units.2.instructions.install = installBundle(bundle:${artifact})

-units.2.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.2.instructions.configure = markStarted(started: true);

-units.2.instructions.unconfigure = markStarted(started: false);

-

-units.3.id = tooling.virgo.org.eclipse.ecf

-units.3.version = 1.0.0.tooling

-units.3.requires.0.name = org.eclipse.ecf

-units.3.requires.0.namespace = osgi.bundle

-units.3.requires.1.name = bundle

-units.3.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.3.requires.1.greedy = false

-units.3.requires.1.range = 0.0.0

-units.3.hostRequirements.0.name = org.eclipse.ecf

-units.3.hostRequirements.0.namespace = osgi.bundle

-units.3.hostRequirements.1.name = bundle

-units.3.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.3.hostRequirements.1.greedy = false

-units.3.hostRequirements.1.range = 0.0.0

-units.3.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.3.properties.0.value = true

-units.3.provides.0.name = tooling.virgo.org.eclipse.ecf

-units.3.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.3.provides.1.name = tooling

-units.3.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.3.provides.1.version = 1.0.0.tooling

-units.3.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.3.touchpoint.version = 1.0.0

-units.3.instructions.install = installBundle(bundle:${artifact})

-units.3.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.3.instructions.configure = markStarted(started: true);

-units.3.instructions.unconfigure = markStarted(started: false);

-

-units.4.id = tooling.virgo.org.eclipse.ecf.filetransfer

-units.4.version = 1.0.0.tooling

-units.4.requires.0.name = org.eclipse.ecf.filetransfer

-units.4.requires.0.namespace = osgi.bundle

-units.4.requires.1.name = bundle

-units.4.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.4.requires.1.greedy = false

-units.4.requires.1.range = 0.0.0

-units.4.hostRequirements.0.name = org.eclipse.ecf.filetransfer

-units.4.hostRequirements.0.namespace = osgi.bundle

-units.4.hostRequirements.1.name = bundle

-units.4.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.4.hostRequirements.1.greedy = false

-units.4.hostRequirements.1.range = 0.0.0

-units.4.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.4.properties.0.value = true

-units.4.provides.0.name = tooling.virgo.org.eclipse.ecf.filetransfer

-units.4.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.4.provides.1.name = tooling

-units.4.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.4.provides.1.version = 1.0.0.tooling

-units.4.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.4.touchpoint.version = 1.0.0

-units.4.instructions.install = installBundle(bundle:${artifact})

-units.4.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.4.instructions.configure = markStarted(started: true);

-units.4.instructions.unconfigure = markStarted(started: false);

-

-units.5.id = tooling.virgo.org.eclipse.ecf.identity

-units.5.version = 1.0.0.tooling

-units.5.requires.0.name = org.eclipse.ecf.identity

-units.5.requires.0.namespace = osgi.bundle

-units.5.requires.1.name = bundle

-units.5.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.5.requires.1.greedy = false

-units.5.requires.1.range = 0.0.0

-units.5.hostRequirements.0.name = org.eclipse.ecf.identity

-units.5.hostRequirements.0.namespace = osgi.bundle

-units.5.hostRequirements.1.name = bundle

-units.5.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.5.hostRequirements.1.greedy = false

-units.5.hostRequirements.1.range = 0.0.0

-units.5.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.5.properties.0.value = true

-units.5.provides.0.name = tooling.virgo.org.eclipse.ecf.identity

-units.5.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.5.provides.1.name = tooling

-units.5.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.5.provides.1.version = 1.0.0.tooling

-units.5.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.5.touchpoint.version = 1.0.0

-units.5.instructions.install = installBundle(bundle:${artifact})

-units.5.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.5.instructions.configure = markStarted(started: true);

-units.5.instructions.unconfigure = markStarted(started: false);

-

-units.6.id = tooling.virgo.org.eclipse.ecf.provider.filetransfer

-units.6.version = 1.0.0.tooling

-units.6.requires.0.name = org.eclipse.ecf.provider.filetransfer

-units.6.requires.0.namespace = osgi.bundle

-units.6.requires.1.name = bundle

-units.6.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.6.requires.1.greedy = false

-units.6.requires.1.range = 0.0.0

-units.6.hostRequirements.0.name = org.eclipse.ecf.provider.filetransfer

-units.6.hostRequirements.0.namespace = osgi.bundle

-units.6.hostRequirements.1.name = bundle

-units.6.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.6.hostRequirements.1.greedy = false

-units.6.hostRequirements.1.range = 0.0.0

-units.6.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.6.properties.0.value = true

-units.6.provides.0.name = tooling.virgo.org.eclipse.ecf.provider.filetransfer

-units.6.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.6.provides.1.name = tooling

-units.6.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.6.provides.1.version = 1.0.0.tooling

-units.6.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.6.touchpoint.version = 1.0.0

-units.6.instructions.install = installBundle(bundle:${artifact})

-units.6.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.6.instructions.configure = markStarted(started: true);

-units.6.instructions.unconfigure = markStarted(started: false);

-

-units.7.id = tooling.virgo.org.eclipse.ecf.ssl

-units.7.version = 1.0.0.tooling

-units.7.requires.0.name = org.eclipse.ecf.ssl

-units.7.requires.0.namespace = osgi.bundle

-units.7.requires.1.name = bundle

-units.7.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.7.requires.1.greedy = false

-units.7.requires.1.range = 0.0.0

-units.7.hostRequirements.0.name = org.eclipse.ecf.ssl

-units.7.hostRequirements.0.namespace = osgi.bundle

-units.7.hostRequirements.1.name = bundle

-units.7.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.7.hostRequirements.1.greedy = false

-units.7.hostRequirements.1.range = 0.0.0

-units.7.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.7.properties.0.value = true

-units.7.provides.0.name = tooling.virgo.org.eclipse.ecf.ssl

-units.7.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.7.provides.1.name = tooling

-units.7.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.7.provides.1.version = 1.0.0.tooling

-units.7.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.7.touchpoint.version = 1.0.0

-units.7.instructions.install = installBundle(bundle:${artifact})

-units.7.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.7.instructions.configure = markStarted(started: true);

-units.7.instructions.unconfigure = markStarted(started: false);

-

-units.8.id = tooling.virgo.org.eclipse.equinox.app

-units.8.version = 1.0.0.tooling

-units.8.requires.0.name = org.eclipse.equinox.app

-units.8.requires.0.namespace = osgi.bundle

-units.8.requires.1.name = bundle

-units.8.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.8.requires.1.greedy = false

-units.8.requires.1.range = 0.0.0

-units.8.hostRequirements.0.name = org.eclipse.equinox.app

-units.8.hostRequirements.0.namespace = osgi.bundle

-units.8.hostRequirements.1.name = bundle

-units.8.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.8.hostRequirements.1.greedy = false

-units.8.hostRequirements.1.range = 0.0.0

-units.8.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.8.properties.0.value = true

-units.8.provides.0.name = tooling.virgo.org.eclipse.equinox.app

-units.8.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.8.provides.1.name = tooling

-units.8.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.8.provides.1.version = 1.0.0.tooling

-units.8.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.8.touchpoint.version = 1.0.0

-units.8.instructions.install = installBundle(bundle:${artifact})

-units.8.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.8.instructions.configure = markStarted(started: true);

-units.8.instructions.unconfigure = markStarted(started: false);

-

-units.9.id = tooling.virgo.org.eclipse.equinox.common

-units.9.version = 1.0.0.tooling

-units.9.requires.0.name = org.eclipse.equinox.common

-units.9.requires.0.namespace = osgi.bundle

-units.9.requires.1.name = bundle

-units.9.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.9.requires.1.greedy = false

-units.9.requires.1.range = 0.0.0

-units.9.hostRequirements.0.name = org.eclipse.equinox.common

-units.9.hostRequirements.0.namespace = osgi.bundle

-units.9.hostRequirements.1.name = bundle

-units.9.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.9.hostRequirements.1.greedy = false

-units.9.hostRequirements.1.range = 0.0.0

-units.9.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.9.properties.0.value = true

-units.9.provides.0.name = tooling.virgo.org.eclipse.equinox.common

-units.9.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.9.provides.1.name = tooling

-units.9.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.9.provides.1.version = 1.0.0.tooling

-units.9.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.9.touchpoint.version = 1.0.0

-units.9.instructions.install = installBundle(bundle:${artifact})

-units.9.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.9.instructions.configure = markStarted(started: true);

-units.9.instructions.unconfigure = markStarted(started: false);

-

-units.10.id = tooling.virgo.org.eclipse.equinox.frameworkadmin

-units.10.version = 1.0.0.tooling

-units.10.requires.0.name = org.eclipse.equinox.frameworkadmin

-units.10.requires.0.namespace = osgi.bundle

-units.10.requires.1.name = bundle

-units.10.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.10.requires.1.greedy = false

-units.10.requires.1.range = 0.0.0

-units.10.hostRequirements.0.name = org.eclipse.equinox.frameworkadmin

-units.10.hostRequirements.0.namespace = osgi.bundle

-units.10.hostRequirements.1.name = bundle

-units.10.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.10.hostRequirements.1.greedy = false

-units.10.hostRequirements.1.range = 0.0.0

-units.10.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.10.properties.0.value = true

-units.10.provides.0.name = tooling.virgo.org.eclipse.equinox.frameworkadmin

-units.10.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.10.provides.1.name = tooling

-units.10.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.10.provides.1.version = 1.0.0.tooling

-units.10.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.10.touchpoint.version = 1.0.0

-units.10.instructions.install = installBundle(bundle:${artifact})

-units.10.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.10.instructions.configure = markStarted(started: true);

-units.10.instructions.unconfigure = markStarted(started: false);

-

-units.11.id = tooling.virgo.org.eclipse.equinox.frameworkadmin.equinox

-units.11.version = 1.0.0.tooling

-units.11.requires.0.name = org.eclipse.equinox.frameworkadmin.equinox

-units.11.requires.0.namespace = osgi.bundle

-units.11.requires.1.name = bundle

-units.11.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.11.requires.1.greedy = false

-units.11.requires.1.range = 0.0.0

-units.11.hostRequirements.0.name = org.eclipse.equinox.frameworkadmin.equinox

-units.11.hostRequirements.0.namespace = osgi.bundle

-units.11.hostRequirements.1.name = bundle

-units.11.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.11.hostRequirements.1.greedy = false

-units.11.hostRequirements.1.range = 0.0.0

-units.11.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.11.properties.0.value = true

-units.11.provides.0.name = tooling.virgo.org.eclipse.equinox.frameworkadmin.equinox

-units.11.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.11.provides.1.name = tooling

-units.11.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.11.provides.1.version = 1.0.0.tooling

-units.11.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.11.touchpoint.version = 1.0.0

-units.11.instructions.install = installBundle(bundle:${artifact})

-units.11.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.11.instructions.configure = markStarted(started: true);

-units.11.instructions.unconfigure = markStarted(started: false);

-

-units.12.id = tooling.virgo.org.eclipse.equinox.p2.artifact.repository

-units.12.version = 1.0.0.tooling

-units.12.requires.0.name = org.eclipse.equinox.p2.artifact.repository

-units.12.requires.0.namespace = osgi.bundle

-units.12.requires.1.name = bundle

-units.12.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.12.requires.1.greedy = false

-units.12.requires.1.range = 0.0.0

-units.12.hostRequirements.0.name = org.eclipse.equinox.p2.artifact.repository

-units.12.hostRequirements.0.namespace = osgi.bundle

-units.12.hostRequirements.1.name = bundle

-units.12.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.12.hostRequirements.1.greedy = false

-units.12.hostRequirements.1.range = 0.0.0

-units.12.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.12.properties.0.value = true

-units.12.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.artifact.repository

-units.12.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.12.provides.1.name = tooling

-units.12.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.12.provides.1.version = 1.0.0.tooling

-units.12.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.12.touchpoint.version = 1.0.0

-units.12.instructions.install = installBundle(bundle:${artifact})

-units.12.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.12.instructions.configure = markStarted(started: true);

-units.12.instructions.unconfigure = markStarted(started: false);

-

-units.13.id = tooling.virgo.org.eclipse.equinox.p2.core

-units.13.version = 1.0.0.tooling

-units.13.requires.0.name = org.eclipse.equinox.p2.core

-units.13.requires.0.namespace = osgi.bundle

-units.13.requires.1.name = bundle

-units.13.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.13.requires.1.greedy = false

-units.13.requires.1.range = 0.0.0

-units.13.hostRequirements.0.name = org.eclipse.equinox.p2.core

-units.13.hostRequirements.0.namespace = osgi.bundle

-units.13.hostRequirements.1.name = bundle

-units.13.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.13.hostRequirements.1.greedy = false

-units.13.hostRequirements.1.range = 0.0.0

-units.13.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.13.properties.0.value = true

-units.13.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.core

-units.13.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.13.provides.1.name = tooling

-units.13.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.13.provides.1.version = 1.0.0.tooling

-units.13.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.13.touchpoint.version = 1.0.0

-units.13.instructions.install = installBundle(bundle:${artifact})

-units.13.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.13.instructions.configure = markStarted(started: true);

-units.13.instructions.unconfigure = markStarted(started: false);

-

-units.14.id = tooling.virgo.org.eclipse.equinox.p2.director

-units.14.version = 1.0.0.tooling

-units.14.requires.0.name = org.eclipse.equinox.p2.director

-units.14.requires.0.namespace = osgi.bundle

-units.14.requires.1.name = bundle

-units.14.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.14.requires.1.greedy = false

-units.14.requires.1.range = 0.0.0

-units.14.hostRequirements.0.name = org.eclipse.equinox.p2.director

-units.14.hostRequirements.0.namespace = osgi.bundle

-units.14.hostRequirements.1.name = bundle

-units.14.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.14.hostRequirements.1.greedy = false

-units.14.hostRequirements.1.range = 0.0.0

-units.14.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.14.properties.0.value = true

-units.14.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.director

-units.14.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.14.provides.1.name = tooling

-units.14.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.14.provides.1.version = 1.0.0.tooling

-units.14.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.14.touchpoint.version = 1.0.0

-units.14.instructions.install = installBundle(bundle:${artifact})

-units.14.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.14.instructions.configure = markStarted(started: true);

-units.14.instructions.unconfigure = markStarted(started: false);

-

-units.15.id = tooling.virgo.org.eclipse.equinox.p2.engine

-units.15.version = 1.0.0.tooling

-units.15.requires.0.name = org.eclipse.equinox.p2.engine

-units.15.requires.0.namespace = osgi.bundle

-units.15.requires.1.name = bundle

-units.15.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.15.requires.1.greedy = false

-units.15.requires.1.range = 0.0.0

-units.15.hostRequirements.0.name = org.eclipse.equinox.p2.engine

-units.15.hostRequirements.0.namespace = osgi.bundle

-units.15.hostRequirements.1.name = bundle

-units.15.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.15.hostRequirements.1.greedy = false

-units.15.hostRequirements.1.range = 0.0.0

-units.15.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.15.properties.0.value = true

-units.15.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.engine

-units.15.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.15.provides.1.name = tooling

-units.15.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.15.provides.1.version = 1.0.0.tooling

-units.15.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.15.touchpoint.version = 1.0.0

-units.15.instructions.install = installBundle(bundle:${artifact})

-units.15.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.15.instructions.configure = markStarted(started: true);

-units.15.instructions.unconfigure = markStarted(started: false);

-

-units.16.id = tooling.virgo.org.eclipse.equinox.p2.garbagecollector

-units.16.version = 1.0.0.tooling

-units.16.requires.0.name = org.eclipse.equinox.p2.garbagecollector

-units.16.requires.0.namespace = osgi.bundle

-units.16.requires.1.name = bundle

-units.16.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.16.requires.1.greedy = false

-units.16.requires.1.range = 0.0.0

-units.16.hostRequirements.0.name = org.eclipse.equinox.p2.garbagecollector

-units.16.hostRequirements.0.namespace = osgi.bundle

-units.16.hostRequirements.1.name = bundle

-units.16.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.16.hostRequirements.1.greedy = false

-units.16.hostRequirements.1.range = 0.0.0

-units.16.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.16.properties.0.value = true

-units.16.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.garbagecollector

-units.16.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.16.provides.1.name = tooling

-units.16.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.16.provides.1.version = 1.0.0.tooling

-units.16.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.16.touchpoint.version = 1.0.0

-units.16.instructions.install = installBundle(bundle:${artifact})

-units.16.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.16.instructions.configure = markStarted(started: true);

-units.16.instructions.unconfigure = markStarted(started: false);

-

-units.17.id = tooling.virgo.org.eclipse.equinox.p2.jarprocessor

-units.17.version = 1.0.0.tooling

-units.17.requires.0.name = org.eclipse.equinox.p2.jarprocessor

-units.17.requires.0.namespace = osgi.bundle

-units.17.requires.1.name = bundle

-units.17.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.17.requires.1.greedy = false

-units.17.requires.1.range = 0.0.0

-units.17.hostRequirements.0.name = org.eclipse.equinox.p2.jarprocessor

-units.17.hostRequirements.0.namespace = osgi.bundle

-units.17.hostRequirements.1.name = bundle

-units.17.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.17.hostRequirements.1.greedy = false

-units.17.hostRequirements.1.range = 0.0.0

-units.17.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.17.properties.0.value = true

-units.17.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.jarprocessor

-units.17.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.17.provides.1.name = tooling

-units.17.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.17.provides.1.version = 1.0.0.tooling

-units.17.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.17.touchpoint.version = 1.0.0

-units.17.instructions.install = installBundle(bundle:${artifact})

-units.17.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.17.instructions.configure = markStarted(started: true);

-units.17.instructions.unconfigure = markStarted(started: false);

-

-units.18.id = tooling.virgo.org.eclipse.equinox.p2.metadata

-units.18.version = 1.0.0.tooling

-units.18.requires.0.name = org.eclipse.equinox.p2.metadata

-units.18.requires.0.namespace = osgi.bundle

-units.18.requires.1.name = bundle

-units.18.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.18.requires.1.greedy = false

-units.18.requires.1.range = 0.0.0

-units.18.hostRequirements.0.name = org.eclipse.equinox.p2.metadata

-units.18.hostRequirements.0.namespace = osgi.bundle

-units.18.hostRequirements.1.name = bundle

-units.18.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.18.hostRequirements.1.greedy = false

-units.18.hostRequirements.1.range = 0.0.0

-units.18.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.18.properties.0.value = true

-units.18.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.metadata

-units.18.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.18.provides.1.name = tooling

-units.18.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.18.provides.1.version = 1.0.0.tooling

-units.18.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.18.touchpoint.version = 1.0.0

-units.18.instructions.install = installBundle(bundle:${artifact})

-units.18.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.18.instructions.configure = markStarted(started: true);

-units.18.instructions.unconfigure = markStarted(started: false);

-

-units.19.id = tooling.virgo.org.eclipse.equinox.p2.metadata.repository

-units.19.version = 1.0.0.tooling

-units.19.requires.0.name = org.eclipse.equinox.p2.metadata.repository

-units.19.requires.0.namespace = osgi.bundle

-units.19.requires.1.name = bundle

-units.19.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.19.requires.1.greedy = false

-units.19.requires.1.range = 0.0.0

-units.19.hostRequirements.0.name = org.eclipse.equinox.p2.metadata.repository

-units.19.hostRequirements.0.namespace = osgi.bundle

-units.19.hostRequirements.1.name = bundle

-units.19.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.19.hostRequirements.1.greedy = false

-units.19.hostRequirements.1.range = 0.0.0

-units.19.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.19.properties.0.value = true

-units.19.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.metadata.repository

-units.19.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.19.provides.1.name = tooling

-units.19.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.19.provides.1.version = 1.0.0.tooling

-units.19.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.19.touchpoint.version = 1.0.0

-units.19.instructions.install = installBundle(bundle:${artifact})

-units.19.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.19.instructions.configure = markStarted(started: true);

-units.19.instructions.unconfigure = markStarted(started: false);

-

-units.20.id = tooling.virgo.org.eclipse.equinox.p2.publisher

-units.20.version = 1.0.0.tooling

-units.20.requires.0.name = org.eclipse.equinox.p2.publisher

-units.20.requires.0.namespace = osgi.bundle

-units.20.requires.1.name = bundle

-units.20.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.20.requires.1.greedy = false

-units.20.requires.1.range = 0.0.0

-units.20.hostRequirements.0.name = org.eclipse.equinox.p2.publisher

-units.20.hostRequirements.0.namespace = osgi.bundle

-units.20.hostRequirements.1.name = bundle

-units.20.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.20.hostRequirements.1.greedy = false

-units.20.hostRequirements.1.range = 0.0.0

-units.20.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.20.properties.0.value = true

-units.20.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.publisher

-units.20.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.20.provides.1.name = tooling

-units.20.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.20.provides.1.version = 1.0.0.tooling

-units.20.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.20.touchpoint.version = 1.0.0

-units.20.instructions.install = installBundle(bundle:${artifact})

-units.20.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.20.instructions.configure = markStarted(started: true);

-units.20.instructions.unconfigure = markStarted(started: false);

-

-units.21.id = tooling.virgo.org.eclipse.equinox.p2.publisher.eclipse

-units.21.version = 1.0.0.tooling

-units.21.requires.0.name = org.eclipse.equinox.p2.publisher.eclipse

-units.21.requires.0.namespace = osgi.bundle

-units.21.requires.1.name = bundle

-units.21.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.21.requires.1.greedy = false

-units.21.requires.1.range = 0.0.0

-units.21.hostRequirements.0.name = org.eclipse.equinox.p2.publisher.eclipse

-units.21.hostRequirements.0.namespace = osgi.bundle

-units.21.hostRequirements.1.name = bundle

-units.21.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.21.hostRequirements.1.greedy = false

-units.21.hostRequirements.1.range = 0.0.0

-units.21.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.21.properties.0.value = true

-units.21.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.publisher.eclipse

-units.21.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.21.provides.1.name = tooling

-units.21.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.21.provides.1.version = 1.0.0.tooling

-units.21.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.21.touchpoint.version = 1.0.0

-units.21.instructions.install = installBundle(bundle:${artifact})

-units.21.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.21.instructions.configure = markStarted(started: true);

-units.21.instructions.unconfigure = markStarted(started: false);

-

-units.22.id = tooling.virgo.org.eclipse.equinox.p2.repository

-units.22.version = 1.0.0.tooling

-units.22.requires.0.name = org.eclipse.equinox.p2.repository

-units.22.requires.0.namespace = osgi.bundle

-units.22.requires.1.name = bundle

-units.22.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.22.requires.1.greedy = false

-units.22.requires.1.range = 0.0.0

-units.22.hostRequirements.0.name = org.eclipse.equinox.p2.repository

-units.22.hostRequirements.0.namespace = osgi.bundle

-units.22.hostRequirements.1.name = bundle

-units.22.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.22.hostRequirements.1.greedy = false

-units.22.hostRequirements.1.range = 0.0.0

-units.22.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.22.properties.0.value = true

-units.22.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.repository

-units.22.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.22.provides.1.name = tooling

-units.22.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.22.provides.1.version = 1.0.0.tooling

-units.22.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.22.touchpoint.version = 1.0.0

-units.22.instructions.install = installBundle(bundle:${artifact})

-units.22.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.22.instructions.configure = markStarted(started: true);

-units.22.instructions.unconfigure = markStarted(started: false);

-

-units.23.id = tooling.virgo.org.eclipse.equinox.p2.touchpoint.eclipse

-units.23.version = 1.0.0.tooling

-units.23.requires.0.name = org.eclipse.equinox.p2.touchpoint.eclipse

-units.23.requires.0.namespace = osgi.bundle

-units.23.requires.1.name = bundle

-units.23.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.23.requires.1.greedy = false

-units.23.requires.1.range = 0.0.0

-units.23.hostRequirements.0.name = org.eclipse.equinox.p2.touchpoint.eclipse

-units.23.hostRequirements.0.namespace = osgi.bundle

-units.23.hostRequirements.1.name = bundle

-units.23.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.23.hostRequirements.1.greedy = false

-units.23.hostRequirements.1.range = 0.0.0

-units.23.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.23.properties.0.value = true

-units.23.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.touchpoint.eclipse

-units.23.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.23.provides.1.name = tooling

-units.23.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.23.provides.1.version = 1.0.0.tooling

-units.23.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.23.touchpoint.version = 1.0.0

-units.23.instructions.install = installBundle(bundle:${artifact})

-units.23.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.23.instructions.configure = markStarted(started: true);

-units.23.instructions.unconfigure = markStarted(started: false);

-

-units.24.id = tooling.virgo.org.eclipse.equinox.p2.touchpoint.natives

-units.24.version = 1.0.0.tooling

-units.24.requires.0.name = org.eclipse.equinox.p2.touchpoint.natives

-units.24.requires.0.namespace = osgi.bundle

-units.24.requires.1.name = bundle

-units.24.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.24.requires.1.greedy = false

-units.24.requires.1.range = 0.0.0

-units.24.hostRequirements.0.name = org.eclipse.equinox.p2.touchpoint.natives

-units.24.hostRequirements.0.namespace = osgi.bundle

-units.24.hostRequirements.1.name = bundle

-units.24.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.24.hostRequirements.1.greedy = false

-units.24.hostRequirements.1.range = 0.0.0

-units.24.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.24.properties.0.value = true

-units.24.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.touchpoint.natives

-units.24.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.24.provides.1.name = tooling

-units.24.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.24.provides.1.version = 1.0.0.tooling

-units.24.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.24.touchpoint.version = 1.0.0

-units.24.instructions.install = installBundle(bundle:${artifact})

-units.24.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.24.instructions.configure = markStarted(started: true);

-units.24.instructions.unconfigure = markStarted(started: false);

-

-units.25.id = tooling.virgo.org.eclipse.equinox.p2.transport.ecf

-units.25.version = 1.0.0.tooling

-units.25.requires.0.name = org.eclipse.equinox.p2.transport.ecf

-units.25.requires.0.namespace = osgi.bundle

-units.25.requires.1.name = bundle

-units.25.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.25.requires.1.greedy = false

-units.25.requires.1.range = 0.0.0

-units.25.hostRequirements.0.name = org.eclipse.equinox.p2.transport.ecf

-units.25.hostRequirements.0.namespace = osgi.bundle

-units.25.hostRequirements.1.name = bundle

-units.25.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.25.hostRequirements.1.greedy = false

-units.25.hostRequirements.1.range = 0.0.0

-units.25.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.25.properties.0.value = true

-units.25.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.transport.ecf

-units.25.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.25.provides.1.name = tooling

-units.25.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.25.provides.1.version = 1.0.0.tooling

-units.25.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.25.touchpoint.version = 1.0.0

-units.25.instructions.install = installBundle(bundle:${artifact})

-units.25.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.25.instructions.configure = markStarted(started: true);

-units.25.instructions.unconfigure = markStarted(started: false);

-

-units.26.id = tooling.virgo.org.eclipse.equinox.preferences

-units.26.version = 1.0.0.tooling

-units.26.requires.0.name = org.eclipse.equinox.preferences

-units.26.requires.0.namespace = osgi.bundle

-units.26.requires.1.name = bundle

-units.26.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.26.requires.1.greedy = false

-units.26.requires.1.range = 0.0.0

-units.26.hostRequirements.0.name = org.eclipse.equinox.preferences

-units.26.hostRequirements.0.namespace = osgi.bundle

-units.26.hostRequirements.1.name = bundle

-units.26.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.26.hostRequirements.1.greedy = false

-units.26.hostRequirements.1.range = 0.0.0

-units.26.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.26.properties.0.value = true

-units.26.provides.0.name = tooling.virgo.org.eclipse.equinox.preferences

-units.26.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.26.provides.1.name = tooling

-units.26.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.26.provides.1.version = 1.0.0.tooling

-units.26.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.26.touchpoint.version = 1.0.0

-units.26.instructions.install = installBundle(bundle:${artifact})

-units.26.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.26.instructions.configure = markStarted(started: true);

-units.26.instructions.unconfigure = markStarted(started: false);

-

-units.27.id = tooling.virgo.org.eclipse.equinox.registry

-units.27.version = 1.0.0.tooling

-units.27.requires.0.name = org.eclipse.equinox.registry

-units.27.requires.0.namespace = osgi.bundle

-units.27.requires.1.name = bundle

-units.27.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.27.requires.1.greedy = false

-units.27.requires.1.range = 0.0.0

-units.27.hostRequirements.0.name = org.eclipse.equinox.registry

-units.27.hostRequirements.0.namespace = osgi.bundle

-units.27.hostRequirements.1.name = bundle

-units.27.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.27.hostRequirements.1.greedy = false

-units.27.hostRequirements.1.range = 0.0.0

-units.27.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.27.properties.0.value = true

-units.27.provides.0.name = tooling.virgo.org.eclipse.equinox.registry

-units.27.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.27.provides.1.name = tooling

-units.27.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.27.provides.1.version = 1.0.0.tooling

-units.27.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.27.touchpoint.version = 1.0.0

-units.27.instructions.install = installBundle(bundle:${artifact})

-units.27.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.27.instructions.configure = markStarted(started: true);

-units.27.instructions.unconfigure = markStarted(started: false);

-

-units.28.id = tooling.virgo.org.eclipse.equinox.security

-units.28.version = 1.0.0.tooling

-units.28.requires.0.name = org.eclipse.equinox.security

-units.28.requires.0.namespace = osgi.bundle

-units.28.requires.1.name = bundle

-units.28.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.28.requires.1.greedy = false

-units.28.requires.1.range = 0.0.0

-units.28.hostRequirements.0.name = org.eclipse.equinox.security

-units.28.hostRequirements.0.namespace = osgi.bundle

-units.28.hostRequirements.1.name = bundle

-units.28.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.28.hostRequirements.1.greedy = false

-units.28.hostRequirements.1.range = 0.0.0

-units.28.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.28.properties.0.value = true

-units.28.provides.0.name = tooling.virgo.org.eclipse.equinox.security

-units.28.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.28.provides.1.name = tooling

-units.28.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.28.provides.1.version = 1.0.0.tooling

-units.28.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.28.touchpoint.version = 1.0.0

-units.28.instructions.install = installBundle(bundle:${artifact})

-units.28.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.28.instructions.configure = markStarted(started: true);

-units.28.instructions.unconfigure = markStarted(started: false);

-

-units.30.id = tooling.virgo.org.eclipse.equinox.simpleconfigurator.manipulator

-units.30.version = 1.0.0.tooling

-units.30.requires.0.name = org.eclipse.equinox.simpleconfigurator.manipulator

-units.30.requires.0.namespace = osgi.bundle

-units.30.requires.1.name = bundle

-units.30.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.30.requires.1.greedy = false

-units.30.requires.1.range = 0.0.0

-units.30.hostRequirements.0.name = org.eclipse.equinox.simpleconfigurator.manipulator

-units.30.hostRequirements.0.namespace = osgi.bundle

-units.30.hostRequirements.1.name = bundle

-units.30.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.30.hostRequirements.1.greedy = false

-units.30.hostRequirements.1.range = 0.0.0

-units.30.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.30.properties.0.value = true

-units.30.provides.0.name = tooling.virgo.org.eclipse.equinox.simpleconfigurator.manipulator

-units.30.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.30.provides.1.name = tooling

-units.30.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.30.provides.1.version = 1.0.0.tooling

-units.30.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.30.touchpoint.version = 1.0.0

-units.30.instructions.install = installBundle(bundle:${artifact})

-units.30.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.30.instructions.configure = markStarted(started: true);

-units.30.instructions.unconfigure = markStarted(started: false);

- 

-units.31.id = tooling.virgo.org.eclipse.core.net

-units.31.version = 1.0.0.tooling

-units.31.requires.0.name = org.eclipse.core.net

-units.31.requires.0.namespace = osgi.bundle

-units.31.requires.1.name = bundle

-units.31.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.31.requires.1.greedy = false

-units.31.requires.1.range = 0.0.0

-units.31.hostRequirements.0.name = org.eclipse.core.net

-units.31.hostRequirements.0.namespace = osgi.bundle

-units.31.hostRequirements.1.name = bundle

-units.31.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.31.hostRequirements.1.greedy = false

-units.31.hostRequirements.1.range = 0.0.0

-units.31.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.31.properties.0.value = true

-units.31.provides.0.name = tooling.virgo.org.eclipse.core.net

-units.31.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.31.provides.1.name = tooling

-units.31.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.31.provides.1.version = 1.0.0.tooling

-units.31.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.31.touchpoint.version = 1.0.0

-units.31.instructions.install = installBundle(bundle:${artifact})

-units.31.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.31.instructions.configure = markStarted(started: true);

-units.31.instructions.unconfigure = markStarted(started: false);

-

-units.32.id = tooling.virgo.org.eclipse.equinox.p2.console

-units.32.version = 1.0.0.tooling

-units.32.requires.0.name = org.eclipse.equinox.p2.console

-units.32.requires.0.namespace = osgi.bundle

-units.32.requires.1.name = bundle

-units.32.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.32.requires.1.greedy = false

-units.32.requires.1.range = 0.0.0

-units.32.hostRequirements.0.name = org.eclipse.equinox.p2.console

-units.32.hostRequirements.0.namespace = osgi.bundle

-units.32.hostRequirements.1.name = bundle

-units.32.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.32.hostRequirements.1.greedy = false

-units.32.hostRequirements.1.range = 0.0.0

-units.32.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.32.properties.0.value = true

-units.32.provides.0.name = tooling.virgo.org.eclipse.equinox.p2.console

-units.32.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.32.provides.1.name = tooling

-units.32.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.32.provides.1.version = 1.0.0.tooling

-units.32.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.32.touchpoint.version = 1.0.0

-units.32.instructions.install = installBundle(bundle:${artifact})

-units.32.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.32.instructions.configure = markStarted(started: true);

-units.32.instructions.unconfigure = markStarted(started: false);

-

-units.33.id = tooling.virgo.org.eclipse.equinox.cm

-units.33.version = 1.0.0.tooling

-units.33.requires.0.name = org.eclipse.equinox.cm

-units.33.requires.0.namespace = osgi.bundle

-units.33.requires.1.name = bundle

-units.33.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.33.requires.1.greedy = false

-units.33.requires.1.range = 0.0.0

-units.33.hostRequirements.0.name = org.eclipse.equinox.cm

-units.33.hostRequirements.0.namespace = osgi.bundle

-units.33.hostRequirements.1.name = bundle

-units.33.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.33.hostRequirements.1.greedy = false

-units.33.hostRequirements.1.range = 0.0.0

-units.33.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.33.properties.0.value = true

-units.33.provides.0.name = tooling.virgo.org.eclipse.equinox.cm

-units.33.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.33.provides.1.name = tooling

-units.33.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.33.provides.1.version = 1.0.0.tooling

-units.33.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.33.touchpoint.version = 1.0.0

-units.33.instructions.install = installBundle(bundle:${artifact})

-units.33.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.33.instructions.configure = markStarted(started: true);

-units.33.instructions.unconfigure = markStarted(started: false);

-

-units.34.id = tooling.virgo.org.eclipse.equinox.ds

-units.34.version = 1.0.0.tooling

-units.34.requires.0.name = org.eclipse.equinox.ds

-units.34.requires.0.namespace = osgi.bundle

-units.34.requires.1.name = bundle

-units.34.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.34.requires.1.greedy = false

-units.34.requires.1.range = 0.0.0

-units.34.hostRequirements.0.name = org.eclipse.equinox.ds

-units.34.hostRequirements.0.namespace = osgi.bundle

-units.34.hostRequirements.1.name = bundle

-units.34.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.34.hostRequirements.1.greedy = false

-units.34.hostRequirements.1.range = 0.0.0

-units.34.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.34.properties.0.value = true

-units.34.provides.0.name = tooling.virgo.org.eclipse.equinox.ds

-units.34.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.34.provides.1.name = tooling

-units.34.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.34.provides.1.version = 1.0.0.tooling

-units.34.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.34.touchpoint.version = 1.0.0

-units.34.instructions.install = installBundle(bundle:${artifact})

-units.34.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.34.instructions.configure = markStarted(started: true);

-units.34.instructions.unconfigure = markStarted(started: false);

-

-units.35.id = tooling.virgo.org.eclipse.equinox.simpleconfigurator

-units.35.version = 1.0.0.tooling

-units.35.requires.0.name = org.eclipse.equinox.simpleconfigurator

-units.35.requires.0.namespace = osgi.bundle

-units.35.requires.1.name = bundle

-units.35.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.35.requires.1.greedy = false

-units.35.requires.1.range = 0.0.0

-units.35.hostRequirements.0.name = org.eclipse.equinox.simpleconfigurator

-units.35.hostRequirements.0.namespace = osgi.bundle

-units.35.hostRequirements.1.name = bundle

-units.35.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.35.hostRequirements.1.greedy = false

-units.35.hostRequirements.1.range = 0.0.0

-units.35.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.35.properties.0.value = true

-units.35.provides.0.name = tooling.virgo.org.eclipse.equinox.simpleconfigurator

-units.35.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.35.provides.1.name = tooling

-units.35.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.35.provides.1.version = 1.0.0.tooling

-units.35.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.35.touchpoint.version = 1.0.0

-units.35.instructions.install = installBundle(bundle:${artifact})

-units.35.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.35.instructions.configure = setStartLevel(startLevel:1);markStarted(started: true);

-units.35.instructions.unconfigure = markStarted(started: false);

-

-units.36.id = tooling.virgo.org.eclipse.equinox.event

-units.36.version = 1.0.0.tooling

-units.36.requires.0.name = org.eclipse.equinox.event

-units.36.requires.0.namespace = osgi.bundle

-units.36.requires.1.name = bundle

-units.36.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.36.requires.1.greedy = false

-units.36.requires.1.range = 0.0.0

-units.36.hostRequirements.0.name = org.eclipse.equinox.event

-units.36.hostRequirements.0.namespace = osgi.bundle

-units.36.hostRequirements.1.name = bundle

-units.36.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.36.hostRequirements.1.greedy = false

-units.36.hostRequirements.1.range = 0.0.0

-units.36.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.36.properties.0.value = true

-units.36.provides.0.name = tooling.virgo.org.eclipse.equinox.event

-units.36.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.36.provides.1.name = tooling

-units.36.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.36.provides.1.version = 1.0.0.tooling

-units.36.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.36.touchpoint.version = 1.0.0

-units.36.instructions.install = installBundle(bundle:${artifact})

-units.36.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.36.instructions.configure = markStarted(started: true);

-units.36.instructions.unconfigure = markStarted(started: false);

-

-units.37.id = tooling.virgo.org.eclipse.equinox.common

-units.37.version = 1.0.0.tooling

-units.37.requires.0.name = org.eclipse.equinox.common

-units.37.requires.0.namespace = osgi.bundle

-units.37.requires.1.name = bundle

-units.37.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.37.requires.1.greedy = false

-units.37.requires.1.range = 0.0.0

-units.37.hostRequirements.0.name = org.eclipse.equinox.common

-units.37.hostRequirements.0.namespace = osgi.bundle

-units.37.hostRequirements.1.name = bundle

-units.37.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.37.hostRequirements.1.greedy = false

-units.37.hostRequirements.1.range = 0.0.0

-units.37.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.37.properties.0.value = true

-units.37.provides.0.name = tooling.virgo.org.eclipse.equinox.common

-units.37.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.37.provides.1.name = tooling

-units.37.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.37.provides.1.version = 1.0.0.tooling

-units.37.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.37.touchpoint.version = 1.0.0

-units.37.instructions.install = installBundle(bundle:${artifact})

-units.37.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.37.instructions.configure = markStarted(started: true);

-units.37.instructions.unconfigure = markStarted(started: false);

-

-units.38.id = tooling.virgo.org.eclipse.equinox.util

-units.38.version = 1.0.0.tooling

-units.38.requires.0.name = org.eclipse.equinox.util

-units.38.requires.0.namespace = osgi.bundle

-units.38.requires.1.name = bundle

-units.38.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.38.requires.1.greedy = false

-units.38.requires.1.range = 0.0.0

-units.38.hostRequirements.0.name = org.eclipse.equinox.util

-units.38.hostRequirements.0.namespace = osgi.bundle

-units.38.hostRequirements.1.name = bundle

-units.38.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.38.hostRequirements.1.greedy = false

-units.38.hostRequirements.1.range = 0.0.0

-units.38.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.38.properties.0.value = true

-units.38.provides.0.name = tooling.virgo.org.eclipse.equinox.util

-units.38.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.38.provides.1.name = tooling

-units.38.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.38.provides.1.version = 1.0.0.tooling

-units.38.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.38.touchpoint.version = 1.0.0

-units.38.instructions.install = installBundle(bundle:${artifact})

-units.38.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.38.instructions.configure = markStarted(started: true);

-units.38.instructions.unconfigure = markStarted(started: false);

-

-units.39.id = tooling.virgo.org.eclipse.osgi.services

-units.39.version = 1.0.0.tooling

-units.39.requires.0.name = org.eclipse.osgi.services

-units.39.requires.0.namespace = osgi.bundle

-units.39.requires.1.name = bundle

-units.39.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.39.requires.1.greedy = false

-units.39.requires.1.range = 0.0.0

-units.39.hostRequirements.0.name = org.eclipse.osgi.services

-units.39.hostRequirements.0.namespace = osgi.bundle

-units.39.hostRequirements.1.name = bundle

-units.39.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.39.hostRequirements.1.greedy = false

-units.39.hostRequirements.1.range = 0.0.0

-units.39.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.39.properties.0.value = true

-units.39.provides.0.name = tooling.virgo.org.eclipse.osgi.services

-units.39.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.39.provides.1.name = tooling

-units.39.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.39.provides.1.version = 1.0.0.tooling

-units.39.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.39.touchpoint.version = 1.0.0

-units.39.instructions.install = installBundle(bundle:${artifact})

-units.39.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.39.instructions.configure = markStarted(started: true);

-units.39.instructions.unconfigure = markStarted(started: false);

-

-units.40.id = tooling.virgo.org.eclipse.equinox.console

-units.40.version = 1.0.0.tooling

-units.40.requires.0.name = org.eclipse.equinox.console

-units.40.requires.0.namespace = osgi.bundle

-units.40.requires.1.name = bundle

-units.40.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.40.requires.1.greedy = false

-units.40.requires.1.range = 0.0.0

-units.40.hostRequirements.0.name = org.eclipse.equinox.console

-units.40.hostRequirements.0.namespace = osgi.bundle

-units.40.hostRequirements.1.name = bundle

-units.40.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.40.hostRequirements.1.greedy = false

-units.40.hostRequirements.1.range = 0.0.0

-units.40.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.40.properties.0.value = true

-units.40.provides.0.name = tooling.virgo.org.eclipse.equinox.console

-units.40.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.40.provides.1.name = tooling

-units.40.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.40.provides.1.version = 1.0.0.tooling

-units.40.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.40.touchpoint.version = 1.0.0

-units.40.instructions.install = installBundle(bundle:${artifact})

-units.40.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.40.instructions.configure = markStarted(started: true);

-units.40.instructions.unconfigure = markStarted(started: false);

-

-units.41.id = tooling.virgo.org.eclipse.equinox.console.ssh

-units.41.version = 1.0.0.tooling

-units.41.requires.0.name = org.eclipse.equinox.console.ssh

-units.41.requires.0.namespace = osgi.bundle

-units.41.requires.1.name = bundle

-units.41.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.41.requires.1.greedy = false

-units.41.requires.1.range = 0.0.0

-units.41.hostRequirements.0.name = org.eclipse.equinox.console.ssh

-units.41.hostRequirements.0.namespace = osgi.bundle

-units.41.hostRequirements.1.name = bundle

-units.41.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.41.hostRequirements.1.greedy = false

-units.41.hostRequirements.1.range = 0.0.0

-units.41.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.41.properties.0.value = true

-units.41.provides.0.name = tooling.virgo.org.eclipse.equinox.console.ssh

-units.41.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.41.provides.1.name = tooling

-units.41.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.41.provides.1.version = 1.0.0.tooling

-units.41.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.41.touchpoint.version = 1.0.0

-units.41.instructions.install = installBundle(bundle:${artifact})

-units.41.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.41.instructions.configure = markStarted(started: true);

-units.41.instructions.unconfigure = markStarted(started: false);

-

-units.42.id = tooling.virgo.org.apache.mina.core

-units.42.version = 1.0.0.tooling

-units.42.requires.0.name = org.apache.mina.core

-units.42.requires.0.namespace = osgi.bundle

-units.42.requires.1.name = bundle

-units.42.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.42.requires.1.greedy = false

-units.42.requires.1.range = 0.0.0

-units.42.hostRequirements.0.name = org.apache.mina.core

-units.42.hostRequirements.0.namespace = osgi.bundle

-units.42.hostRequirements.1.name = bundle

-units.42.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.42.hostRequirements.1.greedy = false

-units.42.hostRequirements.1.range = 0.0.0

-units.42.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.42.properties.0.value = true

-units.42.provides.0.name = tooling.virgo.org.apache.mina.core

-units.42.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.42.provides.1.name = tooling

-units.42.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.42.provides.1.version = 1.0.0.tooling

-units.42.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.42.touchpoint.version = 1.0.0

-units.42.instructions.install = installBundle(bundle:${artifact})

-units.42.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.42.instructions.configure = markStarted(started: true);

-units.42.instructions.unconfigure = markStarted(started: false);

-

-units.43.id = tooling.virgo.org.apache.sshd.core

-units.43.version = 1.0.0.tooling

-units.43.requires.0.name = org.apache.sshd.core

-units.43.requires.0.namespace = osgi.bundle

-units.43.requires.1.name = bundle

-units.43.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.43.requires.1.greedy = false

-units.43.requires.1.range = 0.0.0

-units.43.hostRequirements.0.name = org.apache.sshd.core

-units.43.hostRequirements.0.namespace = osgi.bundle

-units.43.hostRequirements.1.name = bundle

-units.43.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.43.hostRequirements.1.greedy = false

-units.43.hostRequirements.1.range = 0.0.0

-units.43.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.43.properties.0.value = true

-units.43.provides.0.name = tooling.virgo.org.apache.sshd.core

-units.43.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.43.provides.1.name = tooling

-units.43.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.43.provides.1.version = 1.0.0.tooling

-units.43.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.43.touchpoint.version = 1.0.0

-units.43.instructions.install = installBundle(bundle:${artifact})

-units.43.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.43.instructions.configure = markStarted(started: true);

-units.43.instructions.unconfigure = markStarted(started: false);

-

-units.44.id = tooling.virgo.org.apache.felix.gogo.command

-units.44.version = 1.0.0.tooling

-units.44.requires.0.name = org.apache.felix.gogo.command

-units.44.requires.0.namespace = osgi.bundle

-units.44.requires.1.name = bundle

-units.44.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.44.requires.1.greedy = false

-units.44.requires.1.range = 0.0.0

-units.44.hostRequirements.0.name = org.apache.felix.gogo.command

-units.44.hostRequirements.0.namespace = osgi.bundle

-units.44.hostRequirements.1.name = bundle

-units.44.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.44.hostRequirements.1.greedy = false

-units.44.hostRequirements.1.range = 0.0.0

-units.44.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.44.properties.0.value = true

-units.44.provides.0.name = tooling.virgo.org.apache.felix.gogo.command

-units.44.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.44.provides.1.name = tooling

-units.44.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.44.provides.1.version = 1.0.0.tooling

-units.44.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.44.touchpoint.version = 1.0.0

-units.44.instructions.install = installBundle(bundle:${artifact})

-units.44.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.44.instructions.configure = markStarted(started: true);

-units.44.instructions.unconfigure = markStarted(started: false);

-

-units.45.id = tooling.virgo.org.apache.felix.gogo.runtime

-units.45.version = 1.0.0.tooling

-units.45.requires.0.name = org.apache.felix.gogo.runtime

-units.45.requires.0.namespace = osgi.bundle

-units.45.requires.1.name = bundle

-units.45.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.45.requires.1.greedy = false

-units.45.requires.1.range = 0.0.0

-units.45.hostRequirements.0.name = org.apache.felix.gogo.runtime

-units.45.hostRequirements.0.namespace = osgi.bundle

-units.45.hostRequirements.1.name = bundle

-units.45.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.45.hostRequirements.1.greedy = false

-units.45.hostRequirements.1.range = 0.0.0

-units.45.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.45.properties.0.value = true

-units.45.provides.0.name = tooling.virgo.org.apache.felix.gogo.runtime

-units.45.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.45.provides.1.name = tooling

-units.45.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.45.provides.1.version = 1.0.0.tooling

-units.45.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.45.touchpoint.version = 1.0.0

-units.45.instructions.install = installBundle(bundle:${artifact})

-units.45.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.45.instructions.configure = markStarted(started: true);

-units.45.instructions.unconfigure = markStarted(started: false);

-

-units.46.id = tooling.virgo.org.apache.felix.gogo.shell

-units.46.version = 1.0.0.tooling

-units.46.requires.0.name = org.apache.felix.gogo.shell

-units.46.requires.0.namespace = osgi.bundle

-units.46.requires.1.name = bundle

-units.46.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.46.requires.1.greedy = false

-units.46.requires.1.range = 0.0.0

-units.46.hostRequirements.0.name = org.apache.felix.gogo.shell

-units.46.hostRequirements.0.namespace = osgi.bundle

-units.46.hostRequirements.1.name = bundle

-units.46.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type

-units.46.hostRequirements.1.greedy = false

-units.46.hostRequirements.1.range = 0.0.0

-units.46.properties.0.name = org.eclipse.equinox.p2.type.fragment

-units.46.properties.0.value = true

-units.46.provides.0.name = tooling.virgo.org.apache.felix.gogo.shell

-units.46.provides.0.namespace = org.eclipse.equinox.p2.iu

-units.46.provides.1.name = tooling

-units.46.provides.1.namespace = org.eclipse.equinox.p2.flavor

-units.46.provides.1.version = 1.0.0.tooling

-units.46.touchpoint.id = org.eclipse.equinox.p2.osgi

-units.46.touchpoint.version = 1.0.0

-units.46.instructions.install = installBundle(bundle:${artifact})

-units.46.instructions.uninstall = uninstallBundle(bundle:${artifact})

-units.46.instructions.configure = markStarted(started: true);

-units.46.instructions.unconfigure = markStarted(started: false);

diff --git a/build-packaging/nano/publish_resources/products/virgo-nano/virgo-nano.product b/build-packaging/nano/publish_resources/products/virgo-nano/virgo-nano.product
deleted file mode 100755
index 2392e98..0000000
--- a/build-packaging/nano/publish_resources/products/virgo-nano/virgo-nano.product
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?pde version="3.5"?>

-

-<product name="Eclipse Virgo Nano Product" uid="virgo-nano.product" version="1.0.0.SIMREL" useFeatures="true" includeLaunchers="false" type="mixed">

-

-   <configIni use="default">

-   </configIni>

-   

-   <vm>

-   </vm>

-   

-   <plugins>

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

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

-	  <plugin id="org.eclipse.equinox.simpleconfigurator"/>

-	  <plugin id="ch.qos.logback.classic"/>

-	  <plugin id="ch.qos.logback.core"/>

-	  <plugin id="ch.qos.logback.slf4j"/>

-	  <plugin id="javax.activation"/>

-      <plugin id="javax.ejb"/>

-	  <plugin id="javax.mail"/>

-	  <plugin id="javax.persistence"/>

-	  <plugin id="javax.xml.rpc"/>

-	  <plugin id="javax.websocket"/>

-      <plugin id="org.apache.catalina"/>

-	  <plugin id="org.apache.catalina.ha"/>

-	  <plugin id="org.apache.catalina.tribes"/>

-	  <plugin id="org.apache.coyote"/>

-	  <plugin id="org.apache.el"/>

-	  <plugin id="org.apache.jasper"/>

-	  <plugin id="org.apache.juli.extras"/>

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

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

-	  <plugin id="org.apache.tomcat.api"/>

-	  <plugin id="org.apache.tomcat.util"/>

-	  <plugin id="org.apache.tomcat.websocket"/>

-	  <plugin id="org.eclipse.jdt.core.compiler.batch"/>

-	  <plugin id="org.slf4j.api"/>

-      <plugin id="org.slf4j.jul"/>

-      <plugin id="org.slf4j.jcl"/>

-	  <plugin id="javax.annotation"/>

-	  <plugin id="javax.el"/>

-	  <plugin id="javax.servlet"/>

-	  <plugin id="javax.servlet.jsp"/>

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

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

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

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

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

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

-	  <plugin id="org.eclipse.ecf"/>

-	  <plugin id="org.eclipse.ecf.filetransfer"/>

-	  <plugin id="org.eclipse.ecf.identity"/>

-	  <plugin id="org.eclipse.ecf.provider.filetransfer"/>

-	  <plugin id="org.eclipse.ecf.ssl"/>

-	  <plugin id="org.eclipse.equinox.app"/>

-	  <plugin id="org.eclipse.equinox.cm"/>

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

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

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

-	  <plugin id="org.eclipse.equinox.ds"/>

-	  <plugin id="org.eclipse.equinox.event"/>

-	  <plugin id="org.eclipse.equinox.frameworkadmin"/>

-	  <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>

-	  <plugin id="org.eclipse.equinox.p2.artifact.repository"/>

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

-	  <plugin id="org.eclipse.equinox.p2.core"/>

-	  <plugin id="org.eclipse.equinox.p2.director"/>

-	  <plugin id="org.eclipse.equinox.p2.engine"/>

-	  <plugin id="org.eclipse.equinox.p2.garbagecollector"/>

-	  <plugin id="org.eclipse.equinox.p2.jarprocessor"/>

-	  <plugin id="org.eclipse.equinox.p2.metadata"/>

-	  <plugin id="org.eclipse.equinox.p2.metadata.repository"/>

-	  <plugin id="org.eclipse.equinox.p2.publisher"/>

-	  <plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>

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

-	  <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>

-	  <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>

-	  <plugin id="org.eclipse.equinox.p2.transport.ecf"/>

-	  <plugin id="org.eclipse.equinox.preferences"/>

-	  <plugin id="org.eclipse.equinox.registry"/>

-	  <plugin id="org.eclipse.equinox.security"/>

-	  <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>

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

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

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

-	  <plugin id="org.sat4j.pb"/>

-	  <plugin id="org.eclipse.equinox.region"/>

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

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

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

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

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

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

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

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

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

-      <plugin id="org.eclipse.gemini.web.tomcat"/>

-      <plugin id="org.eclipse.gemini.web.extender"/>

-      <plugin id="org.eclipse.gemini.web.core"/>

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

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

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

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

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

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

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

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

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

-   </plugins>

-

-   <features>

-   </features>

-   

-   <configurations>

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

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

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

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

-		<plugin id="org.eclipse.virgo.medic" autoStart="true" startLevel="3"/>

-		<plugin id="org.eclipse.virgo.medic.core" autoStart="true" startLevel="3"/>

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

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

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

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

-		<plugin id="org.eclipse.virgo.nano.deployer" autoStart="true" startLevel="5"/>

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

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

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

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

-		<plugin id="org.eclipse.ecf.filetransfer" autoStart="true"/>

-		<plugin id="org.eclipse.ecf.identity" autoStart="true"/>

-		<plugin id="org.eclipse.ecf.provider.filetransfer" autoStart="true"/>

-		<plugin id="org.eclipse.ecf.ssl" autoStart="true"/>

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

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

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

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

-		<plugin id="org.eclipse.equinox.p2.artifact.repository" autoStart="true"/>

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

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

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

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

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

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

- 		<plugin id="org.eclipse.equinox.p2.metadata.repository" autoStart="true"/>

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

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

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

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

- 		<plugin id="org.eclipse.equinox.p2.touchpoint.natives" autoStart="true"/>

- 		<plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-		<property name="osgi.compatibility.bootdelegation" value="false"/>

-		<property name="equinox.use.ds" value="true"/>

-		<property name="osgi.console.enable.builtin" value="false"/>

-		<property name="gosh.args" value="--nointeractive"/>

-		<property name="osgi.console.ssh.useDefaultSecureStorage" value="false"/>

-		<property name="osgi.console.useConfigAdmin" value="true"/>

-		<property name="osgi.parentClassloader" value="fwk"/>

-		<property name="equinox.refresh.duplicate.bsn" value="false"/>

-		<property name="eclipse.bundle.setTCCL" value="false"/>

-		<property name="org.eclipse.virgo.suppress.heap.dumps" value="false"/>

-		<property name="osgi.bundlefile.limit" value="500"/>

-		<property name="osgi.java.profile.bootdelegation" value="override"/>

-		<property name="osgi.compatibility.eagerStart.LazyActivation" value="false"/>

-		<property name="org.eclipse.virgo.medic.log.config.path" value="configuration/serviceability.xml"/>

-		<property name="osgi.context.bootdelegation" value="false"/>

-		<property name="eclipse.enableStateSaver" value="false"/>

-		<property name="osgi.hook.configurators.include" value="org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator"/>

-		<property name="org.eclipse.virgo.kernel.startup.wait.limit" value="180"/>

-	</configurations>

-

-</product>

diff --git a/build-packaging/nano/resources/epl-v10.html b/build-packaging/nano/resources/epl-v10.html
deleted file mode 100644
index eecc800..0000000
--- a/build-packaging/nano/resources/epl-v10.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Public License - Version 1.0</TITLE>
-<STYLE type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </STYLE>
-
-</HEAD><BODY lang="EN-US">
-
-<H2>Eclipse Public License - v 1.0</H2>
-
-<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</P>
-
-<P><B>1. DEFINITIONS</B></P>
-
-<P>"Contribution" means:</P>
-
-<P class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</P>
-<P class="list">b) in the case of each subsequent Contributor:</P>
-<P class="list">i) changes to the Program, and</P>
-<P class="list">ii) additions to the Program;</P>
-<P class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</P>
-
-<P>"Contributor" means any person or entity that distributes
-the Program.</P>
-
-<P>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</P>
-
-<P>"Program" means the Contributions distributed in accordance
-with this Agreement.</P>
-
-<P>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</P>
-
-<P><B>2. GRANT OF RIGHTS</B></P>
-
-<P class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</P>
-
-<P class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</P>
-
-<P class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</P>
-
-<P class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</P>
-
-<P><B>3. REQUIREMENTS</B></P>
-
-<P>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</P>
-
-<P class="list">a) it complies with the terms and conditions of this
-Agreement; and</P>
-
-<P class="list">b) its license agreement:</P>
-
-<P class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</P>
-
-<P class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</P>
-
-<P class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</P>
-
-<P class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</P>
-
-<P>When the Program is made available in source code form:</P>
-
-<P class="list">a) it must be made available under this Agreement; and</P>
-
-<P class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</P>
-
-<P>Contributors may not remove or alter any copyright notices contained
-within the Program.</P>
-
-<P>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</P>
-
-<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
-
-<P>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</P>
-
-<P>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</P>
-
-<P><B>5. NO WARRANTY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</P>
-
-<P><B>6. DISCLAIMER OF LIABILITY</B></P>
-
-<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
-
-<P><B>7. GENERAL</B></P>
-
-<P>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</P>
-
-<P>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</P>
-
-<P>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</P>
-
-<P>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</P>
-
-<P>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</P>
-
-
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/nano/build.gradle b/nano/build.gradle
new file mode 100644
index 0000000..1ef95f1
--- /dev/null
+++ b/nano/build.gradle
@@ -0,0 +1,267 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+apply plugin: 'distribution'
+
+distributions {
+    main {
+        baseName = 'virgo-nano'
+        contents {
+            from { "${buildDir}/common_resources/" }
+            from ( 'src/main/dist' ) {
+                include ( '**/*.properties' )
+                include ( '**/.version' )
+                filter(ReplaceTokens, tokens: tokenMap) // tokens are used in e.g. oev.kernel.userregion.properties
+            }
+            from ( 'src/main/dist' ) {
+                include ( 'bin/*.sh' )
+                fileMode 0755
+            }
+            from ( 'src/main/dist' ) {
+                exclude ( '**/*.properties' )
+                exclude ( '**/.version' )
+                exclude ( 'bin/*.sh' )
+            }
+            from ( "${buildDir}/VN/nano/" ) { exclude ( 'Eclipse.app' ) }
+        }
+    }
+    full {
+        baseName = 'virgo-nano-full'
+        contents {
+            from { 'src/main/dist' }
+            from { "${buildDir}/common_resources/" }
+            from ( 'src/main/dist' ) {
+                include ( '**/*.properties' )
+                include ( '**/.version' )
+                filter(ReplaceTokens, tokens: tokenMap) // tokens are used in e.g. oev.kernel.userregion.properties
+            }
+            from ( 'src/main/dist' ) {
+                include ( 'bin/*.sh' )
+                fileMode 0755
+            }
+            from ( 'src/main/dist' ) {
+                exclude ( '**/*.properties' )
+                exclude ( '**/.version' )
+                exclude ( 'bin/*.sh' )
+            }
+            from ( "${buildDir}/VF/nano-full/" ) { exclude ( 'Eclipse.app' ) }
+        }
+    }
+    rap {
+        baseName = 'virgo-nano-rap'
+        contents {
+            from { "${buildDir}/common_resources/" }
+            from ( 'src/main/dist' ) {
+                include ( '**/*.properties' )
+                include ( '**/.version' )
+                filter(ReplaceTokens, tokens: tokenMap) // tokens are used in e.g. oev.kernel.userregion.properties
+            }
+            from ( 'src/main/dist' ) {
+                include ( 'bin/*.sh' )
+                fileMode 0755
+            }
+            from ( 'src/main/dist' ) {
+                exclude ( '**/*.properties' )
+                exclude ( '**/.version' )
+                exclude ( 'bin/*.sh' )
+            }
+            from ( "${buildDir}/VR/nano-rap/" ) { exclude ( 'Eclipse.app' ) }
+        }
+    }
+}
+
+task ('assembleNano', dependsOn: ['groupInstall',]) {
+    distZip.dependsOn('groupInstall')
+    fullDistZip.dependsOn('groupInstall')
+    rapDistZip.dependsOn('groupInstall')
+}
+
+task ('prepareBundlesAndFeatures') {
+    def assemblyPluginsDir = file("${buildDir}/assembly/plugins/")
+    def srcFeatureDir = file("${projectDir}/publish_resources/features/")
+    def rapBundlesDir = file("${projectDir}/rapbundles/")
+    def assemblyFeatureDir = file("${buildDir}/assembly/features/")
+    doLast {
+        println "Copy the Virgo core runtime artifacts to '${assemblyPluginsDir}' - a p2 repo will be built around them."
+        copy { from configurations.virgoCoreRuntime into assemblyPluginsDir }
+        println "Copy the Virgo Nano runtime artifacts to '${assemblyPluginsDir}' - a p2 repo will be built around them."
+        copy { from configurations.nanoRuntime into assemblyPluginsDir }
+        println "Copy the Virgo enterprise runtime artifacts to '${assemblyPluginsDir}' - a p2 repo will be built around them."
+        copy { from configurations.enterpriseRuntime into assemblyPluginsDir }
+        println "Copy the RAP bundles from '${rapBundlesDir}' into '${assemblyPluginsDir}'."
+        copy { from rapBundlesDir into assemblyPluginsDir }
+
+        println "Copy features from '${srcFeatureDir}' into '${assemblyFeatureDir}'."
+        copy {
+            from srcFeatureDir
+            into assemblyFeatureDir
+            include "**/*"
+            filter(ReplaceTokens, tokens: tokenMap)
+        }
+    }
+}
+
+// start in debug mode with gradle generateP2Inf --debug-jvm
+task ('generateP2Inf', type:JavaExec, dependsOn: ':packaging:fetchUnzippedVirgoBuildTools') {
+    description = "Generates p2.inf-s for all feature directories inside a wrapping 'features' directory."
+    def assemblyFeatureDir = file("${buildDir}/assembly/features/")
+
+    main = 'org.eclipse.equinox.launcher.Main'
+    classpath = files("${virgoBuildToolsDir}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherVersion}.jar")
+    args = [
+        '-application',
+        'org.eclipse.virgo.build.p2tools.instructions.P2InstructionGeneratorApplication',
+        '-source',
+        assemblyFeatureDir
+    ]
+}
+
+// start in debug mode with gradle publishBundlesAndFeatures --debug-jvm
+task ('publishBundlesAndFeatures', type:JavaExec) {
+    description = "Publishes Virgo Server bundles and features to '${buildDir}/repository'."
+    def sourceDir = file("${buildDir}/assembly/")
+    def repositoryDir = file("${buildDir}/repository/")
+
+    main = 'org.eclipse.equinox.launcher.Main'
+    classpath = files("${virgoBuildToolsDir}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherVersion}.jar")
+    args = [
+        '-application',
+        'org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher',
+        '-metadataRepository',
+        "file:${repositoryDir}",
+        '-artifactRepository',
+        "file:${repositoryDir}",
+        '-source',
+        "${sourceDir}",
+        '-append',
+        '-compress',
+        '-publishArtifacts',
+    ]
+    doLast() { println "Published Virgo Server bundles and features to '${buildDir}/repository'." }
+}
+
+// TODO gradle-build remove duplicate method
+def packageConfiguration(configurationName, configuration, target) {
+    println "Copy the ${configurationName} artifacts to '${target}'."
+    configuration.dependencies.each { dep ->
+        if(dep.hasProperty("dependencyProject")) {
+            println "Adding Virgo module dependency: ${dep}"
+        } else {
+            println "Adding other dependency: ${dep}"
+        }
+    }
+    copy { from configuration into target }
+}
+
+task ('packageResourcesAndProducts') {
+    doLast {
+        packageConfiguration('lib', configurations.nanoLib, file("${buildDir}/common_resources/lib/"))
+        packageConfiguration('libPersistence', configurations.nanoLibPersistence, file("${buildDir}/common_resources/lib/persistence/"))
+        packageConfiguration('libEndorsed', configurations.nanoLibEndorsed, file("${buildDir}/common_resources/lib/endorsed/"))
+        packageConfiguration('pickup', configurations.nanoPickup, file("${buildDir}/common_resources/pickup/"))
+    }
+}
+
+// start in debug mode with gradle publish<ID>
+tasks.addRule("Pattern: publish<ID>") { String taskName ->
+    if (taskName.startsWith("publish")) {
+        task (taskName, type:JavaExec, dependsOn: [
+            'prepareBundlesAndFeatures',
+            'generateP2Inf',
+            'publishBundlesAndFeatures',
+            'packageResourcesAndProducts',
+        ]) {
+            def product = 'undefined'
+            switch (taskName.toString() - 'publish') {
+                case 'Base': product = 'base'; break
+                case 'NanoBase': product = 'nano-base'; break
+                case 'Nano': product = 'nano'; break
+                case 'NanoFull': product = 'nano-full'; break
+                case 'NanoRap': product = 'nano-rap'; break
+            }
+            println "Publishing: " + product
+
+            description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
+            def repositoryDir = file("${buildDir}/repository/")
+            def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
+            def javaprofileLocation = file("${projectDir}/src/main/dist/configuration/java6-server.profile")
+
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath = files("${virgoBuildToolsDir}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherVersion}.jar")
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.publisher.ProductPublisher',
+                '-metadataRepository',
+                "file:${repositoryDir}",
+                '-artifactRepository',
+                "file:${repositoryDir}",
+                '-append',
+                '-compress',
+                '-publishArtifacts',
+                '-productFile',
+                "${productFileLocation}",
+                '-jreLocation',
+                "${javaprofileLocation}",
+                '-configs',
+                'ANY.ANY.ANY',
+                '-flavor',
+                'tooling'
+            ]
+            doLast() { println "Published Virgo ${productFileLocation} to '${buildDir}/repository'." }
+        }
+    }
+}
+
+task ('groupPublish', dependsOn: [
+    'publishBase',
+    'publishNanoBase',
+    'publishNano',
+    'publishNanoFull',
+    'publishNanoRap',
+]){ }
+
+// start in debug mode with gradle publish<ID>
+tasks.addRule("Pattern: installProduct<ID>") { String taskName ->
+    if (taskName.startsWith("installProduct")) {
+        // start in debug mode with gradle publishNanoBase --debug-jvm
+        task (taskName, type:JavaExec, dependsOn: ['groupPublish',]) {
+            description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
+            def product = 'undefined'
+            def shortProduct = 'undefined'
+            switch (taskName.toString() - 'installProduct') {
+                case 'Nano': product = 'nano'; shortProduct = "VN"; break;
+                case 'NanoFull': product = 'nano-full'; shortProduct = "VF"; break;
+                case 'NanoRap': product = 'nano-rap'; shortProduct = "VR"; break;
+            }
+            println "Installing: " + product
+
+            def repositoryDir = file("${buildDir}/repository/")
+            def destinationDir = file("${buildDir}/${shortProduct}/${product}")
+            def productIu = "${product}.product"
+
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath = files("${virgoBuildToolsDir}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherVersion}.jar")
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.director',
+                '-repository',
+                "file:${repositoryDir}",
+                '-installIU',
+                "${productIu}",
+                '-tag',
+                'InitialState',
+                '-destination',
+                "${destinationDir}",
+                '-profile',
+                'VIRGOProfile',
+                '-roaming'
+            ]
+            doLast() { println "Installed Virgo '${productIu}' to '${destinationDir}'." }
+        }
+    }
+}
+
+task ('groupInstall', dependsOn: [
+    'installProductNano',
+    'installProductNanoFull',
+    'installProductNanoRap',
+]){ }
diff --git a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/build.xml b/nano/org.eclipse.virgo.nano.smoketest/build.xml
similarity index 83%
rename from build-packaging/nano/org.eclipse.virgo.nano.smoketest/build.xml
rename to nano/org.eclipse.virgo.nano.smoketest/build.xml
index 29d5b45..2d28c77 100644
--- a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/build.xml
+++ b/nano/org.eclipse.virgo.nano.smoketest/build.xml
@@ -3,6 +3,7 @@
 
 	<property file="${basedir}/../../../build.properties"/>
 	<property file="${basedir}/../../../build.versions"/>
+	<property file="${basedir}/../../../build/virgo.properties" />
 	<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
 	<import file="${basedir}/../test-package.xml"/>
 
diff --git a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/ivy.xml b/nano/org.eclipse.virgo.nano.smoketest/ivy.xml
similarity index 100%
rename from build-packaging/nano/org.eclipse.virgo.nano.smoketest/ivy.xml
rename to nano/org.eclipse.virgo.nano.smoketest/ivy.xml
diff --git a/nano/org.eclipse.virgo.nano.smoketest/src/smokeTest/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java b/nano/org.eclipse.virgo.nano.smoketest/src/smokeTest/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java
new file mode 100644
index 0000000..29396d0
--- /dev/null
+++ b/nano/org.eclipse.virgo.nano.smoketest/src/smokeTest/java/org/eclipse/virgo/nano/smoketest/NanoSmokeTests.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *   SAP AG - re-factoring
+ *******************************************************************************/
+
+package org.eclipse.virgo.nano.smoketest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.eclipse.virgo.test.tools.AbstractSmokeTests;
+import org.eclipse.virgo.test.tools.JmxUtils;
+import org.eclipse.virgo.test.tools.ServerUtils;
+import org.eclipse.virgo.test.tools.VirgoServerShutdownThread;
+import org.eclipse.virgo.test.tools.VirgoServerStartupThread;
+import org.eclipse.virgo.util.io.NetUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class NanoSmokeTests extends AbstractSmokeTests {
+
+    private static final String VIRGO_FLAVOR = "nano";
+
+    private static final String JAVA_PROFILE_TESTER_1_0_0_JAR = "java.profile.tester_1.0.0.jar";
+
+    @BeforeClass
+    public static void initJmxConnection() {
+        JmxUtils.virgoHome = ServerUtils.getHome(VIRGO_FLAVOR);
+    }
+
+    @Before
+    public void startServer() throws Exception {
+        // cleanup
+        undeployTestBundles(VIRGO_FLAVOR, JAVA_PROFILE_TESTER_1_0_0_JAR);
+
+        new Thread(new VirgoServerStartupThread(ServerUtils.getBinDir(VIRGO_FLAVOR))).start();
+        JmxUtils.waitForVirgoServerStartFully();
+        Thread.sleep(5000); // wait for startup to complete in case it fails
+
+        assertEquals(JmxUtils.STATUS_STARTED, JmxUtils.getKernelStatus());
+    }
+
+    @After
+    public void shutdownServer() throws Exception {
+        new Thread(new VirgoServerShutdownThread(ServerUtils.getBinDir(VIRGO_FLAVOR))).start();
+        JmxUtils.waitForVirgoServerShutdownFully();
+    }
+
+    @Test
+    public void testNanoStartAndStop() throws Exception {
+        assertEquals(JmxUtils.STATUS_STARTED, JmxUtils.getKernelStatus());
+    }
+
+    @Test
+    public void testNanoJavaProfileSetCorrectly() throws Exception {
+        assertEquals(JmxUtils.STATUS_STARTED, JmxUtils.getKernelStatus());
+
+        // deploy bundle that should kill the server if the test is successful
+        deployTestBundles(VIRGO_FLAVOR, JAVA_PROFILE_TESTER_1_0_0_JAR);
+
+        Thread.sleep(10000); // wait for deployment
+
+        if (NetUtils.isPortAvailable(9875)) {
+            return;
+        }
+
+        // the server is still running - shutdown and fail
+        new Thread(new VirgoServerShutdownThread(ServerUtils.getBinDir(VIRGO_FLAVOR))).start();
+        JmxUtils.waitForVirgoServerShutdownFully();
+        fail("Virgo java profile not properly set - Nano was supposed to be killed if the test was successful.");
+    }
+}
diff --git a/build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/resources/bundles/java.profile.tester_1.0.0.jar b/nano/org.eclipse.virgo.nano.smoketest/src/smokeTest/resources/bundles/java.profile.tester_1.0.0.jar
similarity index 100%
rename from build-packaging/nano/org.eclipse.virgo.nano.smoketest/src/test/resources/bundles/java.profile.tester_1.0.0.jar
rename to nano/org.eclipse.virgo.nano.smoketest/src/smokeTest/resources/bundles/java.profile.tester_1.0.0.jar
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/build.properties b/nano/publish_resources/features/org.eclipse.equinox.httpservice/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/build.properties
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.equinox.httpservice/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html b/nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.properties b/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.properties
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.xml b/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.xml
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/license.html b/nano/publish_resources/features/org.eclipse.equinox.httpservice/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/license.html
rename to nano/publish_resources/features/org.eclipse.equinox.httpservice/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/build.properties b/nano/publish_resources/features/org.eclipse.gemini.web/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/build.properties
rename to nano/publish_resources/features/org.eclipse.gemini.web/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.gemini.web/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.gemini.web/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/epl-v10.html b/nano/publish_resources/features/org.eclipse.gemini.web/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.gemini.web/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/feature.properties b/nano/publish_resources/features/org.eclipse.gemini.web/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/feature.properties
rename to nano/publish_resources/features/org.eclipse.gemini.web/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/feature.xml b/nano/publish_resources/features/org.eclipse.gemini.web/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/feature.xml
rename to nano/publish_resources/features/org.eclipse.gemini.web/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/license.html b/nano/publish_resources/features/org.eclipse.gemini.web/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.gemini.web/license.html
rename to nano/publish_resources/features/org.eclipse.gemini.web/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/build.properties b/nano/publish_resources/features/org.eclipse.jetty/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/build.properties
rename to nano/publish_resources/features/org.eclipse.jetty/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.jetty/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.jetty/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/epl-v10.html b/nano/publish_resources/features/org.eclipse.jetty/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.jetty/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/feature.properties b/nano/publish_resources/features/org.eclipse.jetty/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/feature.properties
rename to nano/publish_resources/features/org.eclipse.jetty/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/feature.xml b/nano/publish_resources/features/org.eclipse.jetty/feature.xml
similarity index 85%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/feature.xml
rename to nano/publish_resources/features/org.eclipse.jetty/feature.xml
index 55cd473..b66669b 100755
--- a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.jetty/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty"
       label="%featureName"
-      version="@JETTY.RAP.VERSION@"
+      version="@JETTY.VERSION@"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -22,49 +22,49 @@
          id="org.eclipse.jetty.continuation"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.http"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.io"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.security"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.server"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.servlet"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
    <plugin
          id="org.eclipse.jetty.util"
          download-size="0"
          install-size="0"
-         version="@JETTY.RAP.VERSION@"
+         version="@JETTY.VERSION@"
          unpack="false"
          autostart="true"/>
 
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.jetty/license.html b/nano/publish_resources/features/org.eclipse.jetty/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.jetty/license.html
rename to nano/publish_resources/features/org.eclipse.jetty/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/build.properties b/nano/publish_resources/features/org.eclipse.rap/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/build.properties
rename to nano/publish_resources/features/org.eclipse.rap/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.rap/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.rap/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/epl-v10.html b/nano/publish_resources/features/org.eclipse.rap/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.rap/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/feature.properties b/nano/publish_resources/features/org.eclipse.rap/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/feature.properties
rename to nano/publish_resources/features/org.eclipse.rap/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/feature.xml b/nano/publish_resources/features/org.eclipse.rap/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/feature.xml
rename to nano/publish_resources/features/org.eclipse.rap/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.rap/license.html b/nano/publish_resources/features/org.eclipse.rap/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.rap/license.html
rename to nano/publish_resources/features/org.eclipse.rap/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/build.properties b/nano/publish_resources/features/org.eclipse.virgo.core/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.core/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.core/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.core/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.core/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.core/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.core/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.core/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.core/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/license.html b/nano/publish_resources/features/org.eclipse.virgo.core/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.core/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.core/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/build.properties b/nano/publish_resources/features/org.eclipse.virgo.ds/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.ds/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.ds/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.ds/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.ds/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.ds/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.ds/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.ds/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.ds/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.ds/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/license.html b/nano/publish_resources/features/org.eclipse.virgo.ds/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.ds/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.ds/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.derby/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.jsf/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.openejb/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.persistence/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise.xbean/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/build.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.properties
diff --git a/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
new file mode 100755
index 0000000..c4397ea
--- /dev/null
+++ b/nano/publish_resources/features/org.eclipse.virgo.enterprise/feature.xml
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/license.html b/nano/publish_resources/features/org.eclipse.virgo.enterprise/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.enterprise/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.enterprise/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/build.properties b/nano/publish_resources/features/org.eclipse.virgo.medic/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.medic/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.medic/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.medic/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.medic/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.medic/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.medic/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.medic/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.medic/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/license.html b/nano/publish_resources/features/org.eclipse.virgo.medic/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.medic/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.medic/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/build.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
similarity index 83%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
index 7ba515b..13b0558 100755
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/feature.xml
@@ -23,6 +23,13 @@
    </requires>
 
     <plugin
+    id="org.eclipse.equinox.event"
+    download-size="0"
+    install-size="0"
+    version="@EQUINOX.EVENT@"
+    unpack="false"/>
+
+    <plugin
          id="org.eclipse.virgo.nano.deployer"
          download-size="0"
          install-size="0"
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/license.html b/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.deployer/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.deployer/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/build.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/license.html b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans.controller/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/build.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
similarity index 81%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
index c6ac246..02da194 100755
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -18,6 +18,13 @@
       %license
    </license>
 
+    <plugin
+    id="org.eclipse.virgo.util.jmx"
+    download-size="0"
+    install-size="0"
+    version="@UTIL.VERSION@"
+    unpack="false"/>
+    
    <plugin
          id="org.eclipse.virgo.nano.management"
          download-size="0"
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/license.html b/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.mbeans/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/build.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/license.html b/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.nano.war.deployer/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/build.properties b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml
similarity index 99%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml
index 50bf47a..4ad9f00 100755
--- a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml
+++ b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/feature.xml
@@ -45,7 +45,7 @@
          version="@CORE.VERSION@"
          unpack="false"
          autostart="true"/>
-    
+
     <plugin
     id="org.eclipse.core.net"
     download-size="0"
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/license.html b/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.p2.provisioning/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/build.properties b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/license.html b/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.concurrent/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.services.concurrent/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/build.properties b/nano/publish_resources/features/org.eclipse.virgo.services.ds/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.services.ds/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/license.html b/nano/publish_resources/features/org.eclipse.virgo.services.ds/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.services.ds/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.services.ds/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/build.properties b/nano/publish_resources/features/org.eclipse.virgo.shell/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.shell/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.shell/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.shell/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.shell/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.shell/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.shell/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.shell/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.shell/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.shell/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/license.html b/nano/publish_resources/features/org.eclipse.virgo.shell/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.shell/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.shell/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/build.properties b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/license.html b/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.simpleconfigurator/license.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/build.properties b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/build.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/build.properties
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/build.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
Binary files differ
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/epl-v10.html b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/epl-v10.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/epl-v10.html
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/epl-v10.html
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.properties b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.properties
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.properties
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.properties
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/feature.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/license.html b/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/license.html
similarity index 100%
rename from build-packaging/nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/license.html
rename to nano/publish_resources/features/org.eclipse.virgo.webconsole.deps/license.html
diff --git a/build-packaging/nano/publish_resources/products/base/base.product b/nano/publish_resources/products/base/base.product
similarity index 98%
rename from build-packaging/nano/publish_resources/products/base/base.product
rename to nano/publish_resources/products/base/base.product
index 0e87a0b..25726df 100755
--- a/build-packaging/nano/publish_resources/products/base/base.product
+++ b/nano/publish_resources/products/base/base.product
@@ -18,7 +18,9 @@
       <feature id="org.eclipse.virgo.shell" version="0.0.0"/>

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

       <feature id="org.eclipse.virgo.nano.mbeans" version="0.0.0"/>

+      <!-- Added via dist?

 	  <feature id="org.eclipse.virgo.nano.common.resources" version="0.0.0"/>

+	  -->

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

    </features>

    

@@ -53,7 +55,9 @@
 		<property name="org.eclipse.virgo.medic.log.config.path" value="configuration/serviceability.xml"/>

 		<property name="osgi.context.bootdelegation" value="false"/>

 		<property name="eclipse.enableStateSaver" value="false"/>

+		<!--

 		<property name="osgi.hook.configurators.include" value="org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator"/>

+		-->

 		<property name="org.eclipse.virgo.kernel.startup.wait.limit" value="180"/>

 		<property name="gosh.home" value="configuration"/>

 	</configurations>

diff --git a/build-packaging/nano/publish_resources/products/nano-base/nano-base.product b/nano/publish_resources/products/nano-base/nano-base.product
similarity index 82%
rename from build-packaging/nano/publish_resources/products/nano-base/nano-base.product
rename to nano/publish_resources/products/nano-base/nano-base.product
index 6294c0a..42f0ec1 100755
--- a/build-packaging/nano/publish_resources/products/nano-base/nano-base.product
+++ b/nano/publish_resources/products/nano-base/nano-base.product
@@ -13,19 +13,23 @@
    </plugins>

 

    <features>

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

-	  <feature id="org.eclipse.virgo.services.ds" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.services.concurrent" version="0.0.0"/>

 	  <feature id="org.eclipse.virgo.nano.deployer" version="0.0.0"/>

+	<feature id="org.eclipse.virgo.nano.mbeans.controller" version="0.0.0"/>

+<!--

 	  <feature id="org.eclipse.virgo.nano.specific.resources" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.nano.mbeans.controller" version="0.0.0"/>

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

+-->

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

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

 	  <feature id="org.eclipse.virgo.webconsole.deps" version="0.0.0"/>

    </features>

    

    <configurations>

       <plugin id="org.jolokia.osgi" autoStart="true" />

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

-   	  

+   	  <plugin id="org.eclipse.equinox.http" autoStart="true" />

+

+	  <plugin id="org.eclipse.virgo.nano.core" autoStart="true" startLevel="4"/>

 	  <plugin id="org.eclipse.virgo.nano.deployer" autoStart="true" startLevel="5"/>

 	  <property name="org.eclipse.virgo.fschecker.initialEventMode" value="bulk"/>

    </configurations>	

diff --git a/build-packaging/nano/publish_resources/products/nano-base/p2.inf b/nano/publish_resources/products/nano-base/p2.inf
similarity index 100%
rename from build-packaging/nano/publish_resources/products/nano-base/p2.inf
rename to nano/publish_resources/products/nano-base/p2.inf
diff --git a/build-packaging/nano/publish_resources/products/nano-full/nano-full.product b/nano/publish_resources/products/nano-full/nano-full.product
similarity index 99%
rename from build-packaging/nano/publish_resources/products/nano-full/nano-full.product
rename to nano/publish_resources/products/nano-full/nano-full.product
index 6cd3c54..3da9490 100755
--- a/build-packaging/nano/publish_resources/products/nano-full/nano-full.product
+++ b/nano/publish_resources/products/nano-full/nano-full.product
@@ -13,7 +13,9 @@
    </plugins>

 

    <features>

+<!--

    	  <feature id="org.eclipse.virgo.nano.enterprise.resources" version="0.0.0"/>

+-->

 	  <feature id="org.eclipse.virgo.p2.provisioning" version="0.0.0"/>

 	  <feature id="org.eclipse.gemini.web" version="0.0.0"/>

 	  <feature id="org.eclipse.virgo.nano.war.deployer" version="0.0.0"/>

diff --git a/build-packaging/nano/publish_resources/products/nano-full/p2.inf b/nano/publish_resources/products/nano-full/p2.inf
similarity index 100%
rename from build-packaging/nano/publish_resources/products/nano-full/p2.inf
rename to nano/publish_resources/products/nano-full/p2.inf
diff --git a/build-packaging/nano/publish_resources/products/nano-rap/nano-rap.product b/nano/publish_resources/products/nano-rap/nano-rap.product
similarity index 78%
rename from build-packaging/nano/publish_resources/products/nano-rap/nano-rap.product
rename to nano/publish_resources/products/nano-rap/nano-rap.product
index fd5ca24..316b072 100755
--- a/build-packaging/nano/publish_resources/products/nano-rap/nano-rap.product
+++ b/nano/publish_resources/products/nano-rap/nano-rap.product
@@ -13,23 +13,29 @@
    </plugins>

 

    <features>

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

-	  <feature id="org.eclipse.virgo.services.ds" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.services.concurrent" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.nano.deployer" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.nano.specific.resources" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.nano.mbeans.controller" version="0.0.0"/>

-	  <feature id="org.eclipse.virgo.webconsole.deps" version="0.0.0"/>

+	  <feature id="org.eclipse.equinox.httpservice" version="0.0.0"/>

 	  <feature id="org.eclipse.jetty" version="0.0.0"/>

 	  <feature id="org.eclipse.rap" version="0.0.0"/>

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

+	  <feature id="org.eclipse.virgo.nano.mbeans.controller" version="0.0.0"/>

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

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

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

    </features>

+   

+   <configurations>

+	  <property name="org.osgi.service.http.port" value="8080"/>

+   </configurations>

 

    <configurations>

-      <plugin id="org.jolokia.osgi" autoStart="true" />

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

+   	  <plugin id="org.eclipse.equinox.http" autoStart="true" />

+	  <plugin id="org.eclipse.virgo.nano.core" autoStart="true" startLevel="4"/>

+	  <plugin id="org.eclipse.virgo.nano.deployer" autoStart="true" startLevel="5"/>

+      <plugin id="org.jolokia.osgi" autoStart="true" />

+

 	  <property name="org.osgi.service.http.port" value="8080"/>

 

-	  <plugin id="org.eclipse.virgo.nano.deployer" autoStart="true" startLevel="5"/>

 	  <property name="org.eclipse.virgo.fschecker.initialEventMode" value="bulk"/>

    </configurations>	

 

diff --git a/build-packaging/nano/publish_resources/products/nano-rap/p2.inf b/nano/publish_resources/products/nano-rap/p2.inf
similarity index 100%
rename from build-packaging/nano/publish_resources/products/nano-rap/p2.inf
rename to nano/publish_resources/products/nano-rap/p2.inf
diff --git a/build-packaging/nano/publish_resources/products/nano/nano.product b/nano/publish_resources/products/nano/nano.product
similarity index 100%
rename from build-packaging/nano/publish_resources/products/nano/nano.product
rename to nano/publish_resources/products/nano/nano.product
diff --git a/build-packaging/nano/publish_resources/products/nano/p2.inf b/nano/publish_resources/products/nano/p2.inf
similarity index 100%
rename from build-packaging/nano/publish_resources/products/nano/p2.inf
rename to nano/publish_resources/products/nano/p2.inf
diff --git a/build-packaging/nano/rapbundles/com.ibm.icu.base_52.1.0.v201404171520.jar b/nano/rapbundles/com.ibm.icu.base_52.1.0.v201404171520.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/com.ibm.icu.base_52.1.0.v201404171520.jar
rename to nano/rapbundles/com.ibm.icu.base_52.1.0.v201404171520.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.commands_3.6.100.v20140424-2344.jar b/nano/rapbundles/org.eclipse.core.commands_3.6.100.v20140424-2344.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.commands_3.6.100.v20140424-2344.jar
rename to nano/rapbundles/org.eclipse.core.commands_3.6.100.v20140424-2344.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.databinding.beans_1.2.200.v20140214-0004.jar b/nano/rapbundles/org.eclipse.core.databinding.beans_1.2.200.v20140214-0004.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.databinding.beans_1.2.200.v20140214-0004.jar
rename to nano/rapbundles/org.eclipse.core.databinding.beans_1.2.200.v20140214-0004.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.databinding.observable_1.4.1.v20140210-1835.jar b/nano/rapbundles/org.eclipse.core.databinding.observable_1.4.1.v20140210-1835.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.databinding.observable_1.4.1.v20140210-1835.jar
rename to nano/rapbundles/org.eclipse.core.databinding.observable_1.4.1.v20140210-1835.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.databinding.property_1.4.200.v20140214-0004.jar b/nano/rapbundles/org.eclipse.core.databinding.property_1.4.200.v20140214-0004.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.databinding.property_1.4.200.v20140214-0004.jar
rename to nano/rapbundles/org.eclipse.core.databinding.property_1.4.200.v20140214-0004.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.databinding_1.4.1.v20140214-0004.jar b/nano/rapbundles/org.eclipse.core.databinding_1.4.1.v20140214-0004.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.databinding_1.4.1.v20140214-0004.jar
rename to nano/rapbundles/org.eclipse.core.databinding_1.4.1.v20140214-0004.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar b/nano/rapbundles/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
rename to nano/rapbundles/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.equinox.event_1.3.100.v20140115-1647.jar b/nano/rapbundles/org.eclipse.equinox.event_1.3.100.v20140115-1647.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.equinox.event_1.3.100.v20140115-1647.jar
rename to nano/rapbundles/org.eclipse.equinox.event_1.3.100.v20140115-1647.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.equinox.http.jetty_3.0.200.v20131021-1843.jar b/nano/rapbundles/org.eclipse.equinox.http.jetty_3.0.200.v20131021-1843.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.equinox.http.jetty_3.0.200.v20131021-1843.jar
rename to nano/rapbundles/org.eclipse.equinox.http.jetty_3.0.200.v20131021-1843.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.equinox.http.servlet_1.1.500.v20140318-1755.jar b/nano/rapbundles/org.eclipse.equinox.http.servlet_1.1.500.v20140318-1755.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.equinox.http.servlet_1.1.500.v20140318-1755.jar
rename to nano/rapbundles/org.eclipse.equinox.http.servlet_1.1.500.v20140318-1755.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.continuation_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.continuation_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.continuation_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.continuation_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.http_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.http_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.http_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.http_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.io_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.io_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.io_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.io_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.security_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.security_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.security_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.security_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.server_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.server_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.server_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.server_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.servlet_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.servlet_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.servlet_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.servlet_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.jetty.util_8.1.14.v20131031.jar b/nano/rapbundles/org.eclipse.jetty.util_8.1.14.v20131031.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.jetty.util_8.1.14.v20131031.jar
rename to nano/rapbundles/org.eclipse.jetty.util_8.1.14.v20131031.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.rap.jface.databinding_2.3.0.20131210-1030.jar b/nano/rapbundles/org.eclipse.rap.jface.databinding_2.3.0.20131210-1030.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.rap.jface.databinding_2.3.0.20131210-1030.jar
rename to nano/rapbundles/org.eclipse.rap.jface.databinding_2.3.0.20131210-1030.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.rap.jface_2.3.0.20140306-1341.jar b/nano/rapbundles/org.eclipse.rap.jface_2.3.0.20140306-1341.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.rap.jface_2.3.0.20140306-1341.jar
rename to nano/rapbundles/org.eclipse.rap.jface_2.3.0.20140306-1341.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.rap.rwt.osgi_2.3.0.20140124-1321.jar b/nano/rapbundles/org.eclipse.rap.rwt.osgi_2.3.0.20140124-1321.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.rap.rwt.osgi_2.3.0.20140124-1321.jar
rename to nano/rapbundles/org.eclipse.rap.rwt.osgi_2.3.0.20140124-1321.jar
Binary files differ
diff --git a/build-packaging/nano/rapbundles/org.eclipse.rap.rwt_2.3.0.20140610-0925.jar b/nano/rapbundles/org.eclipse.rap.rwt_2.3.0.20140610-0925.jar
similarity index 100%
rename from build-packaging/nano/rapbundles/org.eclipse.rap.rwt_2.3.0.20140610-0925.jar
rename to nano/rapbundles/org.eclipse.rap.rwt_2.3.0.20140610-0925.jar
Binary files differ
diff --git a/build-packaging/nano/abouts/AboutNanoWeb.html b/nano/src/full/dist/AboutNanoWeb.html
similarity index 100%
rename from build-packaging/nano/abouts/AboutNanoWeb.html
rename to nano/src/full/dist/AboutNanoWeb.html
diff --git a/build-packaging/nano/enterprise_resources/context.xml b/nano/src/full/dist/configuration/context.xml
similarity index 100%
rename from build-packaging/nano/enterprise_resources/context.xml
rename to nano/src/full/dist/configuration/context.xml
diff --git a/build-packaging/nano/enterprise_resources/openejb.xml b/nano/src/full/dist/configuration/openejb.xml
similarity index 100%
rename from build-packaging/nano/enterprise_resources/openejb.xml
rename to nano/src/full/dist/configuration/openejb.xml
diff --git a/build-packaging/nano/enterprise_resources/tomcat-server.xml b/nano/src/full/dist/configuration/tomcat-server.xml
similarity index 100%
rename from build-packaging/nano/enterprise_resources/tomcat-server.xml
rename to nano/src/full/dist/configuration/tomcat-server.xml
diff --git a/build-packaging/nano/resources/AboutNano.html b/nano/src/main/dist/AboutNano.html
similarity index 100%
rename from build-packaging/nano/resources/AboutNano.html
rename to nano/src/main/dist/AboutNano.html
diff --git a/build-packaging/nano/resources/about_files/LICENSE-AspectJ.html b/nano/src/main/dist/about_files/LICENSE-AspectJ.html
similarity index 100%
rename from build-packaging/nano/resources/about_files/LICENSE-AspectJ.html
rename to nano/src/main/dist/about_files/LICENSE-AspectJ.html
diff --git a/build-packaging/nano/resources/about_files/apache-v20.txt b/nano/src/main/dist/about_files/apache-v20.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/apache-v20.txt
rename to nano/src/main/dist/about_files/apache-v20.txt
diff --git a/build-packaging/nano/resources/about_files/asm.txt b/nano/src/main/dist/about_files/asm.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/asm.txt
rename to nano/src/main/dist/about_files/asm.txt
diff --git a/build-packaging/nano/resources/about_files/cddl-10.txt b/nano/src/main/dist/about_files/cddl-10.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/cddl-10.txt
rename to nano/src/main/dist/about_files/cddl-10.txt
diff --git a/build-packaging/nano/resources/about_files/cpl-10.txt b/nano/src/main/dist/about_files/cpl-10.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/cpl-10.txt
rename to nano/src/main/dist/about_files/cpl-10.txt
diff --git a/build-packaging/nano/resources/about_files/mpl-1.1.txt b/nano/src/main/dist/about_files/mpl-1.1.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/mpl-1.1.txt
rename to nano/src/main/dist/about_files/mpl-1.1.txt
diff --git a/build-packaging/nano/resources/about_files/new-bsd.txt b/nano/src/main/dist/about_files/new-bsd.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/new-bsd.txt
rename to nano/src/main/dist/about_files/new-bsd.txt
diff --git a/build-packaging/nano/resources/about_files/slf4j.txt b/nano/src/main/dist/about_files/slf4j.txt
similarity index 100%
rename from build-packaging/nano/resources/about_files/slf4j.txt
rename to nano/src/main/dist/about_files/slf4j.txt
diff --git a/build-packaging/nano/configuration/etc/gosh_profile b/nano/src/main/dist/configuration/etc/gosh_profile
similarity index 100%
rename from build-packaging/nano/configuration/etc/gosh_profile
rename to nano/src/main/dist/configuration/etc/gosh_profile
diff --git a/build-packaging/nano/configuration/java6-server.profile b/nano/src/main/dist/configuration/java6-server.profile
similarity index 100%
rename from build-packaging/nano/configuration/java6-server.profile
rename to nano/src/main/dist/configuration/java6-server.profile
diff --git a/build-packaging/nano/configuration/keystore b/nano/src/main/dist/configuration/keystore
similarity index 100%
rename from build-packaging/nano/configuration/keystore
rename to nano/src/main/dist/configuration/keystore
Binary files differ
diff --git a/build-packaging/nano/configuration/org.eclipse.virgo.kernel.authentication.config b/nano/src/main/dist/configuration/org.eclipse.virgo.kernel.authentication.config
similarity index 100%
rename from build-packaging/nano/configuration/org.eclipse.virgo.kernel.authentication.config
rename to nano/src/main/dist/configuration/org.eclipse.virgo.kernel.authentication.config
diff --git a/build-packaging/nano/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties b/nano/src/main/dist/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties
similarity index 100%
rename from build-packaging/nano/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties
rename to nano/src/main/dist/configuration/org.eclipse.virgo.kernel.jmxremote.access.properties
diff --git a/build-packaging/nano/configuration/org.eclipse.virgo.kernel.properties b/nano/src/main/dist/configuration/org.eclipse.virgo.kernel.properties
similarity index 100%
rename from build-packaging/nano/configuration/org.eclipse.virgo.kernel.properties
rename to nano/src/main/dist/configuration/org.eclipse.virgo.kernel.properties
diff --git a/build-packaging/nano/configuration/org.eclipse.virgo.kernel.users.properties b/nano/src/main/dist/configuration/org.eclipse.virgo.kernel.users.properties
similarity index 100%
rename from build-packaging/nano/configuration/org.eclipse.virgo.kernel.users.properties
rename to nano/src/main/dist/configuration/org.eclipse.virgo.kernel.users.properties
diff --git a/build-packaging/nano/configuration/org.eclipse.virgo.medic.properties b/nano/src/main/dist/configuration/org.eclipse.virgo.medic.properties
similarity index 100%
rename from build-packaging/nano/configuration/org.eclipse.virgo.medic.properties
rename to nano/src/main/dist/configuration/org.eclipse.virgo.medic.properties
diff --git a/build-packaging/nano/configuration/osgi.console.properties b/nano/src/main/dist/configuration/osgi.console.properties
similarity index 100%
rename from build-packaging/nano/configuration/osgi.console.properties
rename to nano/src/main/dist/configuration/osgi.console.properties
diff --git a/build-packaging/nano/configuration/serviceability.xml b/nano/src/main/dist/configuration/serviceability.xml
similarity index 100%
rename from build-packaging/nano/configuration/serviceability.xml
rename to nano/src/main/dist/configuration/serviceability.xml
diff --git a/build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html b/nano/src/main/dist/epl-v10.html
old mode 100755
new mode 100644
similarity index 100%
copy from build-packaging/nano/publish_resources/features/org.eclipse.equinox.httpservice/epl-v10.html
copy to nano/src/main/dist/epl-v10.html
diff --git a/nano/src/main/dist/lib/.version b/nano/src/main/dist/lib/.version
new file mode 100644
index 0000000..46d3a96
--- /dev/null
+++ b/nano/src/main/dist/lib/.version
@@ -0,0 +1 @@
+virgo.nano.version=@VIRGO.VERSION@
diff --git a/build-packaging/nano/resources/notice.html b/nano/src/main/dist/notice.html
similarity index 100%
rename from build-packaging/nano/resources/notice.html
rename to nano/src/main/dist/notice.html