Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2011-12-20 16:16:49 -0500
committerBorislav Kapukaranov2011-12-20 16:16:49 -0500
commit059c3090bc61116db703470e30b37c107d2463a1 (patch)
treeb5deef44e65716b926ae158c3937660808306357
parent006e113f9ec35c00be0ea65aac1742cdc29b6261 (diff)
downloadorg.eclipse.virgo.kernel-059c3090bc61116db703470e30b37c107d2463a1.tar.gz
org.eclipse.virgo.kernel-059c3090bc61116db703470e30b37c107d2463a1.tar.xz
org.eclipse.virgo.kernel-059c3090bc61116db703470e30b37c107d2463a1.zip
364571 - adopt publishing with virgo-build-tools and configure the start up to be compatible with the scripts from the Nano branch
-rw-r--r--build-kernel/bin/checkJava.bat17
-rwxr-xr-xbuild-kernel/bin/checkJava.sh20
-rw-r--r--build-kernel/bin/dmk.bat275
-rwxr-xr-xbuild-kernel/bin/dmk.sh279
-rw-r--r--build-kernel/bin/jconsole.bat54
-rwxr-xr-xbuild-kernel/bin/jconsole.sh53
-rw-r--r--build-kernel/bin/jmxPermissions.vbs81
-rw-r--r--build-kernel/bin/setupClasspath.bat27
-rwxr-xr-xbuild-kernel/bin/setupClasspath.sh26
-rw-r--r--build-kernel/bin/setupVars.bat31
-rw-r--r--build-kernel/bin/shutdown.bat8
-rwxr-xr-xbuild-kernel/bin/shutdown.sh29
-rw-r--r--build-kernel/bin/startup.bat8
-rwxr-xr-xbuild-kernel/bin/startup.sh29
-rw-r--r--build-kernel/build.xml278
-rw-r--r--build-kernel/config/keystorebin1206 -> 0 bytes
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.authentication.config6
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.jmxremote.access.properties1
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.properties6
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.userregion.properties20
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.users.properties10
-rw-r--r--build-kernel/config/org.eclipse.virgo.medic.properties7
-rw-r--r--build-kernel/config/serviceability.xml79
-rw-r--r--build-kernel/distro_resources/META-INF/MANIFEST.MF6
-rw-r--r--build-kernel/distro_resources/META-INF/p2.inf14
-rw-r--r--build-kernel/kernel-ivy.xml14
-rw-r--r--build-kernel/lib-ivy.xml7
-rw-r--r--build-kernel/lib/org.eclipse.virgo.kernel.launch.properties76
-rw-r--r--build-kernel/org.eclipse.virgo.kernel.lib.kernel.product101
-rw-r--r--build-kernel/org.eclipse.virgo.kernel.lib.product96
-rw-r--r--build-kernel/org.eclipse.virgo.kernel.product97
-rw-r--r--build-kernel/org.eclipse.virgo.kernel.repository.ext.product48
-rw-r--r--build-kernel/p2.inf13
-rw-r--r--build-kernel/publish_resources/categories/org.eclipse.virgo.categories/.project11
-rw-r--r--build-kernel/publish_resources/categories/org.eclipse.virgo.categories/category.xml6
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.equinox.regions/.project17
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.equinox.regions/build.properties4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.equinox.regions/eclipse_update_120.jpgbin0 -> 21695 bytes
-rwxr-xr-x[-rw-r--r--]build-kernel/publish_resources/features/org.eclipse.equinox.regions/epl-v10.html (renamed from build-kernel/resources/epl-v10.html)0
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.properties189
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.xml28
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.equinox.regions/p2.inf31
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/.project17
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/build.properties4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpgbin0 -> 21695 bytes
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html258
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties189
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml27
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/.project17
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/build.properties4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpgbin0 -> 21695 bytes
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/epl-v10.html258
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.properties189
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml34
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel/.project17
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel/build.properties4
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel/eclipse_update_120.jpgbin0 -> 21695 bytes
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel/epl-v10.html258
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.properties189
-rwxr-xr-xbuild-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml87
-rw-r--r--build-kernel/publish_resources/features/org.eclipse.virgo.kernel/p2.inf279
-rwxr-xr-xbuild-kernel/publish_resources/products/kernel/kernel.product31
-rw-r--r--build-kernel/publish_resources/products/kernel/p2.inf18
-rw-r--r--build-kernel/resources/About.html105
-rw-r--r--build-kernel/resources/about_files/LICENSE-AspectJ.html91
-rw-r--r--build-kernel/resources/about_files/apache-v20.txt202
-rw-r--r--build-kernel/resources/about_files/asm.txt29
-rw-r--r--build-kernel/resources/about_files/slf4j.txt20
-rw-r--r--build-kernel/resources/notice.html104
-rw-r--r--build.versions3
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile (renamed from build-kernel/lib/java6-server.profile)0
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile207
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java14
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/src/main/resources/OSGI-INF/userregionfactory.xml25
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/template.mf2
79 files changed, 2540 insertions, 2252 deletions
diff --git a/build-kernel/bin/checkJava.bat b/build-kernel/bin/checkJava.bat
deleted file mode 100644
index 316486be..00000000
--- a/build-kernel/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.osgi.launcher.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-kernel/bin/checkJava.sh b/build-kernel/bin/checkJava.sh
deleted file mode 100755
index 9bf9ca1e..00000000
--- a/build-kernel/bin/checkJava.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-
-#
-# make adjustment when running under cygwin
-#
-if $cygwin; then
- CLASSPATH=$(cygpath -wp $CLASSPATH)
-fi
-
-# Run java version check with the discovered java jvm.
-$JAVA_HOME/bin/java \
- -classpath $CLASSPATH \
- org.eclipse.virgo.osgi.launcher.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-kernel/bin/dmk.bat b/build-kernel/bin/dmk.bat
deleted file mode 100644
index f9e1a55f..00000000
--- a/build-kernel/bin/dmk.bat
+++ /dev/null
@@ -1,275 +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%\config
- 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% -Fosgi.clean=true
- )
-
- 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%"
-
- 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% -Dorg.eclipse.equinox.console.jaas.file="%CONFIG_DIR%/store"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.virgo.osgi.launcher.Launcher
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -config "%KERNEL_HOME%\lib\org.eclipse.virgo.kernel.launch.properties"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Forg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Forg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Fosgi.configuration.area="%KERNEL_HOME%\work\osgi\configuration"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Fosgi.java.profile="file:%KERNEL_HOME%\lib\java6-server.profile"
- 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%\config
- if not defined TRUSTSTORE_PATH set TRUSTSTORE_PATH=%KERNEL_HOME%\config\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.kernel.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-kernel/bin/dmk.sh b/build-kernel/bin/dmk.sh
deleted file mode 100755
index e3493208..00000000
--- a/build-kernel/bin/dmk.sh
+++ /dev/null
@@ -1,279 +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/config
- 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 -Fosgi.clean=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_PROPS=$KERNEL_HOME/lib/org.eclipse.virgo.kernel.launch.properties
- CONFIG_AREA=$KERNEL_HOME/work/osgi/configuration
- JAVA_PROFILE=$KERNEL_HOME/lib/java6-server.profile
-
- if $cygwin; then
- ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
- AUTH_LOGIN=$(cygpath -wp $AUTH_LOGIN)
- AUTH_FILE=$(cygpath -wp $AUTH_FILE)
- CONFIG_PROPS=$(cygpath -wp $CONFIG_PROPS)
- 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 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
-
- cd $KERNEL_HOME; exec $JAVA_HOME/bin/java \
- $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.equinox.console.jaas.file="$CONFIG_DIR/store" \
- -Dssh.server.keystore="$CONFIG_DIR/hostkey.ser" \
- -classpath $CLASSPATH \
- org.eclipse.virgo.osgi.launcher.Launcher \
- -config $CONFIG_PROPS \
- -Forg.eclipse.virgo.kernel.home=$KERNEL_HOME \
- -Forg.eclipse.virgo.kernel.config=$CONFIG_DIR \
- -Fosgi.configuration.area=$CONFIG_AREA \
- -Fosgi.java.profile="file:$JAVA_PROFILE" \
- $LAUNCH_OPTS \
- $ADDITIONAL_ARGS
- fi
-elif [ "$COMMAND" = "stop" ]
-then
-
- CONFIG_DIR=$KERNEL_HOME/config
-
- #parse args for the script
- if [ -z "$TRUSTSTORE_PATH" ]
- then
- TRUSTSTORE_PATH=$KERNEL_HOME/config/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_HOME/bin/java $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.kernel.shutdown.ShutdownClient $OTHER_ARGS
-
-else
- echo "Unknown command: ${COMMAND}"
-fi
-
diff --git a/build-kernel/bin/jconsole.bat b/build-kernel/bin/jconsole.bat
deleted file mode 100644
index 27fd0219..00000000
--- a/build-kernel/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%\config\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-kernel/bin/jconsole.sh b/build-kernel/bin/jconsole.sh
deleted file mode 100755
index 34f864b7..00000000
--- a/build-kernel/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/config/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-kernel/bin/jmxPermissions.vbs b/build-kernel/bin/jmxPermissions.vbs
deleted file mode 100644
index 01846072..00000000
--- a/build-kernel/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-kernel/bin/setupClasspath.bat b/build-kernel/bin/setupClasspath.bat
deleted file mode 100644
index da833b91..00000000
--- a/build-kernel/bin/setupClasspath.bat
+++ /dev/null
@@ -1,27 +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"
-
-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%
-exit /B 0
-
-:AppendToClasspath
- set CLASSPATH=%CLASSPATH%;%~1
- goto :eof
diff --git a/build-kernel/bin/setupClasspath.sh b/build-kernel/bin/setupClasspath.sh
deleted file mode 100755
index 3398df9e..00000000
--- a/build-kernel/bin/setupClasspath.sh
+++ /dev/null
@@ -1,26 +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
- exit 1
-fi
-
-CLASSPATH=
-
-# 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##*/}
- fi
-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-kernel/bin/setupVars.bat b/build-kernel/bin/setupVars.bat
deleted file mode 100644
index 55ff31dc..00000000
--- a/build-kernel/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=%%~dpfsI
-
-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-kernel/bin/shutdown.bat b/build-kernel/bin/shutdown.bat
deleted file mode 100644
index a2a1ff47..00000000
--- a/build-kernel/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-kernel/bin/shutdown.sh b/build-kernel/bin/shutdown.sh
deleted file mode 100755
index 7f36fbe7..00000000
--- a/build-kernel/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-kernel/bin/startup.bat b/build-kernel/bin/startup.bat
deleted file mode 100644
index 76e1618f..00000000
--- a/build-kernel/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-kernel/bin/startup.sh b/build-kernel/bin/startup.sh
deleted file mode 100755
index b7d194e3..00000000
--- a/build-kernel/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-kernel/build.xml b/build-kernel/build.xml
index 776f47b6..6832747c 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -2,8 +2,6 @@
<project name="build-kernel" xmlns:ivy="antlib:org.apache.ivy.ant">
<path id="unit.test.bundles">
- <pathelement location="../org.eclipse.virgo.kernel.shutdown"/>
- <pathelement location="../org.eclipse.virgo.kernel.authentication"/>
<pathelement location="../org.eclipse.virgo.kernel.core"/>
<pathelement location="../org.eclipse.virgo.kernel.artifact"/>
<pathelement location="../org.eclipse.virgo.kernel.services"/>
@@ -44,65 +42,65 @@
<target name="precommit" depends="clean, clean-integration, test, findbugs, package, smoke-test"
description="Performs a CI server-like build, should be run prior to performing a Git push"/>
+
+ <target name="fetch-nano">
+ <mkdir dir="${target.dir}"/>
+
+ <condition property="dependancy.folder" value="milestone" else="${adjusted.release.type}">
+ <or>
+ <contains string="${org.eclipse.virgo.kernel}" substring=".M"/>
+ <contains string="${org.eclipse.virgo.kernel}" substring=".RC"/>
+ </or>
+ </condition>
+
+ <condition property="dependancy.folder" value="release" else="${adjusted.release.type}">
+ <contains string="${org.eclipse.virgo.kernel}" substring=".RELEASE"/>
+ </condition>
+
+ <get src="http://build.eclipse.org/rt/virgo/zips/${dependancy.folder}/VN/${org.eclipse.virgo.nano}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"
+ dest="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"
+ usetimestamp="true" />
- <target name="package" depends="ivy.init">
+ <echo message="Fetched the Nano zip to ${target.dir}/virgo-kernel-${org.eclipse.virgo.kernel}.zip"/>
+ </target>
+
+ <target name="package" depends="ivy.init, fetch-nano">
<delete dir="${package.output.dir}" quiet="true"/>
<mkdir dir="${package.output.dir}"/>
+
+ <unzip src="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" dest="${p2.repository.dir}">
+ <globmapper from="virgo-nano-updatesite-${org.eclipse.virgo.nano}/*" to="*"/>
+ </unzip>
+ <delete file="${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip" quiet="true"/>
+ <echo message="Fetched the Nano update site zip to ${target.dir}/virgo-nano-updatesite-${org.eclipse.virgo.nano}.zip"/>
+
+ <!-- Assemble the kernel bundles for publishing -->
+ <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${target.dir}/assembly/plugins/[artifact]_[revision].[ext]" conf="lib-kernel" type="jar"/>
+ <!-- Prepare the features for publishing -->
+ <copy todir="${target.dir}/assembly/features" failonerror="false">
+ <fileset dir="${basedir}/publish_resources/features" excludes="keystore"/>
+ <filterset>
+ <filter token="REGION.VERSION" value="${org.eclipse.equinox.region}"/>
+ <filter token="KERNEL.VERSION" value="${bundle.version}"/>
+ <filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
+ <filter token="SPRING.VERSION" value="${org.springframework}"/>
+ </filterset>
+ </copy>
+
+ <!-- prepare Kernel's resources - configurations and bundles that are not installed initially -->
+ <property name="kernel.resources" value="${target.dir}/kernel_resources"/>
+
<ivy:resolve resolveId="copy.path" file="${basedir}/lib-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/lib/[artifact]-[revision].[ext]" conf="lib" type="jar"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
- <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/lib/kernel/[artifact]-[revision].[ext]" conf="lib-kernel" type="jar"/>
- <!-- Workaround for the issue that exclude does not work properly for Equinox in kernel-ivy.xml -->
- <delete file="${package.output.dir}/lib/kernel/org.eclipse.osgi-${org.eclipse.osgi}.jar"/>
-
<ivy:resolve resolveId="copy.path" file="${basedir}/repository-ext-ivy.xml" transitive="true"/>
- <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/repository/ext/[artifact]-[revision].[ext]" conf="repository-ext" type="jar"/>
-
- <mkdir dir="${package.output.dir}/config"/>
- <mkdir dir="${package.output.dir}/work"/>
- <mkdir dir="${package.output.dir}/pickup"/>
-
- <echo file="${package.output.dir}/lib/.version"
- message="virgo.kernel.version=${bundle.version}&#xa;"/>
-
- <copy todir="${package.output.dir}" failonerror="false">
- <fileset dir="${basedir}/resources"/>
- </copy>
-
- <copy todir="${package.output.dir}/bin" failonerror="false">
- <fileset dir="${basedir}/bin"/>
- </copy>
+ <ivy:retrieve resolveId="copy.path" pattern="${kernel.resources}/repository/ext/[artifact]_[revision].[ext]" conf="repository-ext" type="jar"/>
- <copy todir="${package.output.dir}/lib" failonerror="false">
- <fileset dir="${basedir}/lib"/>
- <filterset>
- <filter token="ASPECTJ.VERSION" value="${org.aspectj}"/>
- <filter token="OSGI.SERVICES.VERSION" value="${org.eclipse.osgi.services}"/>
- <filter token="EQUINOX.EVENT.VERSION" value="${org.eclipse.equinox.event}"/>
- <filter token="EQUINOX.CONFIGADMIN.VERSION" value="${org.eclipse.equinox.cm}"/>
- <filter token="EQUINOX.DS.VERSION" value="${org.eclipse.equinox.ds}"/>
- <filter token="EQUINOX.UTIL.VERSION" value="${org.eclipse.equinox.util}"/>
- <filter token="EQUINOX.REGION.VERSION" value="${org.eclipse.equinox.region}"/>
- <filter token="KERNEL.VERSION" value="${bundle.version}"/>
- <filter token="MEDIC.VERSION" value="${org.eclipse.virgo.medic}"/>
- <filter token="REPOSITORY.VERSION" value="${org.eclipse.virgo.repository}"/>
- <filter token="SLF4J.VERSION" value="${org.slf4j}"/>
- <filter token="SPRING.DM.VERSION" value="${org.springframework.osgi}"/>
- <filter token="SPRING.VERSION" value="${org.springframework}"/>
- <filter token="UTIL.VERSION" value="${org.eclipse.virgo.util}"/>
- <filter token="OSGI.EXTENSIONS.VERSION" value="${org.eclipse.virgo.osgi}"/>
- <filter token="FELIX.GOGO.RUNTIME.VERSION" value="${org.apache.felix.gogo.runtime}"/>
- <filter token="FELIX.GOGO.COMMAND.VERSION" value="${org.apache.felix.gogo.command}"/>
- <filter token="FELIX.GOGO.SHELL.VERSION" value="${org.apache.felix.gogo.shell}"/>
- <filter token="MINA.CORE.VERSION" value="${com.springsource.org.apache.mina.core}"/>
- <filter token="SSHD.CORE.VERSION" value="${com.springsource.org.apache.sshd.core}"/>
- <filter token="EQUINOX.CONSOLE.VERSION" value="${org.eclipse.equinox.console.supportability}"/>
- </filterset>
- </copy>
+ <mkdir dir="${kernel.resources}/config"/>
- <copy todir="${package.output.dir}/config" failonerror="false">
+ <copy todir="${kernel.resources}/config" failonerror="false">
<fileset dir="${basedir}/config" excludes="keystore"/>
<filterset>
<filter token="ASPECTJ.VERSION" value="${org.aspectj}"/>
@@ -127,40 +125,75 @@
</filterset>
</copy>
- <copy todir="${package.output.dir}/repository/ext" failonerror="false">
+ <copy todir="${kernel.resources}/repository/ext" failonerror="false">
<fileset dir="${basedir}/repository/ext"/>
</copy>
- <copy todir="${package.output.dir}/repository/ext" failonerror="false">
- <fileset dir="${package.output.dir}/lib/kernel">
- <include name="org.eclipse.virgo.kernel.agent.dm-*.jar"/>
+ <copy todir="${kernel.resources}/repository/ext" failonerror="false">
+ <fileset dir="${target.dir}/assembly/plugins">
+ <include name="org.eclipse.virgo.kernel.agent.dm_*.jar"/>
+ </fileset>
+ </copy>
+ <!-- Prepare these two as part of the resources. They need a later installation, not with the other initial kernel region bundles. -->
+ <copy todir="${kernel.resources}/plugins" failonerror="false">
+ <fileset dir="${target.dir}/assembly/plugins">
+ <include name="org.eclipse.virgo.kernel.userregion_*.jar"/>
+ <include name="org.eclipse.virgo.kernel.osgicommand_*.jar"/>
</fileset>
</copy>
- <move todir="${package.output.dir}/repository/ext" failonerror="false">
- <fileset dir="${package.output.dir}/lib/kernel">
- <include name="org.eclipse.virgo.kernel.dmfragment-*.jar"/>
- <include name="org.eclipse.virgo.kernel.deployer.dm-*.jar"/>
+ <move todir="${kernel.resources}/repository/ext" failonerror="false">
+ <fileset dir="${target.dir}/assembly/plugins">
+ <include name="org.eclipse.virgo.kernel.dmfragment_*.jar"/>
+ <include name="org.eclipse.virgo.kernel.deployer.dm_*.jar"/>
</fileset>
</move>
- <mkdir dir="${package.output.dir}/repository/usr"/>
+ <mkdir dir="${kernel.resources}/repository/usr"/>
+
+ <property name="kernel.resources.location" value="${target.dir}/kernel_resources_zipped"/>
+ <!-- prepare the scripts and the common resource sources for publishing -->
+ <zip destfile="${kernel.resources.location}/binary/kernel_resources">
+ <zipfileset dir="${kernel.resources}"/>
+ </zip>
- <copy file="${basedir}/config/keystore" todir="${package.output.dir}/config" failonerror="false"/>
-
- <chmod perm="600">
- <fileset dir="${package.output.dir}/config">
- <include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- </fileset>
- </chmod>
-
- <chmod perm="755">
- <fileset dir="${package.output.dir}/bin">
- <include name="*.sh"/>
- </fileset>
- </chmod>
-
<mkdir dir="${artifacts.dir}"/>
+
+ <antcall target="fetch-unzipped-virgo-build-tools"/>
+ <property name="p2.products.location" value="${basedir}/publish_resources/products"/>
+ <property name="p2.categories.location" value="${basedir}/publish_resources/categories"/>
+
+ <antcall target="p2.publish-binary">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${kernel.resources.location}"/>
+ </antcall>
+ <echo message="Published the kernel resources to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-bundles-features">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="source" value="${target.dir}/assembly"/>
+ </antcall>
+ <echo message="Published bundles and features to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="product.file.location" value="${p2.products.location}/kernel/kernel.product"/>
+ </antcall>
+ <echo message="Published base product to ${p2.repository.dir}."/>
+
+ <antcall target="p2.publish-category">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="category.file.location" value="${p2.categories.location}/org.eclipse.virgo.categories/category.xml"/>
+ </antcall>
+ <echo message="Published Virgo Add-Ons feature category in the p2 repository" />
+
+ <antcall target="p2.install-virgo-product">
+ <param name="repository" value="${p2.repository.dir}"/>
+ <param name="destination" value="${package.output.dir}"/>
+ <param name="product.iu" value="kernel.product"/>
+ </antcall>
+ <echo message="Installed Virgo Kernel for distribution purposes."/>
+
<zip destfile="${package.output.file}">
<zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
<zipfileset dir="${package.dir}" includes="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
@@ -169,6 +202,14 @@
<exclude name="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
</zipfileset>
</zip>
+ <zip destfile="${artifacts.dir}\${natural.name}-updatesite-${bundle.version}.zip">
+ <zipfileset dir="${p2.repository.dir}"/>
+ </zip>
+
+ <delete dir="${kernel.resources.location}" quiet="true"/>
+ <delete dir="${target.dir}/assembly" quiet="true"/>
+ <delete dir="${tools.dir}" quiet="true"/>
+ <delete dir="${kernel.resources}" quiet="true"/>
</target>
<target name="smoke-test" description="Runs a smoke test on the kernel packaged build">
@@ -183,91 +224,4 @@
<antcall target="test.post"/>
</target>
- <target name="package.resources" depends="package"
- description="Creates a special bundle containing Virgo entities that are not bundles">
- <property name="meta.inf" value="${distro.res}/META-INF"/>
- <property name="content" value="${distro.res}/root_content"/>
- <property name="resources.jar" value="${package.output.dir}/lib/org.eclipse.virgo.kernel.resources.jar"/>
- <zip destfile="${resources.jar}">
- <zipfileset dir="${distro.res}"/>
- <zipfileset dir="${package.dir}/${package.basename}"
- includes="bin/*.sh" filemode="755"/>
- <zipfileset dir="${package.dir}/${package.basename}"
- includes="config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
- <zipfileset dir="${package.dir}/${package.basename}">
- <exclude name="bin/*.sh"/>
- <exclude name="config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- <exclude name="**/*.jar"/>
- </zipfileset>
- </zip>
- </target>
-
- <target name="p2.publish" depends="package.resources, p2.extract-publisher"
- description="Publishes bundles, features and product">
- <java jar="${p2.launcher.jar}" fork="true" taskname="p2bundles" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher"/>
- <arg line="-metadataRepository ${p2.repo.url}"/>
- <arg line="-artifactRepository ${p2.repo.url}"/>
- <arg line="-bundles ${package.output.dir}/lib,${package.output.dir}/repository/ext"/>
- <arg line="-publishArtifacts"/>
- <arg line="-configs all"/>
- </java>
-
- <sshexec host="build.eclipse.org"
- username="${eclipse.buildId}"
- keyfile="${key.file}"
- passphrase="${passphrase}"
- command="mkdir -pv /opt/public/rt/virgo/update-site/${release.type}/${build.stamp}"/>
-
- <scp todir="${eclipse.buildId}@build.eclipse.org:/opt/public/rt/virgo/update-site/${release.type}/${build.stamp}/"
- keyfile="${key.file}"
- passphrase="${passphrase}">
- <fileset dir="${publishing.dir}"/>
- </scp>
-
-
-
- <!-- <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
- <arg line="-metadataRepository ${p2.repo.url}"/>
- <arg line="-artifactRepository ${p2.repo.url}"/>
- <arg line="-productFile ${product.file}"/>
- <arg line="-append"/>
- <arg line="-publishArtifacts"/>
- <arg line="-flavor tooling"/>
- <arg line="-configs all"/>
- </java>
- <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
- <arg line="-metadataRepository ${p2.repo.url}"/>
- <arg line="-artifactRepository ${p2.repo.url}"/>
- <arg line="-productFile ${lib.product.file}"/>
- <arg line="-append"/>
- <arg line="-publishArtifacts"/>
- <arg line="-flavor tooling"/>
- <arg line="-configs all"/>
- </java>
- <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
- <arg line="-metadataRepository ${p2.repo.url}"/>
- <arg line="-artifactRepository ${p2.repo.url}"/>
- <arg line="-productFile ${lib.kernel.product.file}"/>
- <arg line="-append"/>
- <arg line="-publishArtifacts"/>
- <arg line="-flavor tooling"/>
- <arg line="-configs all"/>
- </java>
- <java jar="${p2.launcher.jar}" fork="true" taskname="p2product" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher"/>
- <arg line="-metadataRepository ${p2.repo.url}"/>
- <arg line="-artifactRepository ${p2.repo.url}"/>
- <arg line="-productFile ${repository.ext.product.file}"/>
- <arg line="-append"/>
- <arg line="-publishArtifacts"/>
- <arg line="-flavor tooling"/>
- <arg line="-configs all"/>
- </java> -->
- <delete dir="${p2.publishing.dir}" excludes="p2agent.zip" includeemptydirs="true" quiet="true"/>
- </target>
-
</project>
diff --git a/build-kernel/config/keystore b/build-kernel/config/keystore
deleted file mode 100644
index 9684caa0..00000000
--- a/build-kernel/config/keystore
+++ /dev/null
Binary files differ
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.authentication.config b/build-kernel/config/org.eclipse.virgo.kernel.authentication.config
deleted file mode 100644
index 715fd91a..00000000
--- a/build-kernel/config/org.eclipse.virgo.kernel.authentication.config
+++ /dev/null
@@ -1,6 +0,0 @@
-virgo-kernel {
- org.eclipse.virgo.kernel.authentication.KernelLoginModule REQUIRED;
-};
-equinox_console {
- org.eclipse.virgo.kernel.authentication.KernelLoginModule REQUIRED;
-};
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.jmxremote.access.properties b/build-kernel/config/org.eclipse.virgo.kernel.jmxremote.access.properties
deleted file mode 100644
index ba899791..00000000
--- a/build-kernel/config/org.eclipse.virgo.kernel.jmxremote.access.properties
+++ /dev/null
@@ -1 +0,0 @@
-admin=readwrite
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.properties b/build-kernel/config/org.eclipse.virgo.kernel.properties
deleted file mode 100644
index e066c8ce..00000000
--- a/build-kernel/config/org.eclipse.virgo.kernel.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-########################
-# Deployer Configuration
-########################
-# Note: use 0 to disable deployment timeouts
-deployer.timeout= 300
-deployer.pickupDirectory= pickup
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
index c2d271d2..ee3bf5a2 100644
--- a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,14 +1,14 @@
baseBundles = \
- file:lib/kernel/org.eclipse.equinox.cm-@EQUINOX.CONFIGADMIN.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.userregion-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.osgicommand-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.osgi.services-@OSGI.SERVICES.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.apache.mina.core-@MINA.CORE.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.command-@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.runtime-@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.shell-@FELIX.GOGO.SHELL.VERSION@.jar@start,\
- file:lib/org.eclipse.equinox.console.supportability-@EQUINOX.CONSOLE.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.apache.sshd.core-@SSHD.CORE.VERSION@.jar@start
+ file:plugins/org.eclipse.equinox.cm_@EQUINOX.CONFIGADMIN.VERSION@.jar@start,\
+ file:plugins/org.eclipse.virgo.kernel.userregion_@KERNEL.VERSION@.jar@start,\
+ file:plugins/org.eclipse.virgo.kernel.osgicommand_@KERNEL.VERSION@.jar@start,\
+ file:plugins/org.eclipse.osgi.services_@OSGI.SERVICES.VERSION@.jar@start,\
+ file:plugins/com.springsource.org.apache.mina.core_@MINA.CORE.VERSION@.jar@start,\
+ file:plugins/org.apache.felix.gogo.command_@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
+ file:plugins/org.apache.felix.gogo.runtime_@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
+ file:plugins/org.apache.felix.gogo.shell_@FELIX.GOGO.SHELL.VERSION@.jar@start,\
+ file:plugins/org.eclipse.equinox.console.supportability_@EQUINOX.CONSOLE.VERSION@.jar@start,\
+ file:plugins/com.springsource.org.apache.sshd.core_@SSHD.CORE.VERSION@.jar@start
bundleImports = org.eclipse.osgi;bundle-version="0"
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.users.properties b/build-kernel/config/org.eclipse.virgo.kernel.users.properties
deleted file mode 100644
index 10d4c38c..00000000
--- a/build-kernel/config/org.eclipse.virgo.kernel.users.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-##################
-# User definitions
-##################
-user.admin=springsource
-
-
-##################
-# Role definitions
-##################
-role.admin=admin
diff --git a/build-kernel/config/org.eclipse.virgo.medic.properties b/build-kernel/config/org.eclipse.virgo.medic.properties
deleted file mode 100644
index 5c5f1cf7..00000000
--- a/build-kernel/config/org.eclipse.virgo.medic.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-dump.root.directory=serviceability/dump
-log.wrapSysOut=true
-log.wrapSysErr=true
-log.dump.level=DEBUG
-log.dump.bufferSize=10000
-log.dump.pattern=[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n
-log.jul.consoleHandler=false
diff --git a/build-kernel/config/serviceability.xml b/build-kernel/config/serviceability.xml
deleted file mode 100644
index dc6088ca..00000000
--- a/build-kernel/config/serviceability.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<configuration>
-
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
-
- <appender name="SIFTED_LOG_FILE" class="ch.qos.logback.classic.sift.SiftingAppender">
- <discriminator>
- <Key>applicationName</Key>
- <DefaultValue>virgo-kernel</DefaultValue>
- </discriminator>
- <sift>
- <appender name="${applicationName}_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>serviceability/logs/${applicationName}/log.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>serviceability/logs/${applicationName}/log_%i.log</FileNamePattern>
- <MinIndex>1</MinIndex>
- <MaxIndex>4</MaxIndex>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <MaxFileSize>10MB</MaxFileSize>
- </triggeringPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n</Pattern>
- </encoder>
- </appender>
- </sift>
- </appender>
-
- <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>serviceability/logs/log.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>serviceability/logs/log_%i.log</FileNamePattern>
- <MinIndex>1</MinIndex>
- <MaxIndex>4</MaxIndex>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <MaxFileSize>10MB</MaxFileSize>
- </triggeringPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %-28.28thread %-64.64logger{64} %X{medic.eventCode} %msg %ex%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="EVENT_LOG_STDOUT" class="org.eclipse.virgo.medic.log.logback.ReroutingAwareConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>serviceability/eventlogs/eventlog.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <FileNamePattern>serviceability/eventlogs/eventlog_%i.log</FileNamePattern>
- <MinIndex>1</MinIndex>
- <MaxIndex>4</MaxIndex>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <MaxFileSize>10MB</MaxFileSize>
- </triggeringPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-28.28thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
- </encoder>
- </appender>
-
- <logger level="INFO" additivity="false" name="org.eclipse.virgo.medic.eventlog.localized">
- <appender-ref ref="EVENT_LOG_STDOUT" />
- <appender-ref ref="EVENT_LOG_FILE" />
- </logger>
-
- <logger level="INFO" additivity="false" name="org.eclipse.virgo.medic.eventlog.default">
- <appender-ref ref="SIFTED_LOG_FILE" />
- <appender-ref ref="LOG_FILE" />
- </logger>
-
- <root level="INFO">
- <appender-ref ref="SIFTED_LOG_FILE" />
- <appender-ref ref="LOG_FILE" />
- </root>
-
-</configuration>
diff --git a/build-kernel/distro_resources/META-INF/MANIFEST.MF b/build-kernel/distro_resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ad0658f4..00000000
--- a/build-kernel/distro_resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Virgo Resources
-Bundle-SymbolicName: org.eclipse.virgo.kernel.resources
-Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/build-kernel/distro_resources/META-INF/p2.inf b/build-kernel/distro_resources/META-INF/p2.inf
deleted file mode 100644
index f28f7c3b..00000000
--- a/build-kernel/distro_resources/META-INF/p2.inf
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Copyright (c) 2010 SAP AG
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Hristo Iliev, SAP AG - initial contribution
-################################################################################
-
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.natives.unzip(source:@artifact,target:${installFolder});\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/META-INF);
diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index e117e3e4..b82aa0d2 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -10,20 +10,8 @@
<dependencies>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="latest.integration" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="lib-kernel->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.org.apache.commons.logging" rev="${org.slf4j}" conf="lib-kernel->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="lib-kernel->runtime"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="lib-kernel->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="lib-kernel->runtime"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="lib-kernel->runtime"/>
<dependency org="org.eclipse.osgi" name='org.eclipse.equinox.region' rev='${org.eclipse.equinox.region}' conf='lib-kernel->runtime' />
- <dependency org="org.apache.felix" name="org.apache.felix.gogo.command" rev="${org.apache.felix.gogo.command}" conf="lib-kernel->runtime" />
- <dependency org="org.apache.felix" name="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}" conf="lib-kernel->runtime" />
- <dependency org="org.apache.felix" name="org.apache.felix.gogo.shell" rev="${org.apache.felix.gogo.shell}" conf="lib-kernel->runtime" />
- <dependency org="org.apache.mina" name="com.springsource.org.apache.mina.core" rev="${com.springsource.org.apache.mina.core}" conf="lib-kernel->runtime" />
- <dependency org="org.apache.mina" name="com.springsource.org.apache.sshd.core" rev="${com.springsource.org.apache.sshd.core}" conf="lib-kernel->runtime" />
<!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work.
This is due to the transitive dependency from org.eclipse.virgo.osgi.equinox on org.eclipse.osgi
diff --git a/build-kernel/lib-ivy.xml b/build-kernel/lib-ivy.xml
index e8de44fc..ecc17816 100644
--- a/build-kernel/lib-ivy.xml
+++ b/build-kernel/lib-ivy.xml
@@ -10,15 +10,10 @@
<dependencies>
<!-- lib -->
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.shutdown" rev="latest.integration" conf="lib->runtime"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.authentication" rev="latest.integration" conf="lib->runtime"/>
- <dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.launcher" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
- <dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.extensions.equinox" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.console" rev="${org.eclipse.virgo.osgi}" conf="lib->runtime"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="${javax.transaction}" conf="lib->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.console.supportability" rev="${org.eclipse.equinox.console.supportability}" conf="lib->runtime" />
- <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+ <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
</dependencies>
</ivy-module>
diff --git a/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties b/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
deleted file mode 100644
index ebb44d5e..00000000
--- a/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-launcher.bundles =\
- file:lib/kernel/org.eclipse.equinox.region-@EQUINOX.REGION.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.slf4j.api-@SLF4J.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.slf4j.org.apache.commons.logging-@SLF4J.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.aspectj.weaver-@ASPECTJ.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.deployer-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.medic-@MEDIC.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.osgi.services-@OSGI.SERVICES.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.equinox.cm-@EQUINOX.CONFIGADMIN.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.slf4j.bridge-@SLF4J.VERSION@.jar,\
- file:lib/kernel/org.eclipse.virgo.medic.core-@MEDIC.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.osgi-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.osgi.manifest-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.equinox.event-@EQUINOX.EVENT.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.common-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.io-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.jmx-@UTIL.VERSION@.jar,\
- file:lib/kernel/org.eclipse.virgo.util.math-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.util.parser.manifest-@UTIL.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.apache.commons.codec-1.3.0.jar@start,\
- file:lib/kernel/com.springsource.org.apache.commons.httpclient-3.1.0.jar@start,\
- file:lib/kernel/org.eclipse.virgo.repository-@REPOSITORY.VERSION@.jar@start,\
- file:lib/kernel/org.springframework.aop-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.springframework.asm-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.springframework.expression-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.springframework.beans-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.springframework.core-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.springframework.context-@SPRING.VERSION@.jar,\
- file:lib/kernel/org.eclipse.virgo.kernel.core-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.agent.dm-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.springframework.osgi.core-@SPRING.DM.VERSION@.jar,\
- file:lib/kernel/org.springframework.osgi.extender-@SPRING.DM.VERSION@.jar@start,\
- file:lib/kernel/org.springframework.osgi.io-@SPRING.DM.VERSION@.jar,\
- file:lib/kernel/com.springsource.org.aopalliance-1.0.0.jar,\
- file:lib/kernel/org.eclipse.equinox.ds-@EQUINOX.DS.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.equinox.util-@EQUINOX.UTIL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.artifact-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.services-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.model-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.kerneldmfragment-@KERNEL.VERSION@.jar,\
- file:lib/kernel/org.eclipse.virgo.kernel.shell-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.osgi-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.core-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/org.eclipse.virgo.kernel.userregionfactory-@KERNEL.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.apache.mina.core-@MINA.CORE.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.command-@FELIX.GOGO.COMMAND.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.runtime-@FELIX.GOGO.RUNTIME.VERSION@.jar@start,\
- file:lib/kernel/org.apache.felix.gogo.shell-@FELIX.GOGO.SHELL.VERSION@.jar@start,\
- file:lib/org.eclipse.equinox.console.supportability-@EQUINOX.CONSOLE.VERSION@.jar@start,\
- file:lib/kernel/com.springsource.org.apache.sshd.core-@SSHD.CORE.VERSION@.jar@start
-
-#Equinox Configuration
-osgi.parentClassloader=fwk
-osgi.context.bootdelegation=false
-osgi.compatibility.bootdelegation=false
-osgi.compatibility.eagerStart.LazyActivation=false
-osgi.clean=true
-org.osgi.framework.bsnversion=multiple
-
-# osgi console support
-# osgi.console=2401
-osgi.console.enable.builtin=false
-osgi.console.ssh.useDefaultSecureStorage=false
-osgi.console.useConfigAdmin=true
-gosh.args=--nointeractive
-
-osgi.java.profile=file:lib/java6-server.profile
-osgi.java.profile.bootdelegation=override
-osgi.hook.configurators.include=\
- org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
-
-org.eclipse.virgo.medic.log.config.path=config/serviceability.xml
-org.eclipse.virgo.suppress.heap.dumps=false
-
-eclipse.bundle.setTCCL=false
-eclipse.enableStateSaver=false
diff --git a/build-kernel/org.eclipse.virgo.kernel.lib.kernel.product b/build-kernel/org.eclipse.virgo.kernel.lib.kernel.product
deleted file mode 100644
index fa236211..00000000
--- a/build-kernel/org.eclipse.virgo.kernel.lib.kernel.product
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<?pde version="3.5"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (c) 2010 SAP AG
- ~ All rights reserved. This program and the accompanying materials
- ~ are made available under the terms of the Eclipse Public License v1.0
- ~ which accompanies this distribution, and is available at
- ~ http://www.eclipse.org/legal/epl-v10.html
- ~
- ~ Contributors:
- ~ Hristo Iliev, SAP AG - initial contribution
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<product name="Virgo Kernel Distribution (kernel region)" uid="org.eclipse.virgo.kernel.lib.kernel.product" version="1.0.0"
- useFeatures="false" includeLaunchers="false">
-
- <plugins>
- <plugin id="com.springsource.org.aopalliance"/>
- <plugin id="com.springsource.org.apache.commons.codec"/>
- <plugin id="com.springsource.org.apache.commons.httpclient"/>
- <plugin id="com.springsource.org.apache.mina.core"/>
- <plugin id="com.springsource.org.apache.sshd"/>
- <plugin id="com.springsource.org.aspectj.weaver"/>
- <plugin id="com.springsource.slf4j.api"/>
- <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
- <plugin id="org.apache.felix.configadmin"/>
- <plugin id="org.apache.felix.eventadmin"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm"/>
- <plugin id="org.eclipse.virgo.kernel.artifact"/>
- <plugin id="org.eclipse.virgo.kernel.core"/>
- <plugin id="org.eclipse.virgo.kernel.deployer"/>
- <plugin id="org.eclipse.virgo.kernel.dm"/>
- <plugin id="org.eclipse.virgo.kernel.kerneldmfragment"/>
- <plugin id="org.eclipse.virgo.kernel.model"/>
- <plugin id="org.eclipse.virgo.kernel.osgi"/>
- <plugin id="org.eclipse.virgo.kernel.services"/>
- <plugin id="org.eclipse.virgo.kernel.shell"/>
- <plugin id="org.eclipse.virgo.kernel.userregion"/>
- <plugin id="org.eclipse.virgo.medic"/>
- <plugin id="org.eclipse.virgo.medic.core"/>
- <plugin id="org.eclipse.virgo.osgi.launcher"/>
- <plugin id="org.eclipse.virgo.repository"/>
- <plugin id="org.eclipse.virgo.util.osgi"/>
- <plugin id="org.eclipse.virgo.util.common"/>
- <plugin id="org.eclipse.virgo.util.io"/>
- <plugin id="org.eclipse.virgo.util.jmx"/>
- <plugin id="org.eclipse.virgo.util.math"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest"/>
- <plugin id="org.springframework.aop"/>
- <plugin id="org.springframework.asm"/>
- <plugin id="org.springframework.expression"/>
- <plugin id="org.springframework.beans"/>
- <plugin id="org.springframework.core"/>
- <plugin id="org.springframework.context"/>
- <plugin id="org.springframework.context.support"/>
- <plugin id="org.springframework.osgi.core"/>
- <plugin id="org.springframework.osgi.extender"/>
- <plugin id="org.springframework.osgi.io"/>
- </plugins>
-
- <configurations>
- <plugin id="com.springsource.slf4j.api" autostart="true"/>
- <plugin id="com.springsource.slf4j.org.apache.commons.logging" autostart="true"/>
- <plugin id="com.springsource.org.aspectj.weaver" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic" autostart="true"/>
- <plugin id="org.apache.felix.configadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>
- <plugin id="org.apache.felix.eventadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.common" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.io" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>
- <plugin id="org.eclipse.virgo.util.math" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>
- <plugin id="org.eclipse.virgo.repository" autostart="true"/>
- <plugin id="org.springframework.aop" autostart="false"/>
- <plugin id="org.springframework.asm" autostart="false"/>
- <plugin id="org.springframework.expression" autostart="false"/>
- <plugin id="org.springframework.beans" autostart="false"/>
- <plugin id="org.springframework.core" autostart="false"/>
- <plugin id="org.springframework.context" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm" autostart="true"/>
- <plugin id="org.springframework.osgi.core" autostart="false"/>
- <plugin id="org.springframework.osgi.extender" autostart="true"/>
- <plugin id="org.springframework.osgi.io" autostart="false"/>
- <plugin id="com.springsource.org.aopalliance" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.artifact" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.services" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.osgi" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.deployer" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.dm" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.model" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.kerneldmfragment" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.shell" autostart="true"/>
- </configurations>
-
-</product> \ No newline at end of file
diff --git a/build-kernel/org.eclipse.virgo.kernel.lib.product b/build-kernel/org.eclipse.virgo.kernel.lib.product
deleted file mode 100644
index 2d306258..00000000
--- a/build-kernel/org.eclipse.virgo.kernel.lib.product
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<?pde version="3.5"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (c) 2010 SAP AG
- ~ All rights reserved. This program and the accompanying materials
- ~ are made available under the terms of the Eclipse Public License v1.0
- ~ which accompanies this distribution, and is available at
- ~ http://www.eclipse.org/legal/epl-v10.html
- ~
- ~ Contributors:
- ~ Hristo Iliev, SAP AG - initial contribution
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<product name="Virgo Kernel Distribution (user region)" uid="org.eclipse.virgo.kernel.lib.product" version="1.0.0"
- useFeatures="false" includeLaunchers="false">
-
- <plugins>
- <plugin id="org.eclipse.virgo.kernel.resources"/>
- <plugin id="com.springsource.javax.transaction"/>
- <plugin id="com.springsource.org.aopalliance"/>
- <plugin id="com.springsource.org.apache.commons.codec"/>
- <plugin id="com.springsource.org.apache.commons.httpclient"/>
- <plugin id="com.springsource.org.apache.commons.logging"/>
- <plugin id="com.springsource.org.apache.mina.core"/>
- <plugin id="com.springsource.org.apache.sshd"/>
- <plugin id="com.springsource.org.aspectj.runtime"/>
- <plugin id="com.springsource.slf4j.api"/>
- <plugin id="org.apache.felix.configadmin"/>
- <plugin id="org.apache.felix.eventadmin"/>
- <plugin id="org.eclipse.virgo.kernel.artifact"/>
- <plugin id="org.eclipse.virgo.kernel.authentication"/>
- <plugin id="org.eclipse.virgo.kernel.core"/>
- <plugin id="org.eclipse.virgo.kernel.deployer"/>
- <plugin id="org.eclipse.virgo.kernel.model"/>
- <plugin id="org.eclipse.virgo.kernel.osgi"/>
- <plugin id="org.eclipse.virgo.kernel.osgicommand"/>
- <plugin id="org.eclipse.virgo.kernel.services"/>
- <plugin id="org.eclipse.virgo.kernel.shell"/>
- <plugin id="org.eclipse.virgo.medic"/>
- <plugin id="org.eclipse.virgo.medic.core"/>
- <plugin id="org.eclipse.virgo.osgi.extensions.equinox"/>
- <plugin id="org.eclipse.virgo.osgi.launcher"/>
- <plugin id="org.eclipse.virgo.repository"/>
- <plugin id="org.eclipse.virgo.util.common"/>
- <plugin id="org.eclipse.virgo.util.io"/>
- <plugin id="org.eclipse.virgo.util.jmx"/>
- <plugin id="org.eclipse.virgo.util.math"/>
- <plugin id="org.eclipse.virgo.util.osgi"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest"/>
- <plugin id="org.springframework.aop"/>
- <plugin id="org.springframework.asm"/>
- <plugin id="org.springframework.expression"/>
- <plugin id="org.springframework.beans"/>
- <plugin id="org.springframework.core"/>
- <plugin id="org.springframework.context"/>
- <plugin id="org.springframework.osgi.core"/>
- <plugin id="org.springframework.osgi.extender"/>
- <plugin id="org.springframework.osgi.io"/>
- </plugins>
-
- <configurations>
- <plugin id="com.springsource.slf4j.api" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic" autostart="true"/>
- <plugin id="org.apache.felix.configadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>
- <plugin id="org.apache.felix.eventadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.common" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.io" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>
- <plugin id="org.eclipse.virgo.util.math" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>
- <plugin id="org.eclipse.virgo.repository" autostart="true"/>
- <plugin id="org.springframework.aop" autostart="false"/>
- <plugin id="org.springframework.asm" autostart="false"/>
- <plugin id="org.springframework.expression" autostart="false"/>
- <plugin id="org.springframework.beans" autostart="false"/>
- <plugin id="org.springframework.core" autostart="false"/>
- <plugin id="org.springframework.context" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>
- <plugin id="org.springframework.osgi.core" autostart="false"/>
- <plugin id="org.springframework.osgi.extender" autostart="true"/>
- <plugin id="org.springframework.osgi.io" autostart="false"/>
- <plugin id="com.springsource.org.aopalliance" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.artifact" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.services" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.osgi" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.deployer" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.model" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.shell" autostart="true"/>
- </configurations>
-
-</product> \ No newline at end of file
diff --git a/build-kernel/org.eclipse.virgo.kernel.product b/build-kernel/org.eclipse.virgo.kernel.product
deleted file mode 100644
index 403a082f..00000000
--- a/build-kernel/org.eclipse.virgo.kernel.product
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<?pde version="3.5"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (c) 2010 SAP AG
- ~ All rights reserved. This program and the accompanying materials
- ~ are made available under the terms of the Eclipse Public License v1.0
- ~ which accompanies this distribution, and is available at
- ~ http://www.eclipse.org/legal/epl-v10.html
- ~
- ~ Contributors:
- ~ Hristo Iliev, SAP AG - initial contribution
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<product name="Virgo Kernel Distribution" uid="org.eclipse.virgo.kernel.product" version="1.0.0"
- useFeatures="false" includeLaunchers="false">
-
- <plugins>
- <plugin id="org.eclipse.virgo.kernel.resources"/>
- <plugin id="com.springsource.slf4j.api"/>
- <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
- <plugin id="com.springsource.org.aspectj.weaver"/>
- <plugin id="org.eclipse.virgo.medic"/>
- <plugin id="org.apache.felix.configadmin"/>
- <plugin id="org.eclipse.virgo.medic.core"/>
- <plugin id="org.eclipse.virgo.util.osgi"/>
- <plugin id="org.apache.felix.eventadmin"/>
- <plugin id="org.eclipse.virgo.util.common"/>
- <plugin id="org.eclipse.virgo.util.io"/>
- <plugin id="org.eclipse.virgo.util.jmx"/>
- <plugin id="org.eclipse.virgo.util.math"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest"/>
- <plugin id="com.springsource.org.apache.commons.codec"/>
- <plugin id="com.springsource.org.apache.commons.httpclient"/>
- <plugin id="org.eclipse.virgo.repository"/>
- <plugin id="org.springframework.aop"/>
- <plugin id="org.springframework.asm"/>
- <plugin id="org.springframework.expression"/>
- <plugin id="org.springframework.beans"/>
- <plugin id="org.springframework.core"/>
- <plugin id="org.springframework.context"/>
- <plugin id="org.eclipse.virgo.kernel.core"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm"/>
- <plugin id="org.springframework.osgi.core"/>
- <plugin id="org.springframework.osgi.extender"/>
- <plugin id="org.springframework.osgi.io"/>
- <plugin id="com.springsource.org.aopalliance"/>
- <plugin id="org.eclipse.virgo.kernel.artifact"/>
- <plugin id="org.eclipse.virgo.kernel.services"/>
- <plugin id="org.eclipse.virgo.kernel.osgi"/>
- <plugin id="org.eclipse.virgo.kernel.deployer"/>
- <plugin id="org.eclipse.virgo.kernel.dm"/>
- <plugin id="org.eclipse.virgo.kernel.model"/>
- <plugin id="org.eclipse.virgo.kernel.kerneldmfragment"/>
- <plugin id="org.eclipse.virgo.kernel.shell"/>
- </plugins>
-
- <configurations>
- <plugin id="com.springsource.slf4j.api" autostart="true"/>
- <plugin id="com.springsource.slf4j.org.apache.commons.logging" autostart="true"/>
- <plugin id="com.springsource.org.aspectj.weaver" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic" autostart="true"/>
- <plugin id="org.apache.felix.configadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.medic.core" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.osgi" autostart="true"/>
- <plugin id="org.apache.felix.eventadmin" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.common" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.io" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.jmx" autostart="false"/>
- <plugin id="org.eclipse.virgo.util.math" autostart="true"/>
- <plugin id="org.eclipse.virgo.util.parser.manifest" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.codec" autostart="true"/>
- <plugin id="com.springsource.org.apache.commons.httpclient" autostart="true"/>
- <plugin id="org.eclipse.virgo.repository" autostart="true"/>
- <plugin id="org.springframework.aop" autostart="false"/>
- <plugin id="org.springframework.asm" autostart="false"/>
- <plugin id="org.springframework.expression" autostart="false"/>
- <plugin id="org.springframework.beans" autostart="false"/>
- <plugin id="org.springframework.core" autostart="false"/>
- <plugin id="org.springframework.context" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.core" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm" autostart="true"/>
- <plugin id="org.springframework.osgi.core" autostart="false"/>
- <plugin id="org.springframework.osgi.extender" autostart="true"/>
- <plugin id="org.springframework.osgi.io" autostart="false"/>
- <plugin id="com.springsource.org.aopalliance" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.artifact" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.services" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.osgi" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.deployer" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.dm" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.model" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.kerneldmfragment" autostart="true"/>
- <plugin id="org.eclipse.virgo.kernel.shell" autostart="true"/>
- </configurations>
-
-</product> \ No newline at end of file
diff --git a/build-kernel/org.eclipse.virgo.kernel.repository.ext.product b/build-kernel/org.eclipse.virgo.kernel.repository.ext.product
deleted file mode 100644
index ffe64ee2..00000000
--- a/build-kernel/org.eclipse.virgo.kernel.repository.ext.product
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<?pde version="3.5"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (c) 2010 SAP AG
- ~ All rights reserved. This program and the accompanying materials
- ~ are made available under the terms of the Eclipse Public License v1.0
- ~ which accompanies this distribution, and is available at
- ~ http://www.eclipse.org/legal/epl-v10.html
- ~
- ~ Contributors:
- ~ Hristo Iliev, SAP AG - initial contribution
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<product name="Virgo Kernel Distribution (repository/ext)" uid="org.eclipse.virgo.kernel.repository.ext.product" version="1.0.0"
- useFeatures="false" includeLaunchers="false">
-
- <plugins>
- <plugin id="com.springsource.org.aopalliance"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm"/>
- <plugin id="org.eclipse.virgo.kernel.deployer.dm"/>
- <plugin id="org.eclipse.virgo.kernel.dmfragment"/>
- <plugin id="org.springframework.aop"/>
- <plugin id="org.springframework.asm"/>
- <plugin id="org.springframework.expression"/>
- <plugin id="org.springframework.beans"/>
- <plugin id="org.springframework.core"/>
- <plugin id="org.springframework.context"/>
- <plugin id="org.springframework.osgi.core"/>
- <plugin id="org.springframework.osgi.extender"/>
- <plugin id="org.springframework.osgi.io"/>
- </plugins>
-
- <configurations>
- <plugin id="com.springsource.org.aopalliance" autostart="false"/>
- <plugin id="org.eclipse.virgo.kernel.agent.dm" autostart="true"/>
- <plugin id="org.springframework.aop" autostart="false"/>
- <plugin id="org.springframework.asm" autostart="false"/>
- <plugin id="org.springframework.expression" autostart="false"/>
- <plugin id="org.springframework.beans" autostart="false"/>
- <plugin id="org.springframework.core" autostart="false"/>
- <plugin id="org.springframework.context" autostart="false"/>
- <plugin id="org.springframework.osgi.core" autostart="false"/>
- <plugin id="org.springframework.osgi.extender" autostart="true"/>
- <plugin id="org.springframework.osgi.io" autostart="false"/>
- </configurations>
-
-</product> \ No newline at end of file
diff --git a/build-kernel/p2.inf b/build-kernel/p2.inf
deleted file mode 100644
index e09ad725..00000000
--- a/build-kernel/p2.inf
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Copyright (c) 2010 SAP AG
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Hristo Iliev, SAP AG - initial contribution
-################################################################################
-
-properties.1.name = org.eclipse.equinox.p2.type.category
-properties.1.value = true
diff --git a/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/.project b/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/.project
new file mode 100644
index 00000000..eb5be4b3
--- /dev/null
+++ b/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.categories</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/category.xml b/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/category.xml
new file mode 100644
index 00000000..5bc468bf
--- /dev/null
+++ b/build-kernel/publish_resources/categories/org.eclipse.virgo.categories/category.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.equinox.regions">
+ <category name="org.eclipse.virgo.addons"/>
+ </feature>
+</site>
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/.project b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/.project
new file mode 100644
index 00000000..0d8264ba
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/build.properties b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/build.properties
new file mode 100644
index 00000000..db80add9
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/eclipse_update_120.jpg b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/eclipse_update_120.jpg
new file mode 100755
index 00000000..bfdf708a
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/eclipse_update_120.jpg
Binary files differ
diff --git a/build-kernel/resources/epl-v10.html b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/epl-v10.html
index eecc800f..eecc800f 100644..100755
--- a/build-kernel/resources/epl-v10.html
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/epl-v10.html
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.properties b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.properties
new file mode 100644
index 00000000..2cb09b09
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel 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 region support in Virgo Kernel.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.xml b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.xml
new file mode 100755
index 00000000..49a7b057
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.equinox.regions"
+ label="%featureName"
+ version="@REGION.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.equinox.region"
+ download-size="0"
+ install-size="0"
+ version="@REGION.VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.equinox.regions/p2.inf b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/p2.inf
new file mode 100644
index 00000000..21bf96da
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.equinox.regions/p2.inf
@@ -0,0 +1,31 @@
+requires.0.name = toolingorg.eclipse.equinox.region
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.optional = true
+
+units.0.id = toolingorg.eclipse.equinox.region
+units.0.version = 1.0.0
+units.0.requires.0.name = org.eclipse.equinox.region
+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.equinox.region
+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 = toolingorg.eclipse.equinox.region
+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
+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);setStartLevel(startLevel:3);
+units.0.instructions.unconfigure = markStarted(started: false); \ No newline at end of file
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/.project b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/.project
new file mode 100644
index 00000000..0d8264ba
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/build.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/build.properties
new file mode 100644
index 00000000..db80add9
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg
new file mode 100755
index 00000000..bfdf708a
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/eclipse_update_120.jpg
Binary files differ
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html
new file mode 100755
index 00000000..eecc800f
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/epl-v10.html
@@ -0,0 +1,258 @@
+<!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-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties
new file mode 100644
index 00000000..ab7ad531
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel 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 kernel resources of Eclipse Virgo such as repository resources and additional configurations of the OSGi framework.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml
new file mode 100755
index 00000000..88ffe069
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.common.resources/feature.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.kernel.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="kernel_resources"
+ download-size="0"
+ install-size="0"
+ version="1.0.0"/>
+
+</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/.project b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/.project
new file mode 100644
index 00000000..0d8264ba
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/build.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/build.properties
new file mode 100644
index 00000000..db80add9
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg
new file mode 100755
index 00000000..bfdf708a
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg
Binary files differ
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/epl-v10.html b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/epl-v10.html
new file mode 100755
index 00000000..eecc800f
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/epl-v10.html
@@ -0,0 +1,258 @@
+<!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-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.properties
new file mode 100644
index 00000000..7dc71972
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel Spring Integration 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 two spring bundles essential for the complete integration with Spring Framework that are otherwise optionally required.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
new file mode 100755
index 00000000..d704392b
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.kernel.springintegration"
+ label="%featureName"
+ version="@KERNEL.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.springframework.asm"
+ download-size="0"
+ install-size="0"
+ version="@SPRING.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.springframework.expression"
+ download-size="0"
+ install-size="0"
+ version="@SPRING.VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/.project b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/.project
new file mode 100644
index 00000000..0d8264ba
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.virgo.core.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/build.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/build.properties
new file mode 100644
index 00000000..db80add9
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/eclipse_update_120.jpg b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/eclipse_update_120.jpg
new file mode 100755
index 00000000..bfdf708a
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/eclipse_update_120.jpg
Binary files differ
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/epl-v10.html b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/epl-v10.html
new file mode 100755
index 00000000..eecc800f
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/epl-v10.html
@@ -0,0 +1,258 @@
+<!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-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.properties b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.properties
new file mode 100644
index 00000000..42761e8c
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel 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 Kernel features of a Eclipse Virgo OSGi container such as deployment and repository mechanisms. Region support is enabled by this feature.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
new file mode 100755
index 00000000..16385fb8
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/feature.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.virgo.kernel"
+ label="%featureName"
+ version="@KERNEL.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>
+
+ <requires>
+ <import feature="org.eclipse.virgo.core" version="0.0.0"/>
+ <import feature="org.eclipse.equinox.regions" version="0.0.0"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.virgo.kernel.deployer"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.repository"
+ download-size="0"
+ install-size="0"
+ version="@REPOSITORY.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.agent.dm"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.artifact"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.services"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.model"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.kerneldmfragment"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.shell"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.osgi"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+ <plugin
+ id="org.eclipse.virgo.kernel.userregionfactory"
+ download-size="0"
+ install-size="0"
+ version="@KERNEL.VERSION@"
+ unpack="false"/>
+
+</feature>
diff --git a/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/p2.inf b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/p2.inf
new file mode 100644
index 00000000..c7b929c1
--- /dev/null
+++ b/build-kernel/publish_resources/features/org.eclipse.virgo.kernel/p2.inf
@@ -0,0 +1,279 @@
+requires.0.name = toolingorg.eclipse.virgo.kernel.deployer
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.optional = true
+requires.1.name = toolingorg.eclipse.virgo.repository
+requires.1.namespace = org.eclipse.equinox.p2.iu
+requires.1.optional = true
+requires.2.name = toolingorg.eclipse.virgo.kernel.agent.dm
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.optional = true
+requires.3.name = toolingorg.eclipse.virgo.kernel.artifact
+requires.3.namespace = org.eclipse.equinox.p2.iu
+requires.3.optional = true
+requires.4.name = toolingorg.eclipse.virgo.kernel.services
+requires.4.namespace = org.eclipse.equinox.p2.iu
+requires.4.optional = true
+requires.5.name = toolingorg.eclipse.virgo.kernel.model
+requires.5.namespace = org.eclipse.equinox.p2.iu
+requires.5.optional = true
+requires.6.name = toolingorg.eclipse.virgo.kernel.shell
+requires.6.namespace = org.eclipse.equinox.p2.iu
+requires.6.optional = true
+requires.7.name = toolingorg.eclipse.virgo.kernel.osgi
+requires.7.namespace = org.eclipse.equinox.p2.iu
+requires.7.optional = true
+requires.8.name = toolingorg.eclipse.virgo.kernel.userregionfactory
+requires.8.namespace = org.eclipse.equinox.p2.iu
+requires.8.optional = true
+
+units.0.id = toolingorg.eclipse.virgo.kernel.deployer
+units.0.version = 1.0.0
+units.0.requires.0.name = org.eclipse.virgo.kernel.deployer
+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.virgo.kernel.deployer
+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 = toolingorg.eclipse.virgo.kernel.deployer
+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
+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 = toolingorg.eclipse.virgo.repository
+units.1.version = 1.0.0
+units.1.requires.0.name = org.eclipse.virgo.repository
+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.virgo.repository
+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 = toolingorg.eclipse.virgo.repository
+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
+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 = toolingorg.eclipse.virgo.kernel.agent.dm
+units.2.version = 1.0.0
+units.2.requires.0.name = org.eclipse.virgo.kernel.agent.dm
+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.virgo.kernel.agent.dm
+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 = toolingorg.eclipse.virgo.kernel.agent.dm
+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
+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 = toolingorg.eclipse.virgo.kernel.artifact
+units.3.version = 1.0.0
+units.3.requires.0.name = org.eclipse.virgo.kernel.artifact
+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.virgo.kernel.artifact
+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 = toolingorg.eclipse.virgo.kernel.artifact
+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
+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 = toolingorg.eclipse.virgo.kernel.services
+units.4.version = 1.0.0
+units.4.requires.0.name = org.eclipse.virgo.kernel.services
+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.virgo.kernel.services
+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 = toolingorg.eclipse.virgo.kernel.services
+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
+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 = toolingorg.eclipse.virgo.kernel.model
+units.5.version = 1.0.0
+units.5.requires.0.name = org.eclipse.virgo.kernel.model
+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.virgo.kernel.model
+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 = toolingorg.eclipse.virgo.kernel.model
+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
+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 = toolingorg.eclipse.virgo.kernel.shell
+units.6.version = 1.0.0
+units.6.requires.0.name = org.eclipse.virgo.kernel.shell
+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.virgo.kernel.shell
+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 = toolingorg.eclipse.virgo.kernel.shell
+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
+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 = toolingorg.eclipse.virgo.kernel.osgi
+units.7.version = 1.0.0
+units.7.requires.0.name = org.eclipse.virgo.kernel.osgi
+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.virgo.kernel.osgi
+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 = toolingorg.eclipse.virgo.kernel.osgi
+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
+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 = toolingorg.eclipse.virgo.kernel.userregionfactory
+units.8.version = 1.0.0
+units.8.requires.0.name = org.eclipse.virgo.kernel.userregionfactory
+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.virgo.kernel.userregionfactory
+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 = toolingorg.eclipse.virgo.kernel.userregionfactory
+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
+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); \ No newline at end of file
diff --git a/build-kernel/publish_resources/products/kernel/kernel.product b/build-kernel/publish_resources/products/kernel/kernel.product
new file mode 100755
index 00000000..85d3657b
--- /dev/null
+++ b/build-kernel/publish_resources/products/kernel/kernel.product
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Eclipse Virgo Kernel Product" uid="kernel.product" version="1.0.0" useFeatures="true" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.virgo.kernel" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.kernel.resources" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.scripts" version="0.0.0"/>
+ <feature id="org.eclipse.virgo.kernel.springintegration" version="0.0.0"/>
+ </features>
+
+ <configurations>
+ <plugin id="com.springsource.org.apache.commons.codec" autoStart="true"/>
+ <plugin id="com.springsource.org.apache.commons.httpclient" autoStart="true"/>
+
+ <property name="osgi.console.useConfigAdmin" value="true"/>
+ <property name="org.osgi.framework.bsnversion" value="multiple"/>
+ <property name="osgi.clean" value="true"/>
+ </configurations>
+
+</product>
diff --git a/build-kernel/publish_resources/products/kernel/p2.inf b/build-kernel/publish_resources/products/kernel/p2.inf
new file mode 100644
index 00000000..bdbdfc74
--- /dev/null
+++ b/build-kernel/publish_resources/products/kernel/p2.inf
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+# Borislav Kapukaranov - initial contribution
+###############################################################################
+requires.0.name = base.product
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.range = 0.0.0
diff --git a/build-kernel/resources/About.html b/build-kernel/resources/About.html
deleted file mode 100644
index 6b10f231..00000000
--- a/build-kernel/resources/About.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0047)http://www.eclipse.org/legal/epl/longabout.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>About</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>About This Content</H2>
-
-<P>2 August 2011</P>
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <A href="http://www.eclipse.org/">http://www.eclipse.org</A>.</P>
-
-
- <H3>Third Party Content</H3>
- <P>The Content includes items that have been sourced from third parties as set out below. If you
- did not receive this Content directly from the Eclipse Foundation, the following is provided
- for informational purposes only, and you should look to the Redistributor's license for
- terms and conditions of use.</P>
-
- <h4>
- <a href="about_files/apache-v20.txt">Apache License 2.0</a>
- </h4>
- This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
- <ul>
- <li>
- Apache Commons Codec 1.3.0 - binary and source is available from the <a href="http://commons.apache.org/codec/">Apache Commons Codec project</a>
- </li>
- <li>
- Apache Felix Gogo 0.8.0 - binary and source is available from the <a href="http://felix.apache.org">Apache Felix project</a>
- </li>
- <li>
- Apache HttpClient 3.1.0 - binary and source is available from the <a href="http://hc.apache.org/httpclient-3.x/">Apache HttpClient project</a>
- </li>
- <li>
- Apache MINA Core 2.0.2 - binary and source is available from the <a href="http://mina.apache.org/">Apache MINA project</a>
- </li>
- <li>
- Apache MINA SSHD Core 0.5.0 - binary and source is available from the <a href="http://mina.apache.org/">Apache MINA project</a>
- </li>
- <li>
- Spring Dynamic Modules 1.2.1 - binary and source is available from the
- <a href="http://www.springsource.org/osgi">Spring Dynamic Modules project</a>
- </li>
- <li>
- Spring Framework 3.0.5.RELEASE - binary and source is available from the
- <a href="http://www.springsource.com/download/community">Spring Framework project</a>
- </li>
- </ul>
- <h4>
- <a href="about_files/LICENSE-AspectJ.html">AspectJ License</a>
- </h4>
- <ul>
- <li>
- AspectJ Weaver 1.6.6 - binary and source is available from the <a href="http://eclipse.org/aspectj">AspectJ project</a>
- </li>
- </ul>
- <h4>
- <a href="about_files/asm.txt">ASM License</a>
- </h4>
- <ul>
- <li>
- ASM 1.5.3 - binary and source is available from the <a href="http://asm.ow2.org/">ASM project</a>
- </li>
- </ul>
- <h4>
- <a href="epl-v10.html">Eclipse Public License 1.0</a>
- </h4>
- <ul>
- <li>
- Logback 0.9.24 - binary and source is available from the
- <a href="http://logback.qos.ch/">Logback project</a> (Dual-licensed EPL or LGPL. Virgo elects to use EPL.)
- </li>
- </ul>
- <h4>
- <a href="http://en.wikipedia.org/wiki/Public_domain">Public Domain</a>
- </h4>
- <ul>
- <li>
- AOP Alliance 1.0.0 - binary and source is available from the
- <a href="http://aopalliance.sourceforge.net/">AOP Alliance project</a>
- </li>
- </ul>
- <h4>
- <a href="about_files/slf4j.txt">SLF4J License</a>
- </h4>
- <ul>
- <li>
- Simple Logging Facade for Java (SLF4J) 1.6.1 - binary and source is available from the
- <a href="http://www.slf4j.org/">SLF4J Project</a>
- </li>
- </ul>
-
-</BODY></HTML> \ No newline at end of file
diff --git a/build-kernel/resources/about_files/LICENSE-AspectJ.html b/build-kernel/resources/about_files/LICENSE-AspectJ.html
deleted file mode 100644
index 8f7d0a46..00000000
--- a/build-kernel/resources/about_files/LICENSE-AspectJ.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-
-<head>
-<title>AspectJ License</title>
-
-
-</head>
-
-<BODY BGCOLOR="white">
-
-<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
- Compiler and Core Tools License</b></h2>
-
-<p>This is a binary-only release.&nbsp; Source code
-is available from
-<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>
-
-<p>The Eclipse Foundation makes available all content in this distribution ("Content").
- Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
- Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
- at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
- <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
- being redistributed by another party ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the Redistributor's license
- that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
- indicated below, the terms and conditions of the EPL still apply to any source code in the Content
- and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-
- <h3>Third Party Content</h3>
- <p>The Content includes items that have been sourced from third parties as set out below. If you
- did not receive this Content directly from the Eclipse Foundation, the following is provided
- for informational purposes only, and you should look to the Redistributor?s license for
- terms and conditions of use.</p>
- <em>
-
- <h4>BCEL v5.1</h4>
- <p>This product contains software developed by the
- Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
-
- <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
- BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
- code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
- is made available under the Apache Software License v1.1</p>
-
- <h4>ASM v2.2.1</h4>
- <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
- The source code for ASM is available from the ObjectWeb download site at
- <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>.
- <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>.
- The license is also reproduced here:
- </p>
-
-<pre>Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-</em>
-
-</body>
-
-</html>
diff --git a/build-kernel/resources/about_files/apache-v20.txt b/build-kernel/resources/about_files/apache-v20.txt
deleted file mode 100644
index d6456956..00000000
--- a/build-kernel/resources/about_files/apache-v20.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/build-kernel/resources/about_files/asm.txt b/build-kernel/resources/about_files/asm.txt
deleted file mode 100644
index 75ad085e..00000000
--- a/build-kernel/resources/about_files/asm.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/build-kernel/resources/about_files/slf4j.txt b/build-kernel/resources/about_files/slf4j.txt
deleted file mode 100644
index 371607c2..00000000
--- a/build-kernel/resources/about_files/slf4j.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/build-kernel/resources/notice.html b/build-kernel/resources/notice.html
deleted file mode 100644
index 0ee73f45..00000000
--- a/build-kernel/resources/notice.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<TITLE>Eclipse Foundation Software User Agreement</TITLE>
-</HEAD><BODY lang="EN-US">
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>April 14, 2010</P>
-
-<H3>Usage Of Content</H3>
-
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</P>
-
-<H3>Applicable Licenses</H3>
-
-<P>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
- For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</P>
-
-<UL>
- <LI>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</LI>
- <LI>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</LI>
- <LI>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</LI>
- <LI>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</LI>
-</UL>
-
-<P>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</P>
-
-<UL>
- <LI>The top-level (root) directory</LI>
- <LI>Plug-in and Fragment directories</LI>
- <LI>Inside Plug-ins and Fragments packaged as JARs</LI>
- <LI>Sub-directories of the directory named "src" of certain Plug-ins</LI>
- <LI>Feature directories</LI>
-</UL>
-
-<P>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</P>
-
-<P>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-
-<UL>
- <LI>Common Public License Version 1.0 (available at <A href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)</LI>
- <LI>Apache Software License 1.1 (available at <A href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)</LI>
- <LI>Apache Software License 2.0 (available at <A href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)</LI>
- <LI>Metro Link Public License 1.00 (available at <A href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)</LI>
- <LI>Mozilla Public License Version 1.1 (available at <A href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)</LI>
-</UL>
-
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</P>
-
-
-<H3>Use of Provisioning Technology</H3>
-
-<P>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <A href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</A>
- ("Specification").</P>
-
-<P>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</P>
-
-<OL>
- <LI>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</LI>
- <LI>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</LI>
- <LI>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</LI>
-</OL>
-
-<H3>Cryptography</H3>
-
-<P>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</P>
-
-<P><SMALL>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</SMALL></P>
-
-
-</BODY></HTML> \ No newline at end of file
diff --git a/build.versions b/build.versions
index e3062d45..15b1c6ff 100644
--- a/build.versions
+++ b/build.versions
@@ -21,6 +21,9 @@ com.springsource.org.apache.sshd.core=0.5.0
org.apache.felix.gogo.shell=0.8.0.v201107131313
org.apache.felix.gogo.runtime=0.8.0.v201105062003
org.apache.felix.gogo.command=0.8.0.v201105062003
+org.eclipse.virgo.nano=3.1.0.BUILD-20111220092557
+org.eclipse.virgo.build.tools=1.0.0.RELEASE
+org.eclipse.equinox.launcher=1.3.0.v20111003-1644
# Test
org.springframework.old=2.5.6.SEC01
diff --git a/build-kernel/lib/java6-server.profile b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
index 72c7529e..72c7529e 100644
--- a/build-kernel/lib/java6-server.profile
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index 2399c6cb..67e028fe 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -61,7 +61,7 @@ gosh.args=--nointeractive
org.apache.felix.eventadmin.Timeout=0
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index e144a708..66475bfb 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -61,7 +61,7 @@ gosh.args=--nointeractive
org.apache.felix.eventadmin.Timeout=0
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index d4083991..ac665d22 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -59,7 +59,7 @@ osgi.console.ssh.useDefaultSecureStorage=true
osgi.console.useConfigAdmin=true
gosh.args=--nointeractive
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile
new file mode 100644
index 00000000..72c7529e
--- /dev/null
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile
@@ -0,0 +1,207 @@
+org.osgi.framework.system.packages = \
+ javax.accessibility,\
+ javax.activation,\
+ javax.activation;version="1.1.1",\
+ javax.activity,\
+ javax.annotation,\
+ javax.annotation;version="1.0.0",\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.jws,\
+ javax.jws;version="2.0",\
+ javax.jws.soap,\
+ javax.jws.soap;version="2.0",\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.script;version="1.1",\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction,\
+ javax.transaction;version="1.0.1",\
+ javax.transaction;version="1.1.0",\
+ javax.transaction.xa,\
+ javax.transaction.xa;version="1.0.1",\
+ javax.transaction.xa;version="1.1.0",\
+ javax.xml,\
+ javax.xml;version="1.0.1",\
+ javax.xml.bind,\
+ javax.xml.bind;version="2.0",\
+ javax.xml.bind.annotation,\
+ javax.xml.bind.annotation;version="2.0",\
+ javax.xml.bind.annotation.adapters,\
+ javax.xml.bind.annotation.adapters;version="2.0",\
+ javax.xml.bind.attachment,\
+ javax.xml.bind.attachment;version="2.0",\
+ javax.xml.bind.helpers,\
+ javax.xml.bind.helpers;version="2.0",\
+ javax.xml.bind.util,\
+ javax.xml.bind.util;version="2.0",\
+ javax.xml.crypto,\
+ javax.xml.crypto;version="1.0",\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dom;version="1.0",\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig;version="1.0",\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.dom;version="1.0",\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.keyinfo;version="1.0",\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.crypto.dsig.spec;version="1.0",\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.soap,\
+ javax.xml.soap;version="1.3.0",\
+ javax.xml.stream,\
+ javax.xml.stream;version="1.0.1",\
+ javax.xml.stream.events,\
+ javax.xml.stream.events;version="1.0.1",\
+ javax.xml.stream.util,\
+ javax.xml.stream.util;version="1.0.1",\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.ws,\
+ javax.xml.ws;version="2.1.1",\
+ javax.xml.ws.handler,\
+ javax.xml.ws.handler;version="2.1.1",\
+ javax.xml.ws.handler.soap,\
+ javax.xml.ws.handler.soap;version="2.1.1",\
+ javax.xml.ws.http,\
+ javax.xml.ws.http;version="2.1.1",\
+ javax.xml.ws.soap,\
+ javax.xml.ws.soap;version="2.1.1",\
+ javax.xml.ws.spi,\
+ javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.xpath,\
+ org.ietf.jgss,\
+ org.omg.CORBA,\
+ org.omg.CORBA_2_3,\
+ org.omg.CORBA_2_3.portable,\
+ org.omg.CORBA.DynAnyPackage,\
+ org.omg.CORBA.ORBPackage,\
+ org.omg.CORBA.portable,\
+ org.omg.CORBA.TypeCodePackage,\
+ org.omg.CosNaming,\
+ org.omg.CosNaming.NamingContextExtPackage,\
+ org.omg.CosNaming.NamingContextPackage,\
+ org.omg.Dynamic,\
+ org.omg.DynamicAny,\
+ org.omg.DynamicAny.DynAnyFactoryPackage,\
+ org.omg.DynamicAny.DynAnyPackage,\
+ org.omg.IOP,\
+ org.omg.IOP.CodecFactoryPackage,\
+ org.omg.IOP.CodecPackage,\
+ org.omg.Messaging,\
+ org.omg.PortableInterceptor,\
+ org.omg.PortableInterceptor.ORBInitInfoPackage,\
+ org.omg.PortableServer,\
+ org.omg.PortableServer.CurrentPackage,\
+ org.omg.PortableServer.POAManagerPackage,\
+ org.omg.PortableServer.POAPackage,\
+ org.omg.PortableServer.portable,\
+ org.omg.PortableServer.ServantLocatorPackage,\
+ org.omg.SendingContext,\
+ org.omg.stub.java.rmi,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views ,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers
+org.osgi.framework.bootdelegation = \
+ org.eclipse.virgo.osgi.extensions.*,\
+ org.eclipse.virgo.osgi.launcher.*,\
+ org.eclipse.virgo.kernel.authentication,\
+ com.sun.*,\
+ javax.xml.*,\
+ org.apache.xerces.jaxp.*,\
+ org.w3c.*,\
+ org.xml.*,\
+ sun.*
+org.osgi.framework.executionenvironment = \
+ OSGi/Minimum-1.0,\
+ OSGi/Minimum-1.1,\
+ J2SE-1.3,\
+ J2SE-1.4,\
+ J2SE-1.5,\
+ JavaSE-1.6
+osgi.java.profile.name = Virgo-Kernel-Java6
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index 9150af20..358ade14 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -59,7 +59,7 @@ osgi.console.ssh.useDefaultSecureStorage=true
osgi.console.useConfigAdmin=true
gosh.args=--nointeractive
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
index fa7a6681..3f03327e 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
+++ b/org.eclipse.virgo.kernel.userregionfactory/src/main/java/org/eclipse/virgo/kernel/userregionfactory/Activator.java
@@ -44,7 +44,6 @@ import org.eclipse.virgo.util.osgi.manifest.ImportedPackage;
import org.eclipse.virgo.util.osgi.manifest.RequireBundle;
import org.eclipse.virgo.util.osgi.manifest.RequiredBundle;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -52,6 +51,7 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.Version;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -64,7 +64,7 @@ import org.osgi.service.event.EventAdmin;
* Not thread safe.
*
*/
-public final class Activator implements BundleActivator {
+public final class Activator {
private static final String KERNEL_REGION_NAME = "org.eclipse.equinox.region.kernel";
@@ -119,9 +119,8 @@ public final class Activator implements BundleActivator {
/**
* {@inheritDoc}
*/
- @Override
- public void start(BundleContext bundleContext) throws Exception {
- this.bundleContext = bundleContext;
+ public void activate(ComponentContext componentContext) throws Exception {
+ this.bundleContext = componentContext.getBundleContext();
this.dumpGenerator = getPotentiallyDelayedService(bundleContext, DumpGenerator.class);
RegionDigraph regionDigraph = getPotentiallyDelayedService(bundleContext, RegionDigraph.class);
this.eventAdmin = getPotentiallyDelayedService(bundleContext, EventAdmin.class);
@@ -367,8 +366,7 @@ public final class Activator implements BundleActivator {
/**
* {@inheritDoc}
*/
- @Override
- public void stop(BundleContext context) throws Exception {
+ public void deactivate(ComponentContext context) throws Exception {
}
private static <T> T getPotentiallyDelayedService(BundleContext context, Class<T> serviceClass) throws TimeoutException, InterruptedException {
@@ -397,4 +395,4 @@ public final class Activator implements BundleActivator {
Thread.sleep(100);
return System.currentTimeMillis() - before;
}
-}
+} \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.userregionfactory/src/main/resources/OSGI-INF/userregionfactory.xml b/org.eclipse.virgo.kernel.userregionfactory/src/main/resources/OSGI-INF/userregionfactory.xml
new file mode 100644
index 00000000..0f6b3db0
--- /dev/null
+++ b/org.eclipse.virgo.kernel.userregionfactory/src/main/resources/OSGI-INF/userregionfactory.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="User Region Factory Component">
+ <implementation class="org.eclipse.virgo.kernel.userregionfactory.Activator"/>
+ <reference name="EventLogger"
+ interface="org.eclipse.virgo.medic.eventlog.EventLogger"
+ policy="static"/>
+ <reference name="DumpGenerator"
+ interface="org.eclipse.virgo.medic.dump.DumpGenerator"
+ policy="static"/>
+ <reference name="ConfigAdmin"
+ interface="org.osgi.service.cm.ConfigurationAdmin"
+ policy="static"/>
+ <reference name="EventAdmin"
+ interface="org.osgi.service.event.EventAdmin"
+ policy="static"/>
+ <reference name="Shutdown"
+ interface="org.eclipse.virgo.kernel.core.Shutdown"
+ policy="static"/>
+ <reference name="RegionDigraph"
+ interface="org.eclipse.equinox.region.RegionDigraph"
+ policy="static"/>
+ <reference name="Repository"
+ interface="org.eclipse.virgo.repository.Repository"
+ policy="static"/>
+</scr:component> \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.userregionfactory/template.mf b/org.eclipse.virgo.kernel.userregionfactory/template.mf
index 2e3e1a71..82c39394 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/template.mf
+++ b/org.eclipse.virgo.kernel.userregionfactory/template.mf
@@ -2,6 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Kernel User Region Factory
Bundle-SymbolicName: org.eclipse.virgo.kernel.userregionfactory
+Service-Component: OSGI-INF/userregionfactory.xml
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
@@ -13,7 +14,6 @@ Import-Template:
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}"
Import-Package: org.aspectj.lang;version="0"
-Bundle-Activator: org.eclipse.virgo.kernel.userregionfactory.Activator
Excluded-Imports: org.easymock,
org.eclipse.virgo.osgi.launcher.*,
org.eclipse.virgo.teststubs.*

Back to the top