Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2018-06-29 14:12:38 -0400
committerFlorian Waibel2018-06-29 14:12:38 -0400
commitd8cbed322d3322feb10953fde641c50f9e9f3778 (patch)
tree3a23117122c32a729a5da6f0b5186fb1ddb320c5
parent3b40254e8d3f821617b362d09ecbb1810274eb61 (diff)
downloadorg.eclipse.virgo.samples-d8cbed322d3322feb10953fde641c50f9e9f3778.tar.gz
org.eclipse.virgo.samples-d8cbed322d3322feb10953fde641c50f9e9f3778.tar.xz
org.eclipse.virgo.samples-d8cbed322d3322feb10953fde641c50f9e9f3778.zip
Update recipe-custome-virgo
* Bump Gradle wrapper to 4.6 * Simplify Gradle build scripts Also improves spelling in the recipe templates
-rw-r--r--.gitignore27
-rw-r--r--recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc2
-rw-r--r--recipe-custom-virgo/README.adoc0
-rw-r--r--recipe-custom-virgo/README.md2
-rw-r--r--recipe-custom-virgo/build.gradle112
-rw-r--r--recipe-custom-virgo/gradle.properties5
-rw-r--r--recipe-custom-virgo/gradle/wrapper/gradle-wrapper.jarbin53639 -> 54329 bytes
-rw-r--r--recipe-custom-virgo/gradle/wrapper/gradle-wrapper.properties3
-rwxr-xr-xrecipe-custom-virgo/gradlew72
-rw-r--r--recipe-custom-virgo/gradlew.bat174
-rw-r--r--recipe-custom-virgo/org.eclipse.virgo.samples.recipe.bundle/template.mf2
-rw-r--r--recipe-custom-virgo/recipe-custom-virgo-runtime/build.gradle11
-rw-r--r--recipe-custom-virgo/src/docs/asciidoc/recipe-custom-runtime.adoc6
-rw-r--r--recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc2
-rw-r--r--recipe-template/src/docs/asciidoc/051_get-the-code.adoc2
-rw-r--r--recipe-template/src/docs/asciidoc/055_import-the-code.adoc2
-rw-r--r--recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc2
17 files changed, 225 insertions, 199 deletions
diff --git a/.gitignore b/.gitignore
index 5e46957..ade318b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,6 @@
*/src/main/resources/META-INF/MANIFEST.MF
*/src/test/resources/META-INF/TEST.MF
junit*.properties
-target/
-build/
-bin/
-.gradle/
-.settings/
-.classpath
-.project
-.springbeans
integration-repo
ivy-cache
derby.log
@@ -16,3 +8,22 @@ derby.log
com.cenqua.clover.core.prefs
user-ivy.properties
.DS_Store
+
+.gradle
+
+target/
+bin/
+build/
+out/
+
+# Eclipse
+.classpath
+.project
+.settings/
+.springbeans
+
+# IDEA
+.idea/
+*.iml
+*.ipr
+*.iws
diff --git a/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
index 6ecb020..3e35458 100644
--- a/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
+++ b/recipe-accessing-data-mongodb/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -1,5 +1,5 @@
-== Dockerise the Application ==
+== Dockerize the Application ==
We use Gradle and Dockerizor to build the application.
Instead of running the sample within the Eclipse IDE you can build a https://www.docker.com/[Docker] image:
diff --git a/recipe-custom-virgo/README.adoc b/recipe-custom-virgo/README.adoc
deleted file mode 100644
index e69de29..0000000
--- a/recipe-custom-virgo/README.adoc
+++ /dev/null
diff --git a/recipe-custom-virgo/README.md b/recipe-custom-virgo/README.md
index a6ff501..b7c5b07 100644
--- a/recipe-custom-virgo/README.md
+++ b/recipe-custom-virgo/README.md
@@ -1 +1 @@
-Please check src/asciidoc/recipe-xyz.adoc for detailed information
+Please check src/asciidoc/recipe-custom-runtime.adoc for detailed information
diff --git a/recipe-custom-virgo/build.gradle b/recipe-custom-virgo/build.gradle
index 0c0f58a..97f83d1 100644
--- a/recipe-custom-virgo/build.gradle
+++ b/recipe-custom-virgo/build.gradle
@@ -8,18 +8,20 @@ buildscript {
}
dependencies {
classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
- classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.7.0"
+ classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.9.1"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
-apply plugin: 'org.asciidoctor.gradle.asciidoctor'
+ext {
+ mongoJavaDriverVersion = "2.13.3"
+ rabbitmqAmqpClientVersion = "3.5.5"
-ext.virgoProjects = [
- project(':org.eclipse.virgo.samples.recipe.bundle'),
-]
-
-ext.dockerProjects = subprojects.findAll {it.name.contains('-runtime') || it.name.contains('-app')}
+ virgoProjects = [
+ project(':org.eclipse.virgo.samples.recipe.bundle'),
+ ]
+ dockerProjects = subprojects.findAll { it.name.contains('-runtime') || it.name.contains('-app') }
+}
configure(virgoProjects + dockerProjects) {
repositories {
@@ -34,51 +36,63 @@ configure(virgoProjects + dockerProjects) {
configure(virgoProjects) {
apply plugin: 'java'
+ apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'eclipse-wtp'
- version = '0.1.0.BUILD-SNAPSHOT'
-
compileJava {
- options.encoding = 'utf-8'
- options.fork = true
- doFirst {
- options.forkOptions.with {
- executable = 'java'
- jvmArgs = [
- '-cp',
- configurations.ecj.asPath,
- 'org.eclipse.jdt.internal.compiler.batch.Main',
- '-source',
- '1.8',
- '-target',
- '1.8',
- '-warn:-unused'
- ]
- }
- }
+ sourceCompatibility = 1.8 // can be switched to 10 for testing
+ targetCompatibility = 1.8
+ options.encoding = 'UTF-8'
}
compileTestJava {
- options.encoding = 'utf-8'
- options.fork = true
- doFirst {
- options.forkOptions.with {
- executable = 'java'
- jvmArgs = [
- '-cp',
- configurations.ecj.asPath,
- 'org.eclipse.jdt.internal.compiler.batch.Main',
- '-source',
- '1.8',
- '-target',
- '1.8',
- '-warn:-unused'
- ]
- }
- }
+ sourceCompatibility = 1.8 // can be switched to 10 for testing
+ targetCompatibility = 1.8
+ options.encoding = 'UTF-8'
+ options.compilerArgs += "-parameters"
}
+// compileJava {
+// options.encoding = 'utf-8'
+// options.fork = true
+// doFirst {
+// options.forkOptions.with {
+// executable = 'java'
+// jvmArgs = [
+// '-cp',
+// configurations.ecj.asPath,
+// 'org.eclipse.jdt.internal.compiler.batch.Main',
+// '-source',
+// '1.8',
+// '-target',
+// '1.8',
+// '-warn:-unused'
+// ]
+// }
+// }
+// }
+
+// compileTestJava {
+// options.encoding = 'utf-8'
+// options.fork = true
+// doFirst {
+// options.forkOptions.with {
+// executable = 'java'
+// jvmArgs = [
+// '-cp',
+// configurations.ecj.asPath,
+// 'org.eclipse.jdt.internal.compiler.batch.Main',
+// '-source',
+// '1.8',
+// '-target',
+// '1.8',
+// '-warn:-unused'
+// ]
+// }
+// }
+// }
+
eclipse {
jdt {
sourceCompatibility = 1.8
@@ -147,15 +161,15 @@ configure(dockerProjects) {
dockerizor {
maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
- javaImage = 'java:8u92-jre-alpine' // <3>
+ javaImage = 'openjdk:8u171-jre-alpine3.7' // <3>
virgoVersion = 'latest'
- hudsonJobName = 'gradle-build'
+ hudsonJobName = 'virgo-master'
- removeAdminConsole = System.properties['local.build'] != 'true'
+ removeSplash = false
+ removeAdminConsole = false
virgoFlavour = 'VTS'
- virgoVersion = 'latest'
}
dockerize.dependsOn configurations.repositoryExt
@@ -163,6 +177,6 @@ configure(dockerProjects) {
}
// end::dockerizor_confiugration[]
-task wrapper(type: Wrapper) {
- gradleVersion = '2.10'
+configure(rootProject) {
+ apply plugin: 'org.asciidoctor.gradle.asciidoctor'
}
diff --git a/recipe-custom-virgo/gradle.properties b/recipe-custom-virgo/gradle.properties
index f04d5b2..608dd1f 100644
--- a/recipe-custom-virgo/gradle.properties
+++ b/recipe-custom-virgo/gradle.properties
@@ -1,4 +1 @@
-springframeworkVersion = 4.2.1.RELEASE
-
-mongoJavaDriverVersion = 2.13.3
-rabbitmqAmqpClientVersion = 3.5.5
+version=0.2.0.BUILD-SNAPSHOT
diff --git a/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.jar b/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.jar
index 2c6137b..f6b961f 100644
--- a/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.jar
+++ b/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.properties b/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.properties
index c05a838..bf3de21 100644
--- a/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.properties
+++ b/recipe-custom-virgo/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Apr 18 10:46:42 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
diff --git a/recipe-custom-virgo/gradlew b/recipe-custom-virgo/gradlew
index 9d82f78..cccdd3d 100755
--- a/recipe-custom-virgo/gradlew
+++ b/recipe-custom-virgo/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,20 +6,38 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/recipe-custom-virgo/gradlew.bat b/recipe-custom-virgo/gradlew.bat
index 5f19212..e95643d 100644
--- a/recipe-custom-virgo/gradlew.bat
+++ b/recipe-custom-virgo/gradlew.bat
@@ -1,90 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/recipe-custom-virgo/org.eclipse.virgo.samples.recipe.bundle/template.mf b/recipe-custom-virgo/org.eclipse.virgo.samples.recipe.bundle/template.mf
index 0d7bf8d..c7cedbd 100644
--- a/recipe-custom-virgo/org.eclipse.virgo.samples.recipe.bundle/template.mf
+++ b/recipe-custom-virgo/org.eclipse.virgo.samples.recipe.bundle/template.mf
@@ -1,3 +1,3 @@
Bundle-Version: 0.1
-Bundle-Name: Virgo Placeholder Bundle
+Bundle-Name: Virgo Sample Receipe Bundle
Bundle-SymbolicName: org.eclipse.virgo.samples.recipe.bundle
diff --git a/recipe-custom-virgo/recipe-custom-virgo-runtime/build.gradle b/recipe-custom-virgo/recipe-custom-virgo-runtime/build.gradle
index 48198d6..a1405e7 100644
--- a/recipe-custom-virgo/recipe-custom-virgo-runtime/build.gradle
+++ b/recipe-custom-virgo/recipe-custom-virgo-runtime/build.gradle
@@ -33,13 +33,12 @@ dependencies {
// end::custom_virgo_runtime_dependencies[]
task unzipRuntime(type: Copy, dependsOn: dockerize) {
- doLast() {
- def tarFile = new groovy.util.FileNameByRegexFinder().getFileNames("${->project.buildDir.absolutePath}", /.*\.tar/).get(0)
- def outputDir = file("${buildDir}")
+ outputs.upToDateWhen { false } // always unzip
+ def tarFile = new groovy.util.FileNameByRegexFinder().getFileNames("${->project.buildDir.absolutePath}", /.*\.tar/).get(0)
+ def outputDir = file("${buildDir}")
- from tarTree(tarFile)
- into outputDir
- }
+ from tarTree(tarFile)
+ into outputDir
}
// tag::task_start_virgo_runtime[]
diff --git a/recipe-custom-virgo/src/docs/asciidoc/recipe-custom-runtime.adoc b/recipe-custom-virgo/src/docs/asciidoc/recipe-custom-runtime.adoc
index b91e6af..7276560 100644
--- a/recipe-custom-virgo/src/docs/asciidoc/recipe-custom-runtime.adoc
+++ b/recipe-custom-virgo/src/docs/asciidoc/recipe-custom-runtime.adoc
@@ -95,9 +95,9 @@ allow to test drive the Virgo runtime
$ ./gradlew :recipe-custom-virgo-runtime:startVirgoRuntime
----
-=== Bundle and deploy non OSGi-ready dependencies
+=== Bundle and deploy none OSGi-ready dependencies
-To be able to create and verify non OSGi-ready dependencies we need to
+To be able to create and verify none OSGi-ready dependencies we need to
* create OSGi metadata and
* deploy the bundled jar file.
@@ -150,7 +150,7 @@ $ ./gradlew :recipe-custom-virgo-runtime:com.rabbitmq.amqp.client-3.5.5:deploy
include::../../../../recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc[]
-Virgo plan are a proven way to add the application bundles to a Virgo runtime.
+Virgo plans are a proven way to add the application bundles to a Virgo runtime.
The snippet below shows the Gradle build file (Dockerizor configuration) needed to add such a plan file.
.build.gradle
diff --git a/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc
index b8e7146..492e92c 100644
--- a/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc
+++ b/recipe-messaging-rabbitmq/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -1,5 +1,5 @@
-== Dockerise the Application ==
+== Dockerize the Application ==
We use Gradle and Dockerizor to build the application.
Instead of running the sample within the Eclipse IDE you can build a https://www.docker.com/[Docker] image:
diff --git a/recipe-template/src/docs/asciidoc/051_get-the-code.adoc b/recipe-template/src/docs/asciidoc/051_get-the-code.adoc
index a5a6c17..41799bd 100644
--- a/recipe-template/src/docs/asciidoc/051_get-the-code.adoc
+++ b/recipe-template/src/docs/asciidoc/051_get-the-code.adoc
@@ -11,4 +11,4 @@ $ cd org.eclipse.virgo.samples
$ cd {recipe-short-name}
----
-Once inside the source directory of this recipe - your are good to go.
+Once inside the source directory of this recipe - you are good to go.
diff --git a/recipe-template/src/docs/asciidoc/055_import-the-code.adoc b/recipe-template/src/docs/asciidoc/055_import-the-code.adoc
index dd7d68f..5c3faa1 100644
--- a/recipe-template/src/docs/asciidoc/055_import-the-code.adoc
+++ b/recipe-template/src/docs/asciidoc/055_import-the-code.adoc
@@ -6,6 +6,6 @@ The project folder is called {recipe-short-name} and lies directly in the "Samp
[NOTE]
--
-Before you can drag'n'drop the project onto your freshly created Virgo Server you might have to execute
+Before you can drag and drop the project onto your freshly created Virgo Server you might have to execute
menu:Virgo[Run Generation] of +META-INF/MANIFEST.MF+ (via a right click on the project) within your Eclipse IDE.
--
diff --git a/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc b/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
index 599630d..d878048 100644
--- a/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
+++ b/recipe-template/src/docs/asciidoc/08_dockerize_recipe.adoc
@@ -1,5 +1,5 @@
-== Dockerise the Application ==
+== Dockerize the Application ==
We use Gradle and Dockerizor to build the application.
Instead of running the sample within the Eclipse IDE you can build a https://www.docker.com/[Docker] image:

Back to the top