Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'build-kernel')
-rw-r--r--[-rwxr-xr-x]build-kernel/bin/dmk.bat549
-rw-r--r--build-kernel/bin/setupClasspath.bat11
-rw-r--r--build-kernel/build.xml544
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.userregion.properties4
-rw-r--r--build-kernel/kernel-ivy.xml2
-rw-r--r--build-kernel/lib-ivy.xml3
-rw-r--r--build-kernel/lib/org.eclipse.virgo.kernel.launch.properties162
-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/p2_resources/config.ini6
-rw-r--r--build-kernel/p2build-ivy.xml17
-rw-r--r--build-kernel/p2runtime-ivy.xml60
-rw-r--r--build-kernel/user-ivy.xml18
16 files changed, 775 insertions, 956 deletions
diff --git a/build-kernel/bin/dmk.bat b/build-kernel/bin/dmk.bat
index eabefdd8..4eeaefb2 100755..100644
--- a/build-kernel/bin/dmk.bat
+++ b/build-kernel/bin/dmk.bat
@@ -1,273 +1,276 @@
-@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% -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
+@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% -Declipse.ignoreApp=true
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.configuration.area="%KERNEL_HOME%\work\osgi\configuration"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.instance.area="%KERNEL_HOME%\work"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.install.area="%KERNEL_HOME%\lib\kernel"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.frameworkClassPath="%FWCLASSPATH%"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%KERNEL_HOME%\lib\java6-server.profile"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.equinox.launcher.Main
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %LAUNCH_OPTS%
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %ADDITIONAL_ARGS%
+
+ rem Now run it
+ PUSHD %KERNEL_HOME%
+ "%JAVA_HOME%\bin\java" %KERNEL_JAVA_PARMS%
+ POPD
+
+goto :eof
+
+rem ------------------------------
+:doStopCommand
+
+ shift
+ rem The shift must be here :()
+
+ rem Set defaults
+ set CONFIG_DIR=%KERNEL_HOME%\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/setupClasspath.bat b/build-kernel/bin/setupClasspath.bat
index da833b91..35df5147 100644
--- a/build-kernel/bin/setupClasspath.bat
+++ b/build-kernel/bin/setupClasspath.bat
@@ -11,17 +11,24 @@ if "%KERNEL_HOME%" == "" (
rem Construct the CLASSPATH list from the Kernel lib directory.
for %%G in ("%KERNEL_HOME%\lib\*.jar") do call :AppendToClasspath "%%G"
-
+for %%G in ("%KERNEL_HOME%\lib\kernel\plugins\org.eclipse.osgi_*.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 "%FWCLASSPATH%" == "" (
+ echo No JAR files found in %KERNEL_HOME%\lib
+ exit /B 1
+)
+
+rem Remove leading semi-colon or coma if present
if "%CLASSPATH:~0,1%"==";" set CLASSPATH=%CLASSPATH:~1%
+if "%FWCLASSPATH:~0,1%"=="," set FWCLASSPATH=%FWCLASSPATH:~1%
exit /B 0
:AppendToClasspath
set CLASSPATH=%CLASSPATH%;%~1
+ set FWCLASSPATH=%FWCLASSPATH%,file:///%~1
goto :eof
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index f1e14ad4..8590509f 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -1,259 +1,285 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"/>
- <pathelement location="../org.eclipse.virgo.kernel.osgi"/>
- <pathelement location="../org.eclipse.virgo.kernel.deployer"/>
- <pathelement location="../org.eclipse.virgo.kernel.userregionfactory"/>
- <pathelement location="../org.eclipse.virgo.kernel.userregion"/>
- <pathelement location="../org.eclipse.virgo.kernel.agent.dm"/>
- <pathelement location="../org.eclipse.virgo.kernel.kerneldmfragment"/>
- <pathelement location="../org.eclipse.virgo.kernel.dmfragment"/>
- <pathelement location="../org.eclipse.virgo.kernel.deployer.dm"/>
- <pathelement location="../org.eclipse.virgo.kernel.model"/>
- <pathelement location="../org.eclipse.virgo.kernel.shell"/>
- <pathelement location="../org.eclipse.virgo.kernel.osgicommand"/>
- <pathelement location="../org.eclipse.virgo.kernel.stubs"/>
- </path>
-
- <path id="bundles">
- <path refid="unit.test.bundles" />
- <pathelement location="../org.eclipse.virgo.kernel"/>
- <pathelement location="../org.eclipse.virgo.kernel.test"/>
- <pathelement location="../org.eclipse.virgo.kernel.deployer.testbundle"/>
- <pathelement location="../org.eclipse.virgo.kernel.deployer.test"/>
- </path>
-
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
-
- <!--P2 publishing properties-->
- <property name="publishing.dir" value="${basedir}/target/repository"/>
- <property name="distro.res" value="${basedir}/distro_resources"/>
- <property name="p2.repo.url" value="file:///${publishing.dir}"/>
- <property name="product.file" value="${basedir}/org.eclipse.virgo.kernel.product"/>
- <property name="lib.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.product"/>
- <property name="lib.kernel.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.kernel.product"/>
- <property name="repository.ext.product.file" value="${basedir}/org.eclipse.virgo.kernel.repository.ext.product"/>
-
- <target name="precommit" depends="clean, clean-integration, test, findbugs, package, smoke-test"
- description="Performs a CI server-like build, should be run prior to performing a Git push"/>
-
- <target name="package" depends="ivy.init">
- <delete dir="${package.output.dir}" quiet="true"/>
- <mkdir dir="${package.output.dir}"/>
-
- <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: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"/>
-
- <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-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>
-
- <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}"/>
- </filterset>
- </copy>
-
- <copy todir="${package.output.dir}/config" failonerror="false">
- <fileset dir="${basedir}/config" excludes="keystore"/>
- <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="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}"/>
- </filterset>
- </copy>
-
- <copy todir="${package.output.dir}/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"/>
- </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"/>
- </fileset>
- </move>
-
- <mkdir dir="${package.output.dir}/repository/usr"/>
-
- <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}"/>
- <zip destfile="${package.output.file}">
- <zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
- <zipfileset dir="${package.dir}" includes="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
- <zipfileset dir="${package.dir}">
- <exclude name="${package.basename}/bin/*.sh"/>
- <exclude name="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- </zipfileset>
- </zip>
- </target>
-
- <target name="smoke-test" description="Runs a smoke test on the kernel packaged build">
- <path id="smoke.test.bundles">
- <pathelement location="${basedir}/../org.eclipse.virgo.kernel.smoketest" />
- </path>
- <antcall target="test.pre"/>
- <all-bundles target="test-package" buildpathRef="smoke.test.bundles">
- <property name="package.output.file" value="${package.output.file}"/>
- <property name="package.basename" value="${package.basename}"/>
- </all-bundles>
- <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>
+<?xml version="1.0" encoding="UTF-8"?>
+<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"/>
+ <pathelement location="../org.eclipse.virgo.kernel.osgi"/>
+ <pathelement location="../org.eclipse.virgo.kernel.deployer"/>
+ <pathelement location="../org.eclipse.virgo.kernel.deployer.p2"/>
+ <pathelement location="../org.eclipse.virgo.kernel.build.p2"/>
+ <pathelement location="../org.eclipse.virgo.kernel.userregionfactory"/>
+ <pathelement location="../org.eclipse.virgo.kernel.userregion"/>
+ <pathelement location="../org.eclipse.virgo.kernel.agent.dm"/>
+ <pathelement location="../org.eclipse.virgo.kernel.kerneldmfragment"/>
+ <pathelement location="../org.eclipse.virgo.kernel.dmfragment"/>
+ <pathelement location="../org.eclipse.virgo.kernel.deployer.dm"/>
+ <pathelement location="../org.eclipse.virgo.kernel.model"/>
+ <pathelement location="../org.eclipse.virgo.kernel.shell"/>
+ <pathelement location="../org.eclipse.virgo.kernel.osgicommand"/>
+ <pathelement location="../org.eclipse.virgo.kernel.stubs"/>
+ </path>
+
+ <path id="bundles">
+ <path refid="unit.test.bundles" />
+ <pathelement location="../org.eclipse.virgo.kernel"/>
+ <pathelement location="../org.eclipse.virgo.kernel.test"/>
+ <pathelement location="../org.eclipse.virgo.kernel.deployer.testbundle"/>
+ <pathelement location="../org.eclipse.virgo.kernel.deployer.test"/>
+ </path>
+
+ <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+
+ <!--P2 publishing properties-->
+ <property name="publishing.dir" value="${basedir}/target/repository"/>
+ <property name="distro.res" value="${basedir}/distro_resources"/>
+ <property name="p2.repo.url" value="file:///${publishing.dir}"/>
+ <property name="product.file" value="${basedir}/org.eclipse.virgo.kernel.product"/>
+ <property name="lib.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.product"/>
+ <property name="lib.kernel.product.file" value="${basedir}/org.eclipse.virgo.kernel.lib.kernel.product"/>
+ <property name="repository.ext.product.file" value="${basedir}/org.eclipse.virgo.kernel.repository.ext.product"/>
+
+ <target name="precommit" depends="clean, clean-integration, test, findbugs, package, smoke-test"
+ description="Performs a CI server-like build, should be run prior to performing a Git push"/>
+
+ <target name="package" depends="ivy.init">
+ <delete dir="${basedir}/p2" quiet="true"/>
+ <mkdir dir="${basedir}/p2"/>
+
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
+
+ <!-- Prepare the p2 build client -->
+ <ivy:resolve resolveId="copy.path" file="${basedir}/p2runtime-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${basedir}/p2/[artifact]_[revision].[ext]" conf="p2-runtime" type="jar"/>
+
+ <ivy:resolve resolveId="copy.path" file="${basedir}/p2build-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${basedir}/p2/[artifact]_[revision].[ext]" conf="p2-build" type="jar"/>
+
+ <copy todir="${basedir}/p2/configuration" failonerror="false">
+ <fileset dir="${basedir}/p2_resources" excludes="keystore"/>
+ <filterset>
+ <filter token="SIMPLE.CONFIG.VERSION" value="${org.eclipse.equinox.simpleconfigurator}"/>
+ </filterset>
+ </copy>
+ <java jar="${basedir}/p2/org.eclipse.virgo.kernel.build.p2_${bundle.version}.jar" fork="true" taskname="BundlesInfoBuilder" failonerror="true" maxmemory="256m">
+ <arg value="${basedir}"/>
+ </java>
+
+ <!-- Assemble artifacts -->
+ <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${package.dir}/zip/repository/ext/[artifact]_[revision].[ext]" conf="repository-ext" type="jar"/>
+
+ <ivy:resolve resolveId="copy.path" file="${basedir}/lib-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${package.dir}/zip/lib/[artifact]_[revision].[ext]" conf="lib" type="jar"/>
+
+ <ivy:resolve resolveId="copy.path" file="${basedir}/user-ivy.xml" transitive="false"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${package.dir}/zip/lib/user/[artifact]_[revision].[ext]" conf="lib-user" type="jar"/>
+
+ <!-- Copy the kernel artifacts to a prepared for publishing location - a p2 repo will be built around them -->
+ <ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${target.dir}/p2repo/[artifact]_[revision].[ext]" conf="lib-kernel" type="jar"/>
+
+ <ivy:resolve resolveId="copy.path" file="${basedir}/p2runtime-ivy.xml" transitive="true"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${target.dir}/p2repo/[artifact]_[revision].[ext]" conf="p2-runtime" type="jar"/>
+
+ <mkdir dir="${package.dir}/zip/config"/>
+ <mkdir dir="${package.dir}/zip/pickup"/>
+
+ <echo file="${package.dir}/zip/lib/.version"
+ message="virgo.kernel.version=${bundle.version}&#xa;"/>
+
+ <copy todir="${package.dir}/zip" failonerror="false">
+ <fileset dir="${basedir}/resources"/>
+ </copy>
+
+ <copy todir="${package.dir}/zip/bin" failonerror="false">
+ <fileset dir="${basedir}/bin"/>
+ </copy>
+
+ <copy todir="${package.dir}/zip/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="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="CORE.CONTENTTYPE" value="${org.eclipse.core.contenttype}"/>
+ <filter token="CORE.JOBS" value="${org.eclipse.core.jobs}"/>
+ <filter token="CORE.RUNTIME" value="${org.eclipse.core.runtime}"/>
+ <filter token="ECF" value="${org.eclipse.ecf}"/>
+ <filter token="ECF.FILETRANSFER" value="${org.eclipse.ecf.filetransfer}"/>
+ <filter token="ECF.IDENTITY" value="${org.eclipse.ecf.identity}"/>
+ <filter token="ECF.PROVIDER.FILETRANSFER" value="${org.eclipse.ecf.provider.filetransfer}"/>
+ <filter token="ECF.PROVIDER.FILETRANSFER.SSL" value="${org.eclipse.ecf.provider.filetransfer.ssl}"/>
+ <filter token="ECF.SSL" value="${org.eclipse.ecf.ssl}"/>
+ <filter token="EQUINOX.APP" value="${org.eclipse.equinox.app}"/>
+ <filter token="EQUINOX.COMMON" value="${org.eclipse.equinox.common}"/>
+ <filter token="EQUINOX.FRAMEWORKADMIN" value="${org.eclipse.equinox.frameworkadmin}"/>
+ <filter token="EQUINOX.FRAMEWORKADMIN.EQUINOX" value="${org.eclipse.equinox.frameworkadmin.equinox}"/>
+ <filter token="EQUINOX.LAUNCHER" value="${org.eclipse.equinox.launcher}"/>
+ <filter token="EQUINOX.P2.ARTIFACT.REPOSITORY" value="${org.eclipse.equinox.p2.artifact.repository}"/>
+ <filter token="EQUINOX.P2.CONSOLE" value="${org.eclipse.equinox.p2.console}"/>
+ </filterset>
+ </copy>
+
+ <copy todir="${package.dir}/zip/config" failonerror="false">
+ <fileset dir="${basedir}/config" excludes="keystore"/>
+ <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="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}"/>
+ </filterset>
+ </copy>
+
+ <copy todir="${package.dir}/zip/repository/ext" failonerror="false">
+ <fileset dir="${basedir}/repository/ext"/>
+ </copy>
+
+ <copy todir="${package.dir}/zip/repository/ext" failonerror="false">
+ <fileset dir="${target.dir}/p2repo">
+ <include name="org.eclipse.virgo.kernel.agent.dm_*.jar"/>
+ </fileset>
+ </copy>
+
+ <move todir="${package.dir}/zip/repository/ext" failonerror="false">
+ <fileset dir="${target.dir}/p2repo">
+ <include name="org.eclipse.virgo.kernel.dmfragment_*.jar"/>
+ <include name="org.eclipse.virgo.kernel.deployer.dm_*.jar"/>
+ </fileset>
+ </move>
+
+ <mkdir dir="${package.dir}/zip/repository/usr"/>
+
+ <copy file="${basedir}/config/keystore" todir="${package.output.dir}/config" failonerror="false"/>
+
+ <chmod perm="600">
+ <fileset dir="${package.dir}/zip/config">
+ <include name="org.eclipse.virgo.kernel.jmxremote.access.properties"/>
+ </fileset>
+ </chmod>
+
+ <chmod perm="755">
+ <fileset dir="${package.dir}/zip/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- zip the published Virgo repositories and configuration data -->
+ <zip destfile="${target.dir}/p2repo/virgo_resources.zip">
+ <zipfileset dir="${package.dir}/zip"/>
+ </zip>
+
+ <delete dir="${package.dir}/zip" quiet="true"/>
+
+ <!-- execute product publisher -->
+ <echo message="Publishing Virgo kernel product in p2 repository" />
+ <java jar="${basedir}/p2/org.eclipse.osgi_3.7.0.v20110224.jar" fork="true" taskname="p2ProductPublishing" failonerror="true" maxmemory="256m">
+ <sysproperty key="operationType" value="p2repoPublish"/>
+ <sysproperty key="launch.config.location" value="${basedir}/lib/org.eclipse.virgo.kernel.launch.properties"/>
+ <sysproperty key="product.location" value="${target.dir}/p2repo"/>
+ </java>
+
+ <!-- execute product install -->
+ <echo message="Installing Virgo product to get the final assembly of Virgo kernel" />
+ <java jar="${basedir}/p2/org.eclipse.osgi_3.7.0.v20110224.jar" fork="true" taskname="p2ProductInstall" failonerror="true" maxmemory="256m">
+ <sysproperty key="operationType" value="installKernel"/>
+ <sysproperty key="source.p2.repo" value="file:${target.dir}/p2repo"/>
+ <sysproperty key="install.location" value="${package.output.dir}"/>
+ <sysproperty key="installIU" value="virgo.product"/>
+ <sysproperty key="profile" value="VIRGO.kernel"/>
+ </java>
+
+ <mkdir dir="${artifacts.dir}"/>
+ <zip destfile="${package.output.file}">
+ <zipfileset dir="${package.dir}" includes="${package.basename}/bin/*.sh" filemode="755"/>
+ <zipfileset dir="${package.dir}" includes="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties" filemode="600"/>
+ <zipfileset dir="${package.dir}">
+ <exclude name="${package.basename}/bin/*.sh"/>
+ <exclude name="${package.basename}/config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <target name="smoke-test" description="Runs a smoke test on the kernel packaged build">
+ <path id="smoke.test.bundles">
+ <pathelement location="${basedir}/../org.eclipse.virgo.kernel.smoketest" />
+ </path>
+ <antcall target="test.pre"/>
+ <all-bundles target="test-package" buildpathRef="smoke.test.bundles">
+ <property name="package.output.file" value="${package.output.file}"/>
+ <property name="package.basename" value="${package.basename}"/>
+ </all-bundles>
+ <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>
+
+ </target>
+
+</project>
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
index ba99487d..15a068b4 100644
--- a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,6 +1,6 @@
baseBundles = \
- 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/user/org.eclipse.virgo.kernel.userregion_@KERNEL.VERSION@.jar@start,\
+ file:lib/user/org.eclipse.virgo.kernel.osgicommand_@KERNEL.VERSION@.jar@start
bundleImports = org.eclipse.osgi;bundle-version="0"
diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index 558022d7..349a5941 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -13,7 +13,6 @@
<dependencies>
<!-- lib/kernel -->
<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.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregionfactory" 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.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="lib-kernel->runtime"/>
@@ -42,6 +41,7 @@
<exclude org="org.jboss.vfs"/>
<exclude org="org.apache.commons" module="com.springsource.org.apache.commons.logging"/>
<exclude org="org.springframework" module="org.springframework.context.support"/>
+ <exclude org="org.eclipse.virgo.kernel" module="org.eclipse.virgo.kernel.userregion"/>
<override org="org.eclipse.virgo.util" rev="${org.eclipse.virgo.util}"/>
<override org="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}"/>
diff --git a/build-kernel/lib-ivy.xml b/build-kernel/lib-ivy.xml
index 896e0c3e..88d0652f 100644
--- a/build-kernel/lib-ivy.xml
+++ b/build-kernel/lib-ivy.xml
@@ -17,6 +17,9 @@
<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.launcher" rev="${org.eclipse.equinox.launcher}" conf="lib->runtime"/>
+
+ <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
index 6444e00b..8b91bea9 100644
--- a/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
+++ b/build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
@@ -1,64 +1,98 @@
-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/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.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
-
-#Equinox Configuration
-osgi.parentClassloader=fwk
-osgi.context.bootdelegation=false
-osgi.compatibility.bootdelegation=false
-osgi.clean=true
-org.osgi.framework.bsnversion=multiple
-
-# osgi console support
-# osgi.console=2401
-
-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.osgi.console.telnet.hook.TelnetHookConfigurator
-
-org.eclipse.virgo.medic.log.config.path=config/serviceability.xml
-org.eclipse.virgo.suppress.heap.dumps=false
-
-eclipse.bundle.setTCCL=false
-eclipse.enableStateSaver=false
+launcher.bundles =\
+ org.eclipse.equinox.region_@EQUINOX.REGION.VERSION@.jar@start,\
+ com.springsource.slf4j.api_@SLF4J.VERSION@.jar@start,\
+ com.springsource.slf4j.org.apache.commons.logging_@SLF4J.VERSION@.jar@start,\
+ com.springsource.org.aspectj.weaver_@ASPECTJ.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.deployer_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.medic_@MEDIC.VERSION@.jar@start,\
+ org.eclipse.osgi.services_@OSGI.SERVICES.VERSION@.jar@start,\
+ org.eclipse.equinox.cm_@EQUINOX.CONFIGADMIN.VERSION@.jar@start,\
+ org.eclipse.virgo.medic.core_@MEDIC.VERSION@.jar@start,\
+ org.eclipse.virgo.util.osgi_@UTIL.VERSION@.jar@start,\
+ org.eclipse.equinox.event_@EQUINOX.EVENT.VERSION@.jar@start,\
+ org.eclipse.virgo.util.common_@UTIL.VERSION@.jar@start,\
+ org.eclipse.virgo.util.io_@UTIL.VERSION@.jar@start,\
+ org.eclipse.virgo.util.jmx_@UTIL.VERSION@.jar,\
+ org.eclipse.virgo.util.math_@UTIL.VERSION@.jar@start,\
+ org.eclipse.virgo.util.parser.manifest_@UTIL.VERSION@.jar@start,\
+ com.springsource.org.apache.commons.codec_1.3.0.jar@start,\
+ com.springsource.org.apache.commons.httpclient_3.1.0.jar@start,\
+ org.eclipse.virgo.repository_@REPOSITORY.VERSION@.jar@start,\
+ org.springframework.aop_@SPRING.VERSION@.jar,\
+ org.springframework.asm_@SPRING.VERSION@.jar,\
+ org.springframework.expression_@SPRING.VERSION@.jar,\
+ org.springframework.beans_@SPRING.VERSION@.jar,\
+ org.springframework.core_@SPRING.VERSION@.jar,\
+ org.springframework.context_@SPRING.VERSION@.jar,\
+ org.eclipse.virgo.kernel.core_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.agent.dm_@KERNEL.VERSION@.jar@start,\
+ org.springframework.osgi.core_@SPRING.DM.VERSION@.jar,\
+ org.springframework.osgi.extender_@SPRING.DM.VERSION@.jar@start,\
+ org.springframework.osgi.io_@SPRING.DM.VERSION@.jar,\
+ com.springsource.org.aopalliance_1.0.0.jar,\
+ org.eclipse.equinox.ds_@EQUINOX.DS.VERSION@.jar@start,\
+ org.eclipse.equinox.util_@EQUINOX.UTIL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.artifact_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.services_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.model_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.kerneldmfragment_@KERNEL.VERSION@.jar,\
+ org.eclipse.virgo.kernel.shell_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.osgi_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.virgo.kernel.deployer.p2_@KERNEL_VERSION@start,\
+ org.eclipse.virgo.kernel.userregionfactory_@KERNEL.VERSION@.jar@start,\
+ org.eclipse.equinox.common_3.6.0.v20110506.jar@start,\
+ org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506.jar@start,\
+ org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955.jar@start,\
+ org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar@start,\
+ org.eclipse.core.jobs_3.5.100.v20110404.jar@start,\
+ org.eclipse.core.runtime_3.7.0.v20110110.jar@start,\
+ org.eclipse.ecf_3.1.200.v20110313-1843.jar@start,\
+ org.eclipse.ecf.filetransfer_5.0.0.v20110313-1843.jar@start,\
+ org.eclipse.ecf.identity_3.1.100.v20110313-1843.jar@start,\
+ org.eclipse.ecf.provider.filetransfer_3.2.0.v20110313-1843.jar@start,\
+ org.eclipse.ecf.ssl_1.0.100.v20100906-1425.jar@start,\
+ org.eclipse.equinox.app_1.3.100.v20110321.jar,\
+ org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110511-1359.jar@start,\
+ org.eclipse.equinox.p2.console_1.0.300.v20110502-1955.jar@start,\
+ org.eclipse.equinox.p2.core_2.1.0.v20110502-1955.jar@start,\
+ org.eclipse.equinox.p2.director_2.1.0.v20110504-1715.jar,\
+ org.eclipse.equinox.p2.engine_2.1.0.v20110511.jar@start,\
+ org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510.jar,\
+ org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955.jar,\
+ org.eclipse.equinox.p2.metadata_2.1.0.v20110510.jar@start,\
+ org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110511-1359.jar@start,\
+ org.eclipse.equinox.p2.publisher_1.2.0.v20110511.jar@start,\
+ org.eclipse.equinox.p2.repository_2.1.0.v20110510.jar@start,\
+ org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110511.jar@start,\
+ org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955.jar@start,\
+ org.eclipse.equinox.p2.transport.ecf_1.0.0.v20110510.jar@start,\
+ org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955.jar@start,\
+ org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955.jar@start,\
+ org.eclipse.equinox.preferences_3.4.0.v20110502.jar@start,\
+ org.eclipse.equinox.registry_3.5.100.v20110502.jar@start,\
+ org.eclipse.equinox.security_1.1.0.v20110502.jar,\
+ org.sat4j.core_2.3.0.v20110329.jar,\
+ org.sat4j.pb_2.3.0.v20110329.jar
+
+#Equinox Configuration
+osgi.parentClassloader=fwk
+osgi.context.bootdelegation=false
+osgi.compatibility.bootdelegation=false
+osgi.clean=true
+org.osgi.framework.bsnversion=multiple
+
+# osgi console support
+# osgi.console=2401
+
+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.osgi.console.telnet.hook.TelnetHookConfigurator
+
+org.eclipse.virgo.medic.log.config.path=config/serviceability.xml
+org.eclipse.virgo.suppress.heap.dumps=false
+eclipse.bundle.setTCCL=false
+eclipse.enableStateSaver=false
+equinox.use.ds=true
+
+
+
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/p2_resources/config.ini b/build-kernel/p2_resources/config.ini
new file mode 100644
index 00000000..bb87343f
--- /dev/null
+++ b/build-kernel/p2_resources/config.ini
@@ -0,0 +1,6 @@
+osgi.bundles=reference\:file\:org.eclipse.equinox.simpleconfigurator_@SIMPLE.CONFIG.VERSION@.jar@1\:start
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:org.eclipse.equinox.simpleconfigurator/bundles.info
+equinox.use.ds=true
+osgi.clean=true
+osgi.bundles.defaultStartLevel=4
+org.osgi.framework.bootdelegation=org.xml.*,javax.xml.* \ No newline at end of file
diff --git a/build-kernel/p2build-ivy.xml b/build-kernel/p2build-ivy.xml
new file mode 100644
index 00000000..20a086fc
--- /dev/null
+++ b/build-kernel/p2build-ivy.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}" />
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ <conf name="p2-build" visibility="public" description="Dependencies to be used for p2"/>
+ </configurations>
+
+ <dependencies>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.build.p2" rev="latest.integration" conf="p2-build->runtime"/>
+ </dependencies>
+
+</ivy-module>
+
diff --git a/build-kernel/p2runtime-ivy.xml b/build-kernel/p2runtime-ivy.xml
new file mode 100644
index 00000000..617a1e40
--- /dev/null
+++ b/build-kernel/p2runtime-ivy.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}" />
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ <conf name="p2-runtime" visibility="public" description="Dependencies to be used for p2"/>
+ </configurations>
+
+ <dependencies>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.ds" rev="${org.eclipse.equinox.ds}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.core.contenttype" rev="${org.eclipse.core.contenttype}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.core.jobs" rev="${org.eclipse.core.jobs}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.core.runtime" rev="${org.eclipse.core.runtime}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.ecf" rev="${org.eclipse.ecf}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.ecf.filetransfer" rev="${org.eclipse.ecf.filetransfer}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.ecf.identity" rev="${org.eclipse.ecf.identity}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.ecf.provider.filetransfer" rev="${org.eclipse.ecf.provider.filetransfer}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.ecf.ssl" rev="${org.eclipse.ecf.ssl}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.app" rev="${org.eclipse.equinox.app}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.common" rev="${org.eclipse.equinox.common}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.frameworkadmin" rev="${org.eclipse.equinox.frameworkadmin}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.frameworkadmin.equinox" rev="${org.eclipse.equinox.frameworkadmin.equinox}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.launcher" rev="${org.eclipse.equinox.launcher}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.artifact.repository" rev="${org.eclipse.equinox.p2.artifact.repository}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.console" rev="${org.eclipse.equinox.p2.console}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.core" rev="${org.eclipse.equinox.p2.core}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.director" rev="${org.eclipse.equinox.p2.director}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.engine" rev="${org.eclipse.equinox.p2.engine}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.garbagecollector" rev="${org.eclipse.equinox.p2.garbagecollector}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.jarprocessor" rev="${org.eclipse.equinox.p2.jarprocessor}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.metadata" rev="${org.eclipse.equinox.p2.metadata}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.metadata.repository" rev="${org.eclipse.equinox.p2.metadata.repository}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.publisher" rev="${org.eclipse.equinox.p2.publisher}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.publisher.eclipse" rev="${org.eclipse.equinox.p2.publisher.eclipse}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.repository" rev="${org.eclipse.equinox.p2.repository}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.touchpoint.eclipse" rev="${org.eclipse.equinox.p2.touchpoint.eclipse}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.touchpoint.natives" rev="${org.eclipse.equinox.p2.touchpoint.natives}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.p2.transport.ecf" rev="${org.eclipse.equinox.p2.transport.ecf}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.preferences" rev="${org.eclipse.equinox.preferences}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.registry" rev="${org.eclipse.equinox.registry}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.security" rev="${org.eclipse.equinox.security}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.simpleconfigurator" rev="${org.eclipse.equinox.simpleconfigurator}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.simpleconfigurator.manipulator" rev="${org.eclipse.equinox.simpleconfigurator.manipulator}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.artifact" rev="latest.integration" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util.osgi}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util.io}" conf="p2-runtime->runtime"/>
+ <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.core" rev="${org.eclipse.virgo.medic.core}" conf="p2-runtime->runtime"/>
+
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer.p2" rev="latest.integration" conf="p2-runtime->runtime"/>
+ </dependencies>
+
+</ivy-module>
+
diff --git a/build-kernel/user-ivy.xml b/build-kernel/user-ivy.xml
new file mode 100644
index 00000000..4888b395
--- /dev/null
+++ b/build-kernel/user-ivy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
+
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}" />
+
+ <configurations>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+ <conf name="lib-user" visibility="public" description="Dependencies to be packaged in lib/user"/>
+ </configurations>
+
+ <dependencies>
+ <!-- lib/user -->
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgicommand" rev="latest.integration" conf="lib-user->runtime"/>
+ <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregion" rev="latest.integration" conf="lib-user->runtime"/>
+
+ </dependencies>
+</ivy-module> \ No newline at end of file

Back to the top