Merge branch 'master' into bug324991-eclipse-structure
Conflicts:
build-kernel/bin/dmk.bat
build-kernel/build.xml
build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
build.versions
org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java
diff --git a/build-kernel/bin/dmk.bat b/build-kernel/bin/dmk.bat
index 4b404e8..1862ff3 100755
--- a/build-kernel/bin/dmk.bat
+++ b/build-kernel/bin/dmk.bat
@@ -23,7 +23,7 @@
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" (
@@ -125,7 +125,7 @@
:endStartOptionLoop
-
+
rem Adjust permissions if necessary
cscript //NoLogo "%KERNEL_HOME%\bin\jmxPermissions.vbs" "%CONFIG_DIR%\"
@@ -137,7 +137,7 @@
if not "%CLEAN_FLAG%"=="" (
rmdir /Q /S "%KERNEL_HOME%\serviceability"
rmdir /Q /S "%KERNEL_HOME%\work"
- set LAUNCH_OPTS=%LAUNCH_OPTS% -Fosgi.clean=true
+ set LAUNCH_OPTS=%LAUNCH_OPTS% -Dosgi.clean=true
)
rem ensure that the tmp directory exists:
@@ -145,43 +145,48 @@
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
rem do Shell work:
- if not "%SHELL_FLAG%"=="" (
+ 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 LAUNCH_OPTS=%LAUNCH_OPTS% -Dorg.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.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
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:+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% -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% -Dosgi.framework.activeThreadType=normal
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
+ 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.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%
-
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -jar lib/org.eclipse.equinox.launcher*.jar *.jar
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -install lib
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -data work
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -configuration config
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -console
+
rem Now run it
PUSHD %KERNEL_HOME%
"%JAVA_HOME%\bin\java" %KERNEL_JAVA_PARMS%
@@ -191,7 +196,7 @@
rem ------------------------------
:doStopCommand
-
+
shift
rem The shift must be here :()
@@ -205,14 +210,14 @@
rem Loop through options
:stopOptionLoop
- if "%~1"=="" goto endStopOptionLoop
+ 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
diff --git a/build-kernel/bin/dmk.sh b/build-kernel/bin/dmk.sh
index f548a19..4651ac0 100755
--- a/build-kernel/bin/dmk.sh
+++ b/build-kernel/bin/dmk.sh
@@ -129,13 +129,13 @@
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
- LAUNCH_OPTS="$LAUNCH_OPTS -Fosgi.clean=true"
+ LAUNCH_OPTS="$LAUNCH_OPTS -Dosgi.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"
+ # LAUNCH_OPTS="$LAUNCH_OPTS -Dorg.eclipse.virgo.kernel.shell.local=true"
fi
# Set the required permissions on the JMX configuration files
@@ -170,15 +170,18 @@
-Dorg.eclipse.virgo.kernel.authentication.file=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties \
-Djava.io.tmpdir=$TMP_DIR \
-Dorg.eclipse.virgo.kernel.home=$KERNEL_HOME \
- -classpath $CLASSPATH \
- org.eclipse.virgo.osgi.launcher.Launcher \
- -config $KERNEL_HOME/lib/org.eclipse.virgo.kernel.launch.properties \
- -Forg.eclipse.virgo.kernel.home=$KERNEL_HOME \
- -Forg.eclipse.virgo.kernel.config=$CONFIG_DIR \
- -Fosgi.configuration.area=$KERNEL_HOME/work/osgi/configuration \
- -Fosgi.java.profile="file:$KERNEL_HOME/lib/java6-server.profile" \
+ -Declipse.ignoreApp=true \
+ -Dosgi.framework.activeThreadType=normal \
+ -Dorg.eclipse.virgo.kernel.config=$CONFIG_DIR \
+ -Dosgi.configuration.area=$KERNEL_HOME/work/osgi/configuration \
+ -Dosgi.java.profile="file:$KERNEL_HOME/lib/java6-server.profile" \
$LAUNCH_OPTS \
- $ADDITIONAL_ARGS
+ $ADDITIONAL_ARGS \
+ -jar lib/org.eclipse.equinox.launcher_@EQUINOX.LAUNCHER.VERSION@.jar *.jar \
+ -install lib \
+ -data work \
+ -configuration config \
+ -noExit
elif [ "$COMMAND" = "stop" ]
then
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 47764a4..7389f91 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -53,10 +53,10 @@
<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:retrieve resolveId="copy.path" pattern="${package.output.dir}/${user.region.dir}/[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"/>
+ <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/${repository.ext.dir}/[artifact]-[revision].[ext]" conf="repository-ext" type="jar"/>
<mkdir dir="${package.output.dir}/config"/>
<mkdir dir="${package.output.dir}/work"/>
@@ -96,7 +96,9 @@
<copy todir="${package.output.dir}/config" failonerror="false">
<fileset dir="${basedir}/config" excludes="keystore"/>
<filterset>
+ <!--VERSIONS-->
<filter token="ASPECTJ.VERSION" value="${org.aspectj}"/>
+ <filter token="OSGI.FRAMEWORK.VERSION" value="${org.eclipse.osgi}"/>
<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}"/>
@@ -105,25 +107,28 @@
<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="OSGI.EXTENSIONS.VERSION" value="${org.eclipse.virgo.osgi}"/>
<filter token="SLF4J.VERSION" value="${org.slf4j}"/>
- <filter token="SPRING.DM.VERSION" value="${org.springframework.osgi}"/>
+ <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}"/>
+ <!--LOCATIONS-->
+ <filter token="REPOSITORY.EXT.DIR" value="${repository.ext.dir}"/>
</filterset>
</copy>
-
- <copy todir="${package.output.dir}/repository/ext" failonerror="false">
+
+ <copy todir="${package.output.dir}/${repository.ext.dir}" failonerror="false">
<fileset dir="${basedir}/repository/ext"/>
</copy>
-
- <copy todir="${package.output.dir}/repository/ext" failonerror="false">
- <fileset dir="${package.output.dir}/lib/kernel">
+
+ <copy todir="${package.output.dir}/${repository.ext.dir}" failonerror="false">
+ <fileset dir="${package.output.dir}/${user.region.dir}">
<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">
+
+ <move todir="${package.output.dir}/${repository.ext.dir}" failonerror="false">
+ <fileset dir="${package.output.dir}/${user.region.dir}">
<include name="org.eclipse.virgo.kernel.dmfragment-*.jar"/>
<include name="org.eclipse.virgo.kernel.deployer.dm-*.jar"/>
</fileset>
@@ -168,91 +173,76 @@
<antcall target="test.post"/>
</target>
- <target name="package.resources" depends="package"
- description="Creates a special bundle containing Virgo entities that are not bundles">
+ <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"/>
+
+ <!--Scripts in BIN-->
+ <zipfileset dir="${package.dir}/${package.basename}/bin" includes="*.sh" prefix="bin" filemode="755"/>
+ <zipfileset dir="${package.dir}/${package.basename}/bin" prefix="bin">
+ <include name="*.bat"/>
+ <include name="*.vbs"/>
+ </zipfileset>
+
+ <!--Configuration files-->
+ <zipfileset dir="${package.dir}/${package.basename}/config"
+ includes="org.eclipse.virgo.kernel.jmxremote.access.properties" prefix="config" filemode="600"/>
+ <zipfileset dir="${package.dir}/${package.basename}/config" prefix="config">
+ <include name="*"/>
<exclude name="config/org.eclipse.virgo.kernel.jmxremote.access.properties"/>
- <exclude name="**/*.jar"/>
+ </zipfileset>
+
+ <!--LIB files-->
+ <zipfileset dir="${package.dir}/${package.basename}/lib" prefix="lib">
+ <include name=".version"/>
+ <include name="java6-server.profile"/>
+ <include name="org.eclipse.virgo.kernel.userregion.springdm.plan"/>
+ </zipfileset>
+
+ <!--Additional files-->
+ <zipfileset dir="${package.dir}/${package.basename}">
+ <include name="about_files/*"/>
+ <include name="*.html"/>
</zipfileset>
</zip>
</target>
- <target name="p2.publish" depends="package.resources, p2.extract-publisher"
- description="Publishes bundles, features and product">
+ <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="-bundles ${package.output.dir}/lib"/>
<arg line="-publishArtifacts"/>
<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 ${product.file}"/>
+ <arg line="-append"/>
+ <arg line="-publishArtifacts"/>
+ <arg line="-flavor tooling"/>
+ <arg line="-configs all"/>
+ </java>
- <sshexec host="build.eclipse.org"
- username="${eclipse.buildId}"
- keyfile="${key.file}"
+ <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}/"
+ <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"/>
+
+ <!--TODO-->
+ <delete dir="${p2.publishing.dir}" excludes="p2agent.zip" includeemptydirs="true" quiet="true"/>
</target>
</project>
diff --git a/build-kernel/config/bundles.info b/build-kernel/config/bundles.info
new file mode 100644
index 0000000..d605264
--- /dev/null
+++ b/build-kernel/config/bundles.info
@@ -0,0 +1,60 @@
+################################################################################
+# 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
+################################################################################
+
+#version=1
+org.eclipse.equinox.simpleconfigurator,@EQUINOX.SIMPLECONFIGURATOR.VERSION@,org.eclipse.equinox.simpleconfigurator_@EQUINOX.SIMPLECONFIGURATOR.VERSION@,1,true
+
+# contains org.eclipse.virgo.osgi.launcher.parser.ArgumentParser used by kenrel.osgi bundle in RegionManager
+org.eclipse.virgo.osgi.launcher,@OSGI.EXTENSIONS.VERSION@,org.eclipse.virgo.osgi.launcher_@OSGI.EXTENSIONS.VERSION@.jar,2,false
+
+# shutdown functionality
+org.eclipse.virgo.kernel.shutdown,@KERNEL.VERSION@,org.eclipse.virgo.kernel.shutdown_@KERNEL.VERSION@.jar,2,true
+
+# framework extension hook
+org.eclipse.virgo.osgi.extensions.equinox,@OSGI.EXTENSIONS.VERSION@,org.eclipse.virgo.osgi.extensions.equinox_@OSGI.EXTENSIONS.VERSION@.jar,2,false
+
+# Virgo kernel
+com.springsource.slf4j.api,@SLF4J.VERSION@,com.springsource.slf4j.api_@SLF4J.VERSION@.jar,2,true
+com.springsource.slf4j.org.apache.commons.logging,@SLF4J.VERSION@,com.springsource.slf4j.org.apache.commons.logging_@SLF4J.VERSION@.jar,2,true
+com.springsource.org.aspectj.weaver,@ASPECTJ.VERSION@,com.springsource.org.aspectj.weaver_@ASPECTJ.VERSION@.jar,2,true
+org.eclipse.virgo.medic,@MEDIC.VERSION@,org.eclipse.virgo.medic_@MEDIC.VERSION@.jar,2,true
+org.eclipse.osgi.services,@OSGI.SERVICES.VERSION@,org.eclipse.osgi.services_@OSGI.SERVICES.VERSION@.jar,2,true
+org.eclipse.equinox.cm,@EQUINOX.CONFIGADMIN.VERSION@,org.eclipse.equinox.cm_@EQUINOX.CONFIGADMIN.VERSION@.jar,2,true
+org.eclipse.virgo.medic.core,@MEDIC.VERSION@,org.eclipse.virgo.medic.core_@MEDIC.VERSION@.jar,2,true
+org.eclipse.virgo.util.osgi,@UTIL.VERSION@,org.eclipse.virgo.util.osgi_@UTIL.VERSION@.jar,2,true
+org.apache.felix.eventadmin,@FELIX.EVENTADMIN.VERSION@,org.apache.felix.eventadmin_@FELIX.EVENTADMIN.VERSION@.jar,2,true
+org.eclipse.virgo.util.common,@UTIL.VERSION@,org.eclipse.virgo.util.common_@UTIL.VERSION@.jar,2,true
+org.eclipse.virgo.util.io,@UTIL.VERSION@,org.eclipse.virgo.util.io_@UTIL.VERSION@.jar,2,true
+org.eclipse.virgo.util.jmx,@UTIL.VERSION@,org.eclipse.virgo.util.jmx_@UTIL.VERSION@.jar,2,false
+org.eclipse.virgo.util.math,@UTIL.VERSION@,org.eclipse.virgo.util.math_@UTIL.VERSION@.jar,2,true
+org.eclipse.virgo.util.parser.manifest,@UTIL.VERSION@,org.eclipse.virgo.util.parser.manifest_@UTIL.VERSION@.jar,2,true
+com.springsource.org.apache.commons.codec,1.3.0,com.springsource.org.apache.commons.codec_1.3.0.jar,2,true
+com.springsource.org.apache.commons.httpclient,3.1.0,com.springsource.org.apache.commons.httpclient_3.1.0.jar,2,true
+org.eclipse.virgo.repository,@REPOSITORY.VERSION@,org.eclipse.virgo.repository_@REPOSITORY.VERSION@.jar,2,true
+org.springframework.aop,@SPRING.VERSION@,org.springframework.aop_@SPRING.VERSION@.jar,2,false
+org.springframework.asm,@SPRING.VERSION@,org.springframework.asm_@SPRING.VERSION@.jar,2,false
+org.springframework.expression,@SPRING.VERSION@,org.springframework.expression_@SPRING.VERSION@.jar,2,false
+org.springframework.beans,@SPRING.VERSION@,org.springframework.beans_@SPRING.VERSION@.jar,2,false
+org.springframework.core,@SPRING.VERSION@,org.springframework.core_@SPRING.VERSION@.jar,2,false
+org.springframework.context,@SPRING.VERSION@,org.springframework.context_@SPRING.VERSION@.jar,2,false
+org.eclipse.virgo.kernel.core,@KERNEL.VERSION@,org.eclipse.virgo.kernel.core_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.agent.dm,@KERNEL.VERSION@,org.eclipse.virgo.kernel.agent.dm_@KERNEL.VERSION@.jar,2,true
+org.springframework.osgi.core,@SPRING.DM.VERSION@,org.springframework.osgi.core_@SPRING.DM.VERSION@.jar,2,false
+org.springframework.osgi.extender,@SPRING.DM.VERSION@,org.springframework.osgi.extender_@SPRING.DM.VERSION@.jar,2,true
+org.springframework.osgi.io,@SPRING.DM.VERSION@,org.springframework.osgi.io_@SPRING.DM.VERSION@.jar,2,false
+com.springsource.org.aopalliance,1.0.0,com.springsource.org.aopalliance_1.0.0.jar,2,false
+org.eclipse.virgo.kernel.artifact,@KERNEL.VERSION@,org.eclipse.virgo.kernel.artifact_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.services,@KERNEL.VERSION@,org.eclipse.virgo.kernel.services_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.osgi,@KERNEL.VERSION@,org.eclipse.virgo.kernel.osgi_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.deployer,@KERNEL.VERSION@,org.eclipse.virgo.kernel.deployer_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.model,@KERNEL.VERSION@,org.eclipse.virgo.kernel.model_@KERNEL.VERSION@.jar,2,true
+org.eclipse.virgo.kernel.kerneldmfragment,@KERNEL.VERSION@,org.eclipse.virgo.kernel.kerneldmfragment_@KERNEL.VERSION@.jar,2,false
+org.eclipse.virgo.kernel.shell,@KERNEL.VERSION@,org.eclipse.virgo.kernel.shell_@KERNEL.VERSION@.jar,2,true
diff --git a/build-kernel/config/config.ini b/build-kernel/config/config.ini
new file mode 100644
index 0000000..32fc791
--- /dev/null
+++ b/build-kernel/config/config.ini
@@ -0,0 +1,38 @@
+################################################################################
+# 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
+################################################################################
+
+#######################
+# Equinox Configuration
+#######################
+osgi.framework=lib/org.eclipse.osgi-@OSGI.FRAMEWORK.VERSION@.jar
+osgi.bundles=org.eclipse.equinox.simpleconfigurator_@EQUINOX.SIMPLECONFIGURATOR.VERSION@.jar@1:start
+org.eclipse.equinox.simpleconfigurator.configUrl=file\:bundles.info
+osgi.bundles.defaultStartLevel=4
+
+osgi.parentClassloader=fwk
+osgi.context.bootdelegation=false
+osgi.compatibility.bootdelegation=false
+osgi.clean=true
+
+osgi.java.profile=file:lib/java6-server.profile
+osgi.java.profile.bootdelegation=override
+
+eclipse.bundle.setTCCL=false
+eclipse.enableStateSaver=false
+
+# osgi console support
+# osgi.console=2401
+
+#####################
+# Virgo Configuration
+#####################
+org.eclipse.virgo.medic.log.config.path=config/serviceability.xml
+org.eclipse.virgo.suppress.heap.dumps=false
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
index 26007be..5ac3150 100644
--- a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
@@ -1,6 +1,8 @@
+region.path = lib/kernel
+
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:org.eclipse.virgo.kernel.userregion-@KERNEL.VERSION@.jar@start,\
+ file:org.eclipse.virgo.kernel.osgicommand-@KERNEL.VERSION@.jar@start
bundleImports = org.eclipse.osgi;bundle-version="0"
diff --git a/build-kernel/config/org.eclipse.virgo.repository.properties b/build-kernel/config/org.eclipse.virgo.repository.properties
index 5e7de2b..2582fc1 100644
--- a/build-kernel/config/org.eclipse.virgo.repository.properties
+++ b/build-kernel/config/org.eclipse.virgo.repository.properties
@@ -1,5 +1,5 @@
ext.type=external
-ext.searchPattern=repository/ext/{artifact}
+ext.searchPattern=@REPOSITORY.EXT.DIR@/{artifact}
usr.type=watched
usr.watchDirectory=repository/usr
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 fa23621..0000000
--- 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 2d30625..0000000
--- 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
index 403a082..d5fda54 100644
--- a/build-kernel/org.eclipse.virgo.kernel.product
+++ b/build-kernel/org.eclipse.virgo.kernel.product
@@ -9,89 +9,105 @@
~ http://www.eclipse.org/legal/epl-v10.html
~
~ Contributors:
- ~ Hristo Iliev, SAP AG - initial contribution
+ ~ 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="org.eclipse.virgo.kernel.resources"/>
+
+ <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.aspectj.weaver"/>
<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.equinox.cm"/>
+ <plugin id="org.eclipse.equinox.launcher"/>
+ <plugin id="org.eclipse.equinox.simpleconfigurator"/>
+ <plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.osgi.services"/>
+ <plugin id="org.eclipse.virgo.kernel.agent.dm"/>
+ <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.deployer.dm"/>
+ <plugin id="org.eclipse.virgo.kernel.dmfragment"/>
+ <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.osgicommand"/>
+ <plugin id="org.eclipse.virgo.kernel.services"/>
+ <plugin id="org.eclipse.virgo.kernel.shell"/>
+ <plugin id="org.eclipse.virgo.kernel.shutdown"/>
+ <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.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="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.core"/>
+ <plugin id="org.springframework.expression"/>
<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"/>
+ <plugin id="org.eclipse.equinox.simpleconfigurator" startLevel="1" autostart="true"/>
+ <plugin id="org.eclipse.virgo.osgi.launcher" startLevel="2" autostart="false"/>
+ <plugin id="org.eclipse.virgo.kernel.shutdown" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.osgi.extensions.equinox" startLevel="2" autostart="false"/>
+ <plugin id="com.springsource.slf4j.api" startLevel="2" autostart="true"/>
+ <plugin id="com.springsource.slf4j.org.apache.commons.logging" startLevel="2" autostart="true"/>
+ <plugin id="com.springsource.org.aspectj.weaver" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.medic" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.osgi.services" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.equinox.cm" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.medic.core" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.util.osgi" startLevel="2" autostart="true"/>
+ <plugin id="org.apache.felix.eventadmin" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.util.common" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.util.io" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.util.jmx" startLevel="2" autostart="false"/>
+ <plugin id="org.eclipse.virgo.util.math" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.util.parser.manifest" startLevel="2" autostart="true"/>
+ <plugin id="com.springsource.org.apache.commons.codec" startLevel="2" autostart="true"/>
+ <plugin id="com.springsource.org.apache.commons.httpclient" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.repository" startLevel="2" autostart="true"/>
+ <plugin id="org.springframework.aop" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.asm" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.expression" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.beans" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.core" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.context" startLevel="2" autostart="false"/>
+ <plugin id="org.eclipse.virgo.kernel.core" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.agent.dm" startLevel="2" autostart="true"/>
+ <plugin id="org.springframework.osgi.core" startLevel="2" autostart="false"/>
+ <plugin id="org.springframework.osgi.extender" startLevel="2" autostart="true"/>
+ <plugin id="org.springframework.osgi.io" startLevel="2" autostart="false"/>
+ <plugin id="com.springsource.org.aopalliance" startLevel="2" autostart="false"/>
+ <plugin id="org.eclipse.virgo.kernel.artifact" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.services" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.osgi" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.deployer" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.model" startLevel="2" autostart="true"/>
+ <plugin id="org.eclipse.virgo.kernel.kerneldmfragment" startLevel="2" autostart="false"/>
+ <plugin id="org.eclipse.virgo.kernel.shell" startLevel="2" 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 ffe64ee..0000000
--- 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
index e09ad72..eb31b05 100644
--- a/build-kernel/p2.inf
+++ b/build-kernel/p2.inf
@@ -6,7 +6,7 @@
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
-# Hristo Iliev, SAP AG - initial contribution
+# Hristo Iliev, SAP AG - initial contribution
################################################################################
properties.1.name = org.eclipse.equinox.p2.type.category
diff --git a/build.properties b/build.properties
index 627d057..1463e3a 100644
--- a/build.properties
+++ b/build.properties
@@ -11,5 +11,8 @@
natural.name=virgo-kernel
project.key=VK
+user.region.dir=lib
+repository.ext.dir=lib
+
test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
#test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
diff --git a/build.versions b/build.versions
index d582a22..59f654f 100644
--- a/build.versions
+++ b/build.versions
@@ -4,6 +4,8 @@
org.eclipse.equinox.util=1.0.200.v20100503
org.eclipse.equinox.ds=1.3.0.v20110124-0830
org.eclipse.equinox.cm=1.0.300.v20101204
+org.eclipse.equinox.launcher=1.2.0.v20110124-0830
+org.eclipse.equinox.simpleconfigurator=1.0.200.v20110228
org.aspectj=1.6.6.RELEASE
org.eclipse.osgi=3.7.0.v20110224
org.eclipse.virgo.medic=3.0.0.M02
diff --git a/org.eclipse.virgo.kernel.osgi/template.mf b/org.eclipse.virgo.kernel.osgi/template.mf
index e08ad36..0fcc54a 100644
--- a/org.eclipse.virgo.kernel.osgi/template.mf
+++ b/org.eclipse.virgo.kernel.osgi/template.mf
@@ -7,14 +7,14 @@
*.internal.*
Excluded-Imports:
org.eclipse.virgo.kernel.services.repository.internal.*,
- org.eclipse.virgo.osgi.extensions.*,
- org.eclipse.virgo.osgi.launcher.*,
org.eclipse.virgo.repository.internal
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.osgi.launcher.parser.*;version="0",
+ org.eclipse.virgo.osgi.extensions.equinox.hooks;version="0",
org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
org.osgi.framework.*;version="0",
