You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/01/03 19:07:59 UTC

[06/10] isis git commit: ISIS-1559: minor edits to README of simpleapp

ISIS-1559: minor edits to README of simpleapp


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/acec89a5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/acec89a5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/acec89a5

Branch: refs/heads/master
Commit: acec89a5b2d0d26a6613fbe8d8bc4b6e527f9c6d
Parents: 0eebd25
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Dec 31 14:50:13 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Dec 31 14:54:25 2016 +0000

----------------------------------------------------------------------
 example/application/simpleapp/README.adoc | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/acec89a5/example/application/simpleapp/README.adoc
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/README.adoc b/example/application/simpleapp/README.adoc
index 4f9b95d..0849274 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -77,7 +77,7 @@ mvn -f pom-jdo-enhance-all.xml datanucleus:enhance
 +
 [source,bash]
 ----
-mvn package -Dmavenmixin-jettyconsole
+mvn install -Dmavenmixin-jettyconsole
 ----
 +
 This can then be run using: +
@@ -87,7 +87,7 @@ This can then be run using: +
 cd webapp/target && java -jar simpleapp-webapp-xxx-jetty-console.war
 ----
 +
-Add additional flags, eg ``--headless`` or ``--port 9999``, if required.
+Add additional arguments ``--headless`` or ``--port 9999``, if required.
 +
 It can also be run using: +
 +
@@ -130,7 +130,6 @@ This is intended to run only for the `module-simple` module, and will generate a
 ====
 
 
-
 * To disable the running of unit tests: +
 +
 [source,bash]
@@ -174,7 +173,7 @@ By default, output of integration tests are in  `target/surefire-integbddspecs-r
 mvn -DskipTests 
 ----
 
-* To disable the running of the `isis:validate goal: +
+* To disable the running of the `isis:validate` goal: +
 +
 [source,bash]
 ----
@@ -220,22 +219,25 @@ Alternatively it can be specified on the command line using a system property, e
 ----
 mvn package -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
 ----
++
+The packaged image can be viewed using `docker images`.
 
-* To upload the application as a docker image to link:https://hub.docker.com[docker hub]: +
+* To run a docker image previously packaged: +
 +
 [source,bash]
 ----
-mvn deploy -Dmavenmixin-docker
+docker run -d -p 8080:8080 mycompany/myapp
 ----
 +
-This once again assumes that the `${docker-plugin.imageName}` property has been defined, _and_ also that docker registry credentials have been specified in `~/.m2/settings.xml`.
-See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-configure[mavenmixin-docker] for further details.
+See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mavenmixin-docker] for further details on how to run docker images.
 
-* To run a docker image previously packaged/uploaded: +
+* To upload the application as a docker image to link:https://hub.docker.com[docker hub] (or some other docker registry): +
 +
 [source,bash]
 ----
-docker run -d -p 8080:8080 mycompany/myapp
+mvn deploy -Dmavenmixin-docker
 ----
 +
-See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-consume[mavenmixin-docker] for further details on how to consume docker images.
+This assumes that the `${docker-plugin.imageName}` property has been defined, _and_ also that docker registry credentials have been specified in `~/.m2/settings.xml`.
+See link:https://github.com/danhaywood/java-mavenmixin-docker#how-to-configure[mavenmixin-docker] for further details.
+