Virgo Spring-Cleaning - Tidy up Gradle build
This commit is part of the Virgo Spring-Cleaning 2019 to focus on the
main deliverables of Eclipse Virgo.
* Remove build flags 'local.build'/'include.docs' - both flags aren't
used by any Jenkins jobs.
* Remove unused scripts in 'packaging/nano/bin'
* Remove unused parameter in VirgoToolsPlugin
diff --git a/build.gradle b/build.gradle
index db5ee9e..1ec1f94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,33 +14,9 @@
// Jenkins currently doesn't resolve eclipse.org: Name or service not known
url "http://build.eclipse.org/rt/virgo/gradle/bundles"
}
- if (System.properties['local.build'] == 'true') {
- jcenter()
- maven { url 'https://repo.spring.io/libs-release' }
- }
}
dependencies {
classpath "org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor.gradle.plugin:1.2.0.D-20181221073312"
- if (System.properties['include.docs'] == 'true') {
- // docbook processing
- classpath 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
- // TODO use docbook 4.5 to reduce buildtime? 4.5 DTDs are not available locally?
- // TODO alternatively switch to docbook 5.0?
- classpath 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
- classpath 'net.sf.docbook:docbook-xsl-saxon:1.0.0'
- classpath 'org.apache.xerces:resolver:2.9.1'
- classpath 'org.apache.xerces:xercesImpl:2.9.1'
- classpath 'saxon:saxon:6.5.3'
- classpath 'net.sf.xslthl:xslthl:2.0.1'
- classpath 'org.apache.xmlgraphics:fop:0.95-1@jar'
- classpath 'org.apache.xmlgraphics:xmlgraphics-commons:1.3'
- classpath 'org.apache.xmlgraphics:batik-bridge:1.7@jar'
- classpath 'org.apache.xmlgraphics:batik-util:1.7@jar'
- classpath 'org.apache.xmlgraphics:batik-css:1.7@jar'
- classpath 'org.apache.xmlgraphics:batik-dom:1.7'
- classpath 'org.apache.xmlgraphics:batik-svg-dom:1.7@jar'
- classpath 'org.apache.avalon.framework:avalon-framework-api:4.3.1'
- }
}
}
@@ -167,13 +143,6 @@
project(':nano:org.eclipse.virgo.nano.shutdown'),
]
-if (System.properties['local.build'] == 'true') {
- ext.javaProjects += [
- // project(':system-tests:org.eclipse.virgo.server.svt'),
- // project(':performance-tests:org.eclipse.virgo.qa.performance'),
- ]
-}
-
ext.aspectjProjects = [
// these projects contain aspects
project(':util:org.eclipse.virgo.util.jmx'),
@@ -185,20 +154,18 @@
project(':kernel:org.eclipse.virgo.kernel.osgi'),
]
-if (System.properties['local.build'] == 'true') {
- if (System.properties['weaving.enabled'] == 'true') {
- ext.aspectjProjects + [
- project(':apps:org.eclipse.virgo.apps.repository.core'),
- project(':kernel:org.eclipse.virgo.kernel.deployer'),
- project(':kernel:org.eclipse.virgo.kernel.deployer.dm'),
- project(':kernel:org.eclipse.virgo.kernel.dmfragment'),
- project(':kernel:org.eclipse.virgo.shell.command'),
- project(':repository:org.eclipse.virgo.repository'),
- project(':web:org.eclipse.virgo.web.core'),
- project(':web:org.eclipse.virgo.web.dm'),
- project(':web:org.eclipse.virgo.web.tomcat.support'),
- ]
- }
+if (System.properties['weaving.enabled'] == 'true') {
+ ext.aspectjProjects + [
+ project(':apps:org.eclipse.virgo.apps.repository.core'),
+ project(':kernel:org.eclipse.virgo.kernel.deployer'),
+ project(':kernel:org.eclipse.virgo.kernel.deployer.dm'),
+ project(':kernel:org.eclipse.virgo.kernel.dmfragment'),
+ project(':kernel:org.eclipse.virgo.shell.command'),
+ project(':repository:org.eclipse.virgo.repository'),
+ project(':web:org.eclipse.virgo.web.core'),
+ project(':web:org.eclipse.virgo.web.dm'),
+ project(':web:org.eclipse.virgo.web.tomcat.support'),
+ ]
}
/*
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 1b1f1e3..8bad1f0 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,32 +1,7 @@
apply plugin: 'maven'
apply plugin: 'groovy'
-repositories {
- if (System.properties['local.build'] == 'true') {
- mavenCentral()
- maven { url 'https://repo.spring.io/libs-release' }
- }
-}
-
dependencies {
compile gradleApi()
compile localGroovy()
-
- if (System.properties['local.build'] == 'true') {
- compile 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
- compile 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
- compile 'net.sf.docbook:docbook-xsl-saxon:1.0.0'
- compile 'org.apache.xerces:resolver:2.9.1'
- compile 'org.apache.xerces:xercesImpl:2.9.1'
- compile 'saxon:saxon:6.5.3'
- compile 'net.sf.xslthl:xslthl:2.0.1'
- compile 'org.apache.xmlgraphics:fop:0.95-1@jar'
- compile 'org.apache.xmlgraphics:xmlgraphics-commons:1.3'
- compile 'org.apache.xmlgraphics:batik-bridge:1.7@jar'
- compile 'org.apache.xmlgraphics:batik-util:1.7@jar'
- compile 'org.apache.xmlgraphics:batik-css:1.7@jar'
- compile 'org.apache.xmlgraphics:batik-dom:1.7'
- compile 'org.apache.xmlgraphics:batik-svg-dom:1.7@jar'
- compile 'org.apache.avalon.framework:avalon-framework-api:4.3.1'
- }
}
diff --git a/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy b/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy
index 39f3cf4..9785300 100644
--- a/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy
+++ b/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy
@@ -2,8 +2,6 @@
import org.gradle.api.Plugin
import org.gradle.api.Project
-import org.gradle.api.logging.LogLevel
-
import eclipsebuild.FileSemaphore
// new comment
@@ -36,15 +34,12 @@
project.logger.info("Generated p2 instructions for '${assemblyFeatureDir}'.")
}
- static void publishProduct(Project project, File productFileLocation, File javaProfileLocation) {
+ static void publishProduct(Project project, File productFileLocation) {
File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
- publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation)
-
+ internalPublishProduct(project, repositoryDir, productFileLocation)
}
- // TODO remove unnecessary variable javaProfileLocation as this can be always oev.site/config/something?!
- @Deprecated
- static void publishProduct(Project project, File repositoryDir, File productFileLocation, File javaProfileLocation) {
+ private static void internalPublishProduct(Project project, File repositoryDir, File productFileLocation) {
project.logger.info("Publishing Virgo ${productFileLocation} to '${repositoryDir}'.")
project.javaexec {
main = 'org.eclipse.equinox.launcher.Main'
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 94afbd8..7d375ad 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -564,17 +564,11 @@
group = Constants.gradleTaskGroupName
description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
- // TODO rework to something like createP2repository.outputs.repository?
- // File repositoryDir = file(project.rootProject.tasks[":org.eclipse.virgo.site:${CREATE_P2_REPOSITORY_TASK_NAME}"].buildDir + "/repository/")
- File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
File productFileLocation = project.file("${project.projectDir}/publish_resources/products/${product}/${product}.product")
- File javaProfileLocation = project.file("${project.projectDir}/src/main/dist/configuration/java-server.profile")
- inputs.dir repositoryDir
inputs.file productFileLocation
- inputs.file javaProfileLocation
- doLast { publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation) }
+ doLast { publishProduct(project, productFileLocation) }
}
}
}
diff --git a/packaging/jetty-server/build.gradle b/packaging/jetty-server/build.gradle
index 595a1b6..28375b8 100644
--- a/packaging/jetty-server/build.gradle
+++ b/packaging/jetty-server/build.gradle
@@ -57,9 +57,8 @@
def product = 'jetty-server'
def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
- def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile")
- doLast() { publishProduct(project, productFileLocation, javaProfileLocation) }
+ doLast() { publishProduct(project, productFileLocation) }
}
task ('installProductJettyServer', dependsOn: [
diff --git a/packaging/kernel/build.gradle b/packaging/kernel/build.gradle
index 47c7119..808808b 100644
--- a/packaging/kernel/build.gradle
+++ b/packaging/kernel/build.gradle
@@ -64,9 +64,8 @@
def product = 'kernel'
def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
- def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile")
- doLast() { publishProduct(project, productFileLocation, javaProfileLocation) }
+ doLast() { publishProduct(project, productFileLocation) }
}
task ('installProductKernel', dependsOn: ['publishKernel',]) {
diff --git a/packaging/nano/build.gradle b/packaging/nano/build.gradle
index e50a2ac..69b6464 100644
--- a/packaging/nano/build.gradle
+++ b/packaging/nano/build.gradle
@@ -96,11 +96,9 @@
description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
- File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
- def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile")
- doLast() { publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation) }
+ doLast() { publishProduct(project, productFileLocation) }
}
}
}
diff --git a/packaging/tomcat-server/build.gradle b/packaging/tomcat-server/build.gradle
index 6e3ed68..49a0386 100644
--- a/packaging/tomcat-server/build.gradle
+++ b/packaging/tomcat-server/build.gradle
@@ -62,9 +62,8 @@
def product = 'tomcat-server'
def productFileLocation = file("${projectDir}/publish_resources/products/${product}/${product}.product")
- def javaProfileLocation = file("${projectDir}/src/main/dist/configuration/java-server.profile")
- doLast() { publishProduct(project, productFileLocation, javaProfileLocation) }
+ doLast() { publishProduct(project, productFileLocation) }
}
task ('installProductTomcatServer', dependsOn: ['publishTomcatServer',]) {
diff --git a/packaging/virgo/nano/bin/checkJava.bat b/packaging/virgo/nano/bin/checkJava.bat
deleted file mode 100644
index 8df7848..0000000
--- a/packaging/virgo/nano/bin/checkJava.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-rem Script for checking we have the right version of Java.
-
-if "%JAVA_HOME%" == "" (
- echo The JAVA_HOME environment variable is not defined.
- exit /B 1
-)
-if "%CLASSPATH%" == "" (
- echo The CLASSPATH environment variable is not defined.
- exit /B 1
-)
-
-rem Run java version check with the discovered java jvm.
-"%JAVA_HOME%\bin\java" -classpath "%CLASSPATH%" org.eclipse.virgo.util.env.JavaVersionChecker
-
-rem If non-zero exit then either we cannot find the checker or the Java version is incorrect.
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/virgo/nano/bin/checkJava.sh b/packaging/virgo/nano/bin/checkJava.sh
deleted file mode 100755
index a06ecd5..0000000
--- a/packaging/virgo/nano/bin/checkJava.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-#
-# make adjustment when running under cygwin
-#
-if $cygwin; then
- CLASSPATH=$(cygpath -wp "$CLASSPATH")
-fi
-
-if [ -z "$JAVA_HOME" ]
-then
- JAVA_EXECUTABLE=java
-else
- JAVA_EXECUTABLE=$JAVA_HOME/bin/java
-fi
-
-# Run java version check with the discovered java jvm.
-$JAVA_EXECUTABLE \
- -classpath "$CLASSPATH" \
- org.eclipse.virgo.util.env.JavaVersionChecker
-
-# If non-zero exit then either we cannot find the check or the java version is incorrect.
-if [ $? != 0 ]
-then
- exit 1
-fi
diff --git a/packaging/virgo/nano/bin/dmk.bat b/packaging/virgo/nano/bin/dmk.bat
deleted file mode 100644
index f36f061..0000000
--- a/packaging/virgo/nano/bin/dmk.bat
+++ /dev/null
@@ -1,287 +0,0 @@
-@echo off
-rem Script for starting and stopping the kernel
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Derive full path for script (includes trailing backslash)
- set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
- call "%SCRIPT_DIR%setupVars.bat"
- if not "%ERRORLEVEL%"=="0" (
- if "%OS%" == "Windows_NT" endlocal
- exit /B %ERRORLEVEL%
- )
-) else (
- echo Cannot set up environment. "setupVars.bat" file missing.
- if "%OS%" == "Windows_NT" endlocal
- exit /B 1
-)
-
-rem Select command we are to run
-
- rem First parm is command
- set COMMAND=%~1
- rem Rest are parameters - shift done in subroutines
-
- rem Switch on COMMAND in {"start","stop"}
-
- if "%COMMAND%" == "start" (
- call :doStartCommand %*
- if "%OS%" == "Windows_NT" endlocal
- exit /B 0
- )
-
- if "%COMMAND%" == "stop" (
- call :doStopCommand %*
- if "%OS%" == "Windows_NT" endlocal
- exit /B 0
- )
-
- echo Unknown command: %COMMAND%
- if "%OS%" == "Windows_NT" endlocal
- exit /B 1
-
-rem ------------------ Subroutines
-rem ------------------------------
-:doStartCommand
-
- shift
- rem The shift must be here :()
-
- rem Check further file that needs to exist
- for %%I in ("%KERNEL_HOME%\bin\jmxPermissions.vbs") do if not exist "%%~I" (
- echo File "%%~I" does not exist but is required to continue.
- exit /B 1
- )
-
- rem Set defaults
- set CONFIG_DIR=%KERNEL_HOME%\configuration
- set CLEAN_FLAG=
- set NO_START_FLAG=
- set DEBUG_FLAG=
- set DEBUG_PORT=8000
- set SUSPEND=n
- if not defined JMX_PORT set JMX_PORT=9875
- if not defined KEYSTORE_PASSWORD set KEYSTORE_PASSWORD=changeit
- set ADDITIONAL_ARGS=
-
- rem Loop through options
-
- :startOptionLoop
- if "%~1"=="" goto endStartOptionLoop
- if "%~1"=="-debug" goto debug
- if "%~1"=="-clean" goto clean
- if "%~1"=="-configDir" goto configDir
- if "%~1"=="-jmxport" goto jmxport
- if "%~1"=="-keystore" goto keystore
- if "%~1"=="-keystorePassword" goto keystorePassword
- if "%~1"=="-noStart" goto noStart
- if "%~1"=="-suspend" goto suspend
- if "%~1"=="-shell" goto shell
-
- set ADDITIONAL_ARGS=%ADDITIONAL_ARGS% "%~1"
-
- :continueStartOptionLoop
- shift
- goto startOptionLoop
-
- :debug
- set DEBUG_FLAG=1
- set PORT_CANDIDATE=%~2
- if not "%PORT_CANDIDATE:~0,1%"=="-" (
- set DEBUG_PORT=%PORT_CANDIDATE%
- shift
- )
- goto continueStartOptionLoop
- :clean
- set CLEAN_FLAG=1
- goto continueStartOptionLoop
- :configDir
- set CONFIG_DIR=%~2
- rem unless absolute, treat as relative to kernel home
- if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDir
- if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDir
- set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
- :absoluteConfigDir
- shift
- goto continueStartOptionLoop
- :jmxport
- set JMX_PORT=%~2
- shift
- goto continueStartOptionLoop
- :keystore
- set KEYSTORE_PATH=%~2
- shift
- goto continueStartOptionLoop
- :keystorePassword
- set KEYSTORE_PASSWORD=%~2
- shift
- goto continueStartOptionLoop
- :noStart
- set NO_START_FLAG=1
- goto continueStartOptionLoop
- :suspend
- set SUSPEND=y
- goto continueStartOptionLoop
- :shell
- set SHELL_FLAG=1
- goto continueStartOptionLoop
-
- :endStartOptionLoop
-
-
- rem Adjust permissions if necessary
- cscript //NoLogo "%KERNEL_HOME%\bin\jmxPermissions.vbs" "%CONFIG_DIR%\"
-
- rem Adjust options now all are known
- if "%KEYSTORE_PATH%"=="" set KEYSTORE_PATH=%CONFIG_DIR%\keystore
- if not "%DEBUG_FLAG%"=="" set DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=%DEBUG_PORT%,server=y,suspend=%SUSPEND%
-
- rem do Clean work:
- if not "%CLEAN_FLAG%"=="" (
- echo Cleaning the serviceability and working directories...
- rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
- rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
-
- set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
- )
-
- rem do Shell work:
- if not "%SHELL_FLAG%"=="" (
- echo "Warning: Kernel shell not supported; -shell option ignored."
- rem set LAUNCH_OPTS=%LAUNCH_OPTS% -Forg.eclipse.virgo.kernel.shell.local=true
- )
-
- rem Set JMX options
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.port=%JMX_PORT%
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.authenticate=true
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.login.config=virgo-kernel
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.access.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.jmxremote.access.properties"
- set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStore="%KEYSTORE_PATH%"
- set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWORD%
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl=true
- set JMX_OPTS=%JMX_OPTS% -Dcom.sun.management.jmxremote.ssl.need.client.auth=false
-
- if not "%NO_START_FLAG%"=="" goto :eof
- rem ensure that the tmp directory exists:
- set TMP_DIR="%KERNEL_HOME%\work\tmp"
- if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
-
- set JAVA_OPTS=-Xmx1024m -XX:MaxMetaspaceSize=512m %JAVA_OPTS%
- rem Run the server
-
- rem Marshall parameters
- set KERNEL_JAVA_PARMS=%JAVA_OPTS% %DEBUG_OPTS% %JMX_OPTS%
-
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:+HeapDumpOnOutOfMemoryError
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:ErrorFile="%KERNEL_HOME%\serviceability\error.log"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djdk.management.heapdump.allowAnyFileSuffix=true"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -XX:HeapDumpPath="%KERNEL_HOME%\serviceability\heap_dump.hprof"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.security.auth.login.config="%CONFIG_DIR%\org.eclipse.virgo.kernel.authentication.config"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Declipse.ignoreApp="true"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.install.area="%KERNEL_HOME%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.configuration.area="%KERNEL_HOME%\work"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.frameworkClassPath="%FWCLASSPATH%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.endorsed.dirs="%KERNEL_HOME%\lib\endorsed"
-
- rem If Windows 10 set system property os.name=win32, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=486353
- for /f "tokens=4 delims=] " %%i in ('ver') do set VIRGO_DETECTED_WIN_VERSION=%%i
- if "%VIRGO_DETECTED_WIN_VERSION:~0,1%"=="1" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dos.name=win32
-
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.equinox.launcher.Main
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %LAUNCH_OPTS%
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% %ADDITIONAL_ARGS%
-
- rem Now run it
- PUSHD %KERNEL_HOME%
- "%JAVA_HOME%\bin\java" %KERNEL_JAVA_PARMS%
- POPD
-
-goto :eof
-
-rem ------------------------------
-:doStopCommand
-
- shift
- rem The shift must be here :()
-
- rem Set defaults
- set CONFIG_DIR=%KERNEL_HOME%\configuration
- if not defined TRUSTSTORE_PATH set TRUSTSTORE_PATH=%CONFIG_DIR%\keystore
- if not defined TRUSTSTORE_PASSWORD set TRUSTSTORE_PASSWORD=changeit
- if not defined JMX_PORT set JMX_PORT=9875
- set OTHER_ARGS=
-
- rem Loop through options
- :stopOptionLoop
-
- if "%~1"=="" goto endStopOptionLoop
- if "%~1"=="-truststore" goto truststoreStop
- if "%~1"=="-truststorePassword" goto truststorePasswordStop
- if "%~1"=="-configDir" goto configDirStop
- if "%~1"=="-jmxport" goto jmxportStop
-
- set OTHER_ARGS=%OTHER_ARGS% "%~1"
-
- :continueStopOptionLoop
- shift
- goto stopOptionLoop
-
- :truststoreStop
- set TRUSTSTORE_PATH=%~2
- shift
- goto continueStopOptionLoop
-
- :truststorePasswordStop
- set TRUSTSTORE_PASSWORD=%~2
- shift
- goto continueStopOptionLoop
-
- :configDirStop
- set CONFIG_DIR=%~2
- rem unless absolute, treat as relative to kernel home
- if "%CONFIG_DIR:~1%"=="\" goto absoluteConfigDirStop
- if "%CONFIG_DIR:~1,2%"==":\" goto absoluteConfigDirStop
- set CONFIG_DIR=%KERNEL_HOME%\%CONFIG_DIR%
- :absoluteConfigDirStop
- shift
- goto continueStopOptionLoop
-
- :jmxportStop
- set JMX_PORT=%~2
- shift
- goto continueStopOptionLoop
-
- :endStopOptionLoop
-
- rem Call shutdown client
-
- rem Extend JMX options
- set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%"
- set JMX_OPTS=%JMX_OPTS% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
- set OTHER_ARGS=%OTHER_ARGS% -jmxport %JMX_PORT%
-
- rem Marshall parameters
- set SHUTDOWN_PARMS= %JAVA_OPTS% %JMX_OPTS%
- set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -classpath "%CLASSPATH%"
- set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
- set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
- set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% org.eclipse.virgo.nano.shutdown.ShutdownClient
- set SHUTDOWN_PARMS=%SHUTDOWN_PARMS% %OTHER_ARGS%
-
- rem Run Java program
- PUSHD %KERNEL_HOME%
- "%JAVA_HOME%\bin\java" %SHUTDOWN_PARMS%
- POPD
-
-goto :eof
diff --git a/packaging/virgo/nano/bin/dmk.sh b/packaging/virgo/nano/bin/dmk.sh
deleted file mode 100755
index 0937afb..0000000
--- a/packaging/virgo/nano/bin/dmk.sh
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
- ls=`ls -ld "$SCRIPT"`
- # Drop everything prior to ->
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- SCRIPT="$link"
- else
- SCRIPT=`dirname "$SCRIPT"`/"$link"
- fi
-done
-
-# determine kernel home
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-
-# make KERNEL_HOME absolute
-KERNEL_HOME=`cd "$KERNEL_HOME"; pwd`
-
-# execute user setenv script if needed
-if [ -r "$KERNEL_HOME/bin/setenv.sh" ]
-then
- . $KERNEL_HOME/bin/setenv.sh
-fi
-
-# setup classpath and java environment
-. "$KERNEL_HOME/bin/setupClasspath.sh"
-
-# Run java version check with the discovered java jvm.
-. "$KERNEL_HOME/bin/checkJava.sh"
-
-shopt -s extglob
-
-# parse the command we executing
-COMMAND=$1
-shift;
-
-if [ "$COMMAND" = "start" ]
-then
-
- # parse the standard arguments
- CONFIG_DIR=$KERNEL_HOME/configuration
- CLEAN_FLAG=
- NO_START_FLAG=
-
- SHELL_FLAG=
-
- DEBUG_FLAG=
- DEBUG_PORT=8000
- SUSPEND=n
- if [ -z "$JMX_PORT" ]
- then
- JMX_PORT=9875
- fi
-
- if [ -z "$KEYSTORE_PASSWORD" ]
- then
- KEYSTORE_PASSWORD=changeit
- fi
-
- ADDITIONAL_ARGS=
-
- while (($# > 0))
- do
- case $1 in
- -debug)
- DEBUG_FLAG=1
- if [[ "$2" == +([0-9]) ]]
- then
- DEBUG_PORT=$2
- shift;
- fi
- ;;
- -clean)
- CLEAN_FLAG=1
- ;;
- -configDir)
- CONFIG_DIR=$2
- shift;
- ;;
- -jmxport)
- JMX_PORT=$2
- shift;
- ;;
- -keystore)
- KEYSTORE_PATH=$2
- shift;
- ;;
- -keystorePassword)
- KEYSTORE_PASSWORD=$2
- shift;
- ;;
- -noStart)
- NO_START_FLAG=1
- ;;
-
- -suspend)
- SUSPEND=y
- ;;
- -shell)
- SHELL_FLAG=1
- ;;
- *)
- ADDITIONAL_ARGS="$ADDITIONAL_ARGS $1"
- ;;
- esac
- shift
- done
-
- # start the kernel
- if [[ "$CONFIG_DIR" != /* ]]
- then
- CONFIG_DIR=$KERNEL_HOME/$CONFIG_DIR
- fi
-
- if [ -z "$KEYSTORE_PATH" ]
- then
- KEYSTORE_PATH=$CONFIG_DIR/keystore
- fi
-
- if [ "$DEBUG_FLAG" ]
- then
- DEBUG_OPTS=" \
- -Xdebug \
- -Xrunjdwp:transport=dt_socket,address=$DEBUG_PORT,server=y,suspend=$SUSPEND"
- fi
-
- if [ "$CLEAN_FLAG" ]
- then
- echo "Cleaning the serviceability and working directories..."
- rm -rf "$KERNEL_HOME/work"
- rm -rf "$KERNEL_HOME/serviceability"
-
- LAUNCH_OPTS="$LAUNCH_OPTS -clean" #equivalent to setting osgi.clean to "true"
- fi
-
- if [ "$SHELL_FLAG" ]
- then
- echo "Warning: Kernel shell not supported; -shell option ignored."
- # LAUNCH_OPTS="$LAUNCH_OPTS -Forg.eclipse.virgo.kernel.shell.local=true"
- fi
-
- ACCESS_PROPERTIES=$CONFIG_DIR/org.eclipse.virgo.kernel.jmxremote.access.properties
- AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config
- AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties
- CONFIG_AREA=$KERNEL_HOME/work
- JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile
-
- if $cygwin; then
- ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
- AUTH_LOGIN=$(cygpath -wp $AUTH_LOGIN)
- AUTH_FILE=$(cygpath -wp $AUTH_FILE)
- KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
- CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
- CONFIG_AREA=$(cygpath -wp $CONFIG_AREA)
- JAVA_PROFILE=$(cygpath -wp $JAVA_PROFILE)
- fi
-
- # Set the required permissions on the JMX configuration files
- chmod 600 "$ACCESS_PROPERTIES"
-
- if [ -z "$JAVA_HOME" ]
- then
- JAVA_EXECUTABLE=java
- else
- JAVA_EXECUTABLE=$JAVA_HOME/bin/java
- fi
-
- # If we get here we have the correct Java version.
-
- if [ -z "$NO_START_FLAG" ]
- then
- TMP_DIR=$KERNEL_HOME/work/tmp
- # Ensure that the tmp directory exists
- mkdir -p "$TMP_DIR"
-
- JAVA_OPTS="-Xmx1024m \
- -XX:MaxMetaspaceSize=512m $JAVA_OPTS"
-
- cd "$KERNEL_HOME"; exec $JAVA_EXECUTABLE \
- $JAVA_OPTS \
- $DEBUG_OPTS \
- $JMX_OPTS \
- -XX:+HeapDumpOnOutOfMemoryError \
- -XX:ErrorFile="$KERNEL_HOME/serviceability/error.log" \
- -Djdk.management.heapdump.allowAnyFileSuffix=true \
- -XX:HeapDumpPath="$KERNEL_HOME/serviceability/heap_dump.hprof" \
- -Djava.security.auth.login.config="$AUTH_LOGIN" \
- -Dorg.eclipse.virgo.kernel.authentication.file="$AUTH_FILE" \
- -Djava.io.tmpdir="$TMP_DIR" \
- -Dorg.eclipse.virgo.kernel.home="$KERNEL_HOME" \
- -Dorg.eclipse.virgo.kernel.config="$CONFIG_DIR" \
- -Dosgi.sharedConfiguration.area="$CONFIG_DIR" \
- -Dosgi.java.profile="file:$JAVA_PROFILE" \
- -Declipse.ignoreApp=true \
- -Dosgi.install.area="$KERNEL_HOME" \
- -Dosgi.configuration.area="$CONFIG_AREA" \
- -Dssh.server.keystore="$CONFIG_DIR/hostkey.ser" \
- -Dosgi.frameworkClassPath="$FWCLASSPATH" \
- -Djava.endorsed.dirs="$KERNEL_HOME/lib/endorsed" \
- -Dcom.sun.management.jmxremote.port=$JMX_PORT \
- -Dcom.sun.management.jmxremote.authenticate=true \
- -Dcom.sun.management.jmxremote.login.config=virgo-kernel \
- -Dcom.sun.management.jmxremote.access.file="$ACCESS_PROPERTIES" \
- -Djavax.net.ssl.keyStore="$KEYSTORE_PATH" \
- -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWORD" \
- -Dcom.sun.management.jmxremote.ssl=true \
- -Dcom.sun.management.jmxremote.ssl.need.client.auth=false \
- -classpath "$CLASSPATH" \
- org.eclipse.equinox.launcher.Main \
- -noExit \
- $LAUNCH_OPTS \
- $ADDITIONAL_ARGS
- fi
-elif [ "$COMMAND" = "stop" ]
-then
-
- CONFIG_DIR="$KERNEL_HOME/configuration"
-
- #parse args for the script
- if [ -z "$TRUSTSTORE_PATH" ]
- then
- TRUSTSTORE_PATH=$CONFIG_DIR/keystore
- fi
-
- if [ -z "$TRUSTSTORE_PASSWORD" ]
- then
- TRUSTSTORE_PASSWORD=changeit
- fi
-
- if [ -z "$JMX_PORT" ]
- then
- JMX_PORT=9875
- fi
-
- shopt -s extglob
-
- while (($# > 0))
- do
- case $1 in
- -truststore)
- TRUSTSTORE_PATH=$2
- shift;
- ;;
- -truststorePassword)
- TRUSTSTORE_PASSWORD=$2
- shift;
- ;;
- -configDir)
- CONFIG_DIR=$2
- shift;
- ;;
- -jmxport)
- JMX_PORT=$2
- shift;
- ;;
- *)
- OTHER_ARGS+=" $1"
- ;;
- esac
- shift
- done
-
- OTHER_ARGS+=" -jmxport $JMX_PORT"
-
- if $cygwin; then
- KERNEL_HOME=$(cygpath -wp $KERNEL_HOME)
- CONFIG_DIR=$(cygpath -wp $CONFIG_DIR)
- fi
-
- exec $JAVA_EXECUTABLE \
- $JAVA_OPTS \
- $JMX_OPTS \
- -classpath "$CLASSPATH" \
- -Djavax.net.ssl.trustStore="$TRUSTSTORE_PATH" \
- -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWORD" \
- -Dorg.eclipse.virgo.kernel.home="$KERNEL_HOME" \
- -Dorg.eclipse.virgo.kernel.authentication.file="$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties" \
- org.eclipse.virgo.nano.shutdown.ShutdownClient $OTHER_ARGS
-
-else
- echo "Unknown command: ${COMMAND}"
-fi
-
diff --git a/packaging/virgo/nano/bin/jconsole.bat b/packaging/virgo/nano/bin/jconsole.bat
deleted file mode 100644
index 4cbe553..0000000
--- a/packaging/virgo/nano/bin/jconsole.bat
+++ /dev/null
@@ -1,54 +0,0 @@
-@echo off
-rem Script for starting jconsole
-
-if "%OS%" == "Windows_NT" setlocal
-
-rem Find root drive and path for current bat file directory (includes trailing backslash)
- set SCRIPT_DIR=%~dp0
-
-if exist "%SCRIPT_DIR%setupVars.bat" (
- call "%SCRIPT_DIR%setupVars.bat"
- if not "%ERRORLEVEL%"=="0" (
- if "%OS%" == "Windows_NT" endlocal
- exit /B %ERRORLEVEL%
- )
-) else (
- echo Cannot set up environment. "setupVars.bat" file missing.
- if "%OS%" == "Windows_NT" endlocal
- exit /B 1
-)
-
-rem Set defaults
- set TRUSTSTORE_PATH=%KERNEL_HOME%\configuration\keystore
- set TRUSTSTORE_PASSWORD=changeit
- set OTHER_ARGS=
-
-:Loop
- if "%~1"=="" goto EndLoop
-
- if "%~1"=="-truststore" (
- set TRUSTSTORE_PATH=%~2
- shift
- shift
- goto Loop
- )
- if "%~1"=="-truststorePassword" (
- set TRUSTSTORE_PASSWORD=%~2
- shift
- shift
- goto Loop
- )
- rem Accumulate extra parameters.
- set OTHER_ARGS=%OTHER_ARGS% "%~1"
- shift
- goto Loop
-:EndLoop
-
-set JMX_OPTS=%JMX_OPTS% -J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStore="%TRUSTSTORE_PATH%"
-set JMX_OPTS=%JMX_OPTS% -J-Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
-
-"%JAVA_HOME%\bin\jconsole" %JMX_OPTS% %OTHER_ARGS%
-
-if "%OS%" == "Windows_NT" endlocal
-goto :eof
diff --git a/packaging/virgo/nano/bin/jconsole.sh b/packaging/virgo/nano/bin/jconsole.sh
deleted file mode 100755
index 0dfbcbf..0000000
--- a/packaging/virgo/nano/bin/jconsole.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-if [ -z "$JAVA_HOME" ]
-then
- echo The JAVA_HOME environment variable is not defined
- exit 1
-fi
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
- ls=`ls -ld "$SCRIPT"`
- # Drop everything prior to ->
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- SCRIPT="$link"
- else
- SCRIPT=`dirname "$SCRIPT"`/"$link"
- fi
-done
-
-KERNEL_HOME=`dirname "$SCRIPT"`/..
-KERNEL_HOME=`cd $KERNEL_HOME; pwd`
-
-#parse args for the script
-TRUSTSTORE_PATH=$KERNEL_HOME/configuration/keystore
-TRUSTSTORE_PASSWORD=changeit
-
-shopt -s extglob
-
-while (($# > 0))
- do
- case $1 in
- -truststore)
- TRUSTSTORE_PATH=$2
- shift;
- ;;
- -truststorePassword)
- TRUSTSTORE_PASSWORD=$2
- shift;
- ;;
- esac
- shift
-done
-
-JMX_OPTS=" \
- $JMX_OPTS \
- -J-Dcom.sun.tools.jconsole.mbeans.keyPropertyList=category,type \
- -J-Djavax.net.ssl.trustStore=$TRUSTSTORE_PATH \
- -J-Djavax.net.ssl.trustStorePassword=$TRUSTSTORE_PASSWORD"
-
-$JAVA_HOME/bin/jconsole $JMX_OPTS
diff --git a/packaging/virgo/nano/bin/jmxPermissions.vbs b/packaging/virgo/nano/bin/jmxPermissions.vbs
deleted file mode 100644
index 0184607..0000000
--- a/packaging/virgo/nano/bin/jmxPermissions.vbs
+++ /dev/null
@@ -1,81 +0,0 @@
-configFolder = Wscript.Arguments.Item(0)
-
-'WScript.Echo "Fixing permissions on " & configFolder
-
-Set objWMIService = GetObject("winmgmts:\\.\root\CIMV2") 'Load up WMI with the right dll
-
-Dim files(0)
-files(0) = "org.eclipse.virgo.kernel.jmxremote.access.properties"
-
-For Each file In files
- updateInheritance(configFolder & file)
- updateOwnership(configFolder & file)
- updatePermissions(configFolder & file)
-Next
-
-Sub updateInheritance(file)
- 'WScript.Echo "Updating inheritance of " & file
-
- Const SE_DACL_PRESENT = 4
- Const SE_DACL_PROTECTED = 4096
- Const SE_SELF_RELATIVE = 32768
-
- Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
- objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
- objSecurityDescriptor.ControlFlags = SE_DACL_PRESENT + SE_DACL_PROTECTED + SE_SELF_RELATIVE
-
- Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
- Set objInParam = objMethod.inParameters.SpawnInstance_()
- objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
- objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-
- 'WScript.Echo "Updated inheritance of " & file
-End Sub
-
-Sub updateOwnership(file)
- 'WScript.Echo "Updating ownership of " & file
- Set objDataFile = objWMIService.Get("CIM_DataFile.Name='" & file & "'")
-
- Set objMethod = objDataFile.Methods_("TakeOwnerShipEx")
- Set objInParam = objMethod.inParameters.SpawnInstance_()
-
- objDataFile.ExecMethod_ "TakeOwnerShipEx", objInParam
-
- 'WScript.Echo "Updated ownership of " & file
-End Sub
-
-Sub updatePermissions(file)
- 'WScript.Echo "Updating permissions of " & file
-
- Set objFileSecSetting = objWMIService.Get("Win32_LogicalFileSecuritySetting.Path='" & file & "'")
- objFileSecSetting.GetSecurityDescriptor objSecurityDescriptor
-
- Set WshNetwork = WScript.CreateObject("WScript.Network")
-
- Dim foundAce
- foundAce = "false"
-
- 'Search for an ACE for the current user as there is no robust, portable way of creating such an ACE from scratch in VBScript.
- Dim specificAce(0)
- For Each ace in objSecurityDescriptor.DACL
- If ace.Trustee.Name = WshNetwork.UserName Then
- Set specificAce(0) = ace
- foundAce = "true"
- End If
- Next
-
- If foundAce = "true" Then
- objSecurityDescriptor.DACL = specificAce
-
- Set objMethod = objFileSecSetting.Methods_("SetSecurityDescriptor")
- Set objInParam = objMethod.inParameters.SpawnInstance_()
- objInParam.Properties_.item("Descriptor") = objSecurityDescriptor
- objFileSecSetting.ExecMethod_ "SetSecurityDescriptor", objInParam
-
- 'WScript.Echo "Updated permissions of " & file
- Else
- WScript.Echo "WARNING: jmxPermissions.vbs did not update the permissions of " & file & ". Check the file has the correct permissions."
- End If
-
-End Sub
diff --git a/packaging/virgo/nano/bin/setupClasspath.bat b/packaging/virgo/nano/bin/setupClasspath.bat
deleted file mode 100644
index 30e157c..0000000
--- a/packaging/virgo/nano/bin/setupClasspath.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Check JAVA_HOME and KERNEL_HOME variables
-if "%JAVA_HOME%" == "" (
- echo The JAVA_HOME environment variable is not defined.
- exit /B 1
-)
-if "%KERNEL_HOME%" == "" (
- echo The KERNEL_HOME environment variable is not defined.
- exit /B 1
-)
-
-rem Construct the CLASSPATH list from the Kernel lib directory.
-for %%G in ("%KERNEL_HOME%\lib\*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.osgi_*.jar") do call :AppendToClasspath "%%G"
-for %%G in ("%KERNEL_HOME%\plugins\org.eclipse.equinox.console.ssh_*.jar") do call :AppendToClasspath "%%G"
-
-rem Check if there are JAR files in the lib directory.
-if "%CLASSPATH%" == "" (
- echo No JAR files found in %KERNEL_HOME%\lib
- exit /B 1
-)
-
-rem Remove leading semi-colon if present
-if "%CLASSPATH:~0,1%"==";" set CLASSPATH=%CLASSPATH:~1%
-if "%FWCLASSPATH:~0,1%"=="," set FWCLASSPATH=%FWCLASSPATH:~1%
-exit /B 0
-
-:AppendToClasspath
- set CLASSPATH=%CLASSPATH%;%~1
- set FWCLASSPATH=%FWCLASSPATH%,file:///%~1
- goto :eof
diff --git a/packaging/virgo/nano/bin/setupClasspath.sh b/packaging/virgo/nano/bin/setupClasspath.sh
deleted file mode 100755
index 741e0e3..0000000
--- a/packaging/virgo/nano/bin/setupClasspath.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# make sure we have JAVA_HOME set
-if [ -z "$JAVA_HOME" ]
-then
- echo The JAVA_HOME environment variable is not defined. Using PATH instead.
-fi
-
-CLASSPATH=
-FWCLASSPATH=
-
-# Create the classpath for bootstrapping the Server from all the JARs in lib
-for file in "$KERNEL_HOME"/lib/*
-do
- if [[ $file == *.jar ]]
- then
- CLASSPATH=$CLASSPATH:$KERNEL_HOME/lib/${file##*/}
- FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/lib/${file##*/}
- fi
-done
-
-# Append the osgi jar to the classpath
-for file in "$KERNEL_HOME"/plugins/org.eclipse.osgi_*.jar
-do
- CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
- FWCLASSPATH=$FWCLASSPATH,file:$KERNEL_HOME/plugins/${file##*/}
-done
-
-# Append the console.supportability jar to the classpath to enable ssh
-for file in "$KERNEL_HOME"/plugins/org.eclipse.equinox.console.ssh_*.jar
-do
- CLASSPATH=$CLASSPATH:$KERNEL_HOME/plugins/${file##*/}
-done
-
-# make sure we have CLASSPATH set
-if [ -z "$CLASSPATH" ]
-then
- echo No JAR files found in $KERNEL_HOME/lib
- exit 1
-fi
diff --git a/packaging/virgo/nano/bin/setupVars.bat b/packaging/virgo/nano/bin/setupVars.bat
deleted file mode 100644
index a5d7772..0000000
--- a/packaging/virgo/nano/bin/setupVars.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-rem Set up env vars needed for dmk.bat and jconsole.bat (with user-pluggable mods if present)
-
-if "%SCRIPT_DIR%"=="" (
- echo Called setupVars.bat out of context.
- exit /B 1
-)
-
-rem Derive KERNEL_HOME full path from script's parent (no backslash)
- for %%I in ("%SCRIPT_DIR%..") do set KERNEL_HOME=%%~fsI
-
-rem Check files exist (exit if not)
- set ChkLst="%KERNEL_HOME%\bin\setupClasspath.bat","%KERNEL_HOME%\bin\checkJava.bat"
-
- for %%I in (%ChkLst%) do if not exist "%%~I" (
- echo File "%%~I" does not exist but is required.
- exit /B 1
- )
-
-rem set up the classpath (check result)
- call "%KERNEL_HOME%\bin\setupClasspath.bat"
- if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-rem Run Java Version check (uses JAVA_HOME) (check result)
- call "%KERNEL_HOME%\bin\checkJava.bat"
- if not "%ERRORLEVEL%" == "0" exit /B %ERRORLEVEL%
-
-rem Execute user setenv script if needed (ignore result)
- if exist "%KERNEL_HOME%\bin\setenv.bat" call "%KERNEL_HOME%\bin\setenv.bat"
-
-goto :eof
diff --git a/packaging/virgo/nano/bin/shutdown.bat b/packaging/virgo/nano/bin/shutdown.bat
deleted file mode 100644
index a2a1ff4..0000000
--- a/packaging/virgo/nano/bin/shutdown.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" stop %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/virgo/nano/bin/shutdown.sh b/packaging/virgo/nano/bin/shutdown.sh
deleted file mode 100755
index 1960446..0000000
--- a/packaging/virgo/nano/bin/shutdown.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
- ls=`ls -ld "$SCRIPT"`
- # Drop everything prior to ->
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- SCRIPT="$link"
- else
- SCRIPT=`dirname "$SCRIPT"`/"$link"
- fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
- CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" stop "$@"
diff --git a/packaging/virgo/nano/bin/startup.bat b/packaging/virgo/nano/bin/startup.bat
deleted file mode 100644
index 76e1618..0000000
--- a/packaging/virgo/nano/bin/startup.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@ECHO OFF
-IF "%OS%" == "Windows_NT" SETLOCAL
-
-SET SCRIPT_DIR=%~dp0%
-SET EXECUTABLE=dmk.bat
-
-call "%SCRIPT_DIR%%EXECUTABLE%" start %*
-if not "%ERRORLEVEL%"=="0" exit /B %ERRORLEVEL%
diff --git a/packaging/virgo/nano/bin/startup.sh b/packaging/virgo/nano/bin/startup.sh
deleted file mode 100755
index 69e43b7..0000000
--- a/packaging/virgo/nano/bin/startup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
- ls=`ls -ld "$SCRIPT"`
- # Drop everything prior to ->
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- SCRIPT="$link"
- else
- SCRIPT=`dirname "$SCRIPT"`/"$link"
- fi
-done
-
-SCRIPT_DIR=`dirname $SCRIPT`
-EXECUTABLE="dmk.sh"
-
-#
-# identify yourself when running under cygwin
-#
-cygwin=false
-case "$(uname)" in
- CYGWIN*) cygwin=true ;;
-esac
-export cygwin
-
-exec "$SCRIPT_DIR"/"$EXECUTABLE" start "$@"
diff --git a/settings.gradle b/settings.gradle
index 7fe5ab0..849c314 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -83,12 +83,6 @@
include ':util:org.eclipse.virgo.util.integrationtest'
//include ':medic:org.eclipse.virgo.medic.integrationtest'
-if (System.properties['include.docs'] == 'true') {
- include ':documentation:programmer-guide'
- include ':documentation:tooling-guide'
- include ':documentation:user-guide'
-}
-
include ':org.eclipse.virgo.site'
// TODO - rename feature to region'_'
include ':org.eclipse.virgo.site:org.eclipse.equinox.regions'
