date:20161222

[isis] Git Push Summary

2016-12-22 Thread danhaywood

Repository: isis
Updated Branches:
  refs/heads/maint-1.13.2.1 [created] b47edb69f

[3/8] isis git commit: ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere also where possible.

2016-12-22 Thread danhaywood

ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere 
also where possible.

Also moves the specglue from the application module to the module-simple module.


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

Branch: refs/heads/maint-1.13.3
Commit: 1e81a3a0e2a7815a8052a41702a96551f1d421af
Parents: 735cb81
Author: Dan Haywood 
Authored: Thu Dec 22 18:45:49 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:45:49 2016 +

--
 .../application/simpleapp/application/pom.xml   |   7 +-
 .../fixture/scenarios/DomainAppDemo.java|  28 +--
 .../fixture/teardown/DomainAppTearDown.java |   5 -
 .../DomainAppAppManifestWithFixtures.java   |   4 +-
 .../services/homepage/HomePageViewModel.java|   9 -
 .../bdd/specglue/BootstrappingGlue.java |   2 -
 .../bdd/specglue/CatalogOfFixturesGlue.java |   6 +-
 .../bdd/specglue/SimpleObjectGlue.java  |  50 --
 .../application/bdd/specs/RunIntegBddSpecs.java |   5 +-
 .../SimpleObjectSpec_listAllAndCreate.feature   |   2 +-
 .../application/integtests/Smoke_IntegTest.java |   4 +-
 .../simple/dom/SimpleModuleDomSubmodule.java|   2 +-
 .../modules/simple/dom/impl/SimpleObject.java   | 180 +--
 .../fixture/SimpleModuleFixtureSubmodule.java   |   3 +-
 .../fixture/data/SimpleObjectMenu_create.java   |  58 --
 .../fixture/scenario/CreateSimpleObjects.java   |  81 +
 .../fixture/scenario/RecreateSimpleObjects.java |  76 
 .../tests/SimpleObjectMenu_IntegTest.java   |   8 +-
 .../tests/SimpleObject_IntegTest.java   |  10 +-
 .../simple/specglue/SimpleObjectMenuGlue.java   |  53 ++
 example/application/simpleapp/pom.xml   |   6 +
 .../src/main/webapp/WEB-INF/translations-en.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations-es.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations-nl.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations.po |   2 +-
 25 files changed, 221 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/1e81a3a0/example/application/simpleapp/application/pom.xml
--
diff --git a/example/application/simpleapp/application/pom.xml 
b/example/application/simpleapp/application/pom.xml
index d0dd876..293ffc0 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -107,7 +107,12 @@
 ${project.groupId}
 simpleapp-module-simple
 
-
+
+${project.groupId}
+simpleapp-module-simple
+test-jar
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1e81a3a0/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
--
diff --git 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
index 8914ba8..7f3ce27 100644
--- 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
+++ 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
@@ -18,10 +18,14 @@
  */
 package domainapp.application.fixture.scenarios;
 
+import javax.annotation.Nullable;
+
 import org.apache.isis.applib.fixturescripts.FixtureScript;
 
 import domainapp.application.fixture.teardown.DomainAppTearDown;
-import domainapp.modules.simple.fixture.scenario.RecreateSimpleObjects;
+import domainapp.modules.simple.fixture.scenario.CreateSimpleObjects;
+import lombok.Getter;
+import lombok.Setter;
 
 public class DomainAppDemo extends FixtureScript {
 
@@ -29,32 +33,16 @@ public class DomainAppDemo extends FixtureScript {
 withDiscoverability(Discoverability.DISCOVERABLE);
 }
 
-//region > number (optional input)
+@Nullable
+@Getter @Setter
 private Integer number;
 
-/**
- * The number of objects to create, up to 10; optional, defaults to 3.
- */
-public Integer getNumber() {
-return number;
-}
-
-public DomainAppDemo setNumber(final Integer number) {
-this.number = number;
-return this;
-}
-//endregion
-
 @Override
 protected void execute(final ExecutionContext ec) {
 
-//

[5/8] isis git commit: ISIS-1558: extends the simpleapp to use spotify maven plugin directly

2016-12-22 Thread danhaywood

ISIS-1558: extends the simpleapp to use spotify maven plugin directly


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

Branch: refs/heads/maint-1.13.3
Commit: 8b025f3123839584bc2fc26aaeaf41f1868c6add
Parents: b58c61a
Author: Dan Haywood 
Authored: Thu Dec 22 14:16:32 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:54:20 2016 +

--
 example/application/simpleapp/pom.xml   | 12 +++
 example/application/simpleapp/webapp/pom.xml| 79 +++-
 .../webapp/src/main/resources/docker/Dockerfile |  5 ++
 3 files changed, 93 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/8b025f31/example/application/simpleapp/pom.xml
--
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index 56707d1..0616fa7 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -89,6 +89,10 @@
 2.0-beta-2
 2.5
 
+0.0.1-SNAPSHOT
+2.8.1
+0.4.13
+
 0.0.2
 0.0.1
 0.0.1
@@ -233,6 +237,14 @@
 findbugs-maven-plugin
 ${findbugs-maven-plugin.version}
 
+
+
+
+com.spotify
+docker-maven-plugin
+${docker-maven-plugin.version}
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/8b025f31/example/application/simpleapp/webapp/pom.xml
--
diff --git a/example/application/simpleapp/webapp/pom.xml 
b/example/application/simpleapp/webapp/pom.xml
index 96b22a5..41d77bb 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -42,12 +42,19 @@
 
${basedir}/src/main/jettyconsole/isis-banner.png
 
 
${project.parent.artifactId}
+
+
danhaywood/isis-app-simpleapp
+
${maven-war-plugin.warName}.war
+Apache Isis 
committers
+docker-hub
+
https://index.docker.io/v1/
+
 
 
 
 
 
-false
+true
 src/main/resources
 
 
@@ -88,6 +95,7 @@
 
 
 
+
 
 com.github.odavid.maven.plugins
 mixin-maven-plugin
@@ -123,6 +131,73 @@
 
 
 
+
+
+org.apache.maven.plugins
+maven-deploy-plugin
+
+true
+
+
+
+com.spotify
+docker-maven-plugin
+
+
+build-image
+package
+
+build
+
+
+
+tag-image
+install
+
+tag
+
+
+${docker-plugin.imageName}
+
${docker-plugin.imageName}:${project.version}
+
+
+
+push-image
+deploy
+
+push
+
+
+
${docker-plugin.imageName}:${project.version}
+
+
+
+push-image-latest
+deploy
+
+push
+
+
+
${docker-plugin.imageName}:latest
+
+
+
+
+${docker-plugin.imageName}
+
${build.outputDirectory}/docker
+
+
+.
+${project.build.directory}
+
${docker-plugin.resource.include}
+
+
+${docker-plugin.serverId}
+${docker-plugin.registryUrl}
+
+

[4/8] isis git commit: ISIS-1556: fixes DomainAppFixtureScriptsSpecificationProvider...

2016-12-22 Thread danhaywood

ISIS-1556: fixes DomainAppFixtureScriptsSpecificationProvider...

use DomainAppDemo fixture script rather than RecreateSimpleObjects fixture 
script


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

Branch: refs/heads/maint-1.13.3
Commit: b58c61a29685abcd4d96838bd2ee9e255cdcfa94
Parents: 43a7fc2
Author: Dan Haywood 
Authored: Wed Dec 21 11:58:31 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:53:53 2016 +

--
 .../fixture/DomainAppFixtureScriptsSpecificationProvider.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/b58c61a2/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
--
diff --git 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index aa48811..703c42f 100644
--- 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecification;
 import 
org.apache.isis.applib.services.fixturespec.FixtureScriptsSpecificationProvider;
 
-import domainapp.modules.simple.fixture.scenario.RecreateSimpleObjects;
+import domainapp.application.fixture.scenarios.DomainAppDemo;
 
 /**
  * Specifies where to find fixtures, and other settings.
@@ -36,9 +36,9 @@ public class DomainAppFixtureScriptsSpecificationProvider 
implements FixtureScri
 return FixtureScriptsSpecification
 .builder(DomainAppFixtureScriptsSpecificationProvider.class)
 .with(FixtureScripts.MultipleExecutionStrategy.EXECUTE)
-.withRunScriptDefault(RecreateSimpleObjects.class)
+.withRunScriptDefault(DomainAppDemo.class)
 
.withRunScriptDropDown(FixtureScriptsSpecification.DropDownPolicy.CHOICES)
-.withRecreate(RecreateSimpleObjects.class)
+.withRecreate(DomainAppDemo.class)
 .build();
 }
 }

[1/8] isis git commit: ISIS-1558: extends the simpleapp to use spotify maven plugin directly

2016-12-22 Thread danhaywood

Repository: isis
Updated Branches:
  refs/heads/maint-1.13.3 7c2ca9933 -> e2f0a9f58


ISIS-1558: extends the simpleapp to use spotify maven plugin directly


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

Branch: refs/heads/maint-1.13.3
Commit: 0febb58e932e57eee1ef4a3829bb3cf98952791a
Parents: 7c2ca99
Author: Dan Haywood 
Authored: Thu Dec 22 14:16:32 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 14:16:32 2016 +

--
 example/application/simpleapp/pom.xml   | 12 +++
 example/application/simpleapp/webapp/pom.xml| 79 +++-
 .../webapp/src/main/resources/docker/Dockerfile |  5 ++
 3 files changed, 93 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/0febb58e/example/application/simpleapp/pom.xml
--
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index 56707d1..0616fa7 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -89,6 +89,10 @@
 2.0-beta-2
 2.5
 
+0.0.1-SNAPSHOT
+2.8.1
+0.4.13
+
 0.0.2
 0.0.1
 0.0.1
@@ -233,6 +237,14 @@
 findbugs-maven-plugin
 ${findbugs-maven-plugin.version}
 
+
+
+
+com.spotify
+docker-maven-plugin
+${docker-maven-plugin.version}
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/0febb58e/example/application/simpleapp/webapp/pom.xml
--
diff --git a/example/application/simpleapp/webapp/pom.xml 
b/example/application/simpleapp/webapp/pom.xml
index 96b22a5..41d77bb 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -42,12 +42,19 @@
 
${basedir}/src/main/jettyconsole/isis-banner.png
 
 
${project.parent.artifactId}
+
+
danhaywood/isis-app-simpleapp
+
${maven-war-plugin.warName}.war
+Apache Isis 
committers
+docker-hub
+
https://index.docker.io/v1/
+
 
 
 
 
 
-false
+true
 src/main/resources
 
 
@@ -88,6 +95,7 @@
 
 
 
+
 
 com.github.odavid.maven.plugins
 mixin-maven-plugin
@@ -123,6 +131,73 @@
 
 
 
+
+
+org.apache.maven.plugins
+maven-deploy-plugin
+
+true
+
+
+
+com.spotify
+docker-maven-plugin
+
+
+build-image
+package
+
+build
+
+
+
+tag-image
+install
+
+tag
+
+
+${docker-plugin.imageName}
+
${docker-plugin.imageName}:${project.version}
+
+
+
+push-image
+deploy
+
+push
+
+
+
${docker-plugin.imageName}:${project.version}
+
+
+
+push-image-latest
+deploy
+
+push
+
+
+
${docker-plugin.imageName}:latest
+
+
+
+
+${docker-plugin.imageName}
+
${build.outputDirectory}/docker
+
+
+.
+${project.build.directory}
+
${docker-plugin.resource.include}
+
+
+

[7/8] isis git commit: ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere also where possible.

2016-12-22 Thread danhaywood

ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere 
also where possible.

Also moves the specglue from the application module to the module-simple module.


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

Branch: refs/heads/maint-1.13.3
Commit: b47edb69fe4a221fdffc5eea6efca0150aa9bfb9
Parents: 9ccf35a
Author: Dan Haywood 
Authored: Thu Dec 22 18:45:49 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:54:38 2016 +

--
 .../application/simpleapp/application/pom.xml   |   7 +-
 .../fixture/scenarios/DomainAppDemo.java|  28 +--
 .../fixture/teardown/DomainAppTearDown.java |   5 -
 .../DomainAppAppManifestWithFixtures.java   |   4 +-
 .../services/homepage/HomePageViewModel.java|   9 -
 .../bdd/specglue/BootstrappingGlue.java |   2 -
 .../bdd/specglue/CatalogOfFixturesGlue.java |   6 +-
 .../bdd/specglue/SimpleObjectGlue.java  |  50 --
 .../application/bdd/specs/RunIntegBddSpecs.java |   5 +-
 .../SimpleObjectSpec_listAllAndCreate.feature   |   2 +-
 .../application/integtests/Smoke_IntegTest.java |   4 +-
 .../simple/dom/SimpleModuleDomSubmodule.java|   2 +-
 .../modules/simple/dom/impl/SimpleObject.java   | 180 +--
 .../fixture/SimpleModuleFixtureSubmodule.java   |   3 +-
 .../fixture/data/SimpleObjectMenu_create.java   |  58 --
 .../fixture/scenario/CreateSimpleObjects.java   |  81 +
 .../fixture/scenario/RecreateSimpleObjects.java |  76 
 .../tests/SimpleObjectMenu_IntegTest.java   |   8 +-
 .../tests/SimpleObject_IntegTest.java   |  10 +-
 .../simple/specglue/SimpleObjectMenuGlue.java   |  53 ++
 example/application/simpleapp/pom.xml   |   6 +
 .../src/main/webapp/WEB-INF/translations-en.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations-es.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations-nl.po  |   2 +-
 .../src/main/webapp/WEB-INF/translations.po |   2 +-
 25 files changed, 221 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/b47edb69/example/application/simpleapp/application/pom.xml
--
diff --git a/example/application/simpleapp/application/pom.xml 
b/example/application/simpleapp/application/pom.xml
index d0dd876..293ffc0 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -107,7 +107,12 @@
 ${project.groupId}
 simpleapp-module-simple
 
-
+
+${project.groupId}
+simpleapp-module-simple
+test-jar
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b47edb69/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
--
diff --git 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
index 8914ba8..7f3ce27 100644
--- 
a/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
+++ 
b/example/application/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
@@ -18,10 +18,14 @@
  */
 package domainapp.application.fixture.scenarios;
 
+import javax.annotation.Nullable;
+
 import org.apache.isis.applib.fixturescripts.FixtureScript;
 
 import domainapp.application.fixture.teardown.DomainAppTearDown;
-import domainapp.modules.simple.fixture.scenario.RecreateSimpleObjects;
+import domainapp.modules.simple.fixture.scenario.CreateSimpleObjects;
+import lombok.Getter;
+import lombok.Setter;
 
 public class DomainAppDemo extends FixtureScript {
 
@@ -29,32 +33,16 @@ public class DomainAppDemo extends FixtureScript {
 withDiscoverability(Discoverability.DISCOVERABLE);
 }
 
-//region > number (optional input)
+@Nullable
+@Getter @Setter
 private Integer number;
 
-/**
- * The number of objects to create, up to 10; optional, defaults to 3.
- */
-public Integer getNumber() {
-return number;
-}
-
-public DomainAppDemo setNumber(final Integer number) {
-this.number = number;
-return this;
-}
-//endregion
-
 @Override
 protected void execute(final ExecutionContext ec) {
 
-//

[2/8] isis git commit: ISIS-1558: replaces configuration with mavenmixin-docker.

2016-12-22 Thread danhaywood

ISIS-1558: replaces configuration with mavenmixin-docker.


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

Branch: refs/heads/maint-1.13.3
Commit: 735cb8193c6d16c78143d84b6ca678562d48bfce
Parents: 0febb58
Author: Dan Haywood 
Authored: Thu Dec 22 17:28:33 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 17:28:33 2016 +

--
 example/application/simpleapp/README.adoc   | 40 ++-
 example/application/simpleapp/pom.xml   |  2 +-
 example/application/simpleapp/webapp/pom.xml| 74 ++--
 .../webapp/src/main/resources/docker/Dockerfile |  1 -
 4 files changed, 46 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/735cb819/example/application/simpleapp/README.adoc
--
diff --git a/example/application/simpleapp/README.adoc 
b/example/application/simpleapp/README.adoc
index df457bb..e61edec 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -51,7 +51,7 @@ Larger applications should consist of multiple modules; each 
such module can be
 
 
 |`webapp`
-|Assembles the application into a webapp (comprising both the Wicket viewer 
and Restful Objects viewer) and runs the `isis:swagger` goal.
+|Assembles the application into a webapp (comprising both the Wicket viewer 
and Restful Objects viewer) and also as a docker image, and runs the 
`isis:swagger` goal.
 
 |`_checks`
 |Checkstyle and PMD rule sets for static analysis.
@@ -88,6 +88,21 @@ cd webapp/target && java -jar 
simpleapp-webapp-xxx-jetty-console.war
 
 +
 Add additional flags, eg ``--headless`` or ``--port ``, if required.
++
+It can also be run using: +
++
+[source,bash]
+
+mvn -pl webapp && mvn antrun:run -Dmavenmixin-jettyconsole
+
++
+or to specify arguments:
++
+[source,bash]
+
+mvn -pl webapp && mvn antrun:run -Dmavenmixin-jettyconsole \
+-Dmaven-antrun-plugin.jettyconsole.args="--headless --port 9090"
+
 
 
 * To also generate source and javadoc JARs:
@@ -191,4 +206,27 @@ mvn -Dskip.danhaywood-mavenmixin-isisswagger
 By default, Swagger spec files are generated at 
`target/generated-resources/isis-swagger` (in the ``webapp`` module).
 
 
+* To package up the application as a docker image: +
++
+[source,bash]
+
+mvn package -Dmavenmixin-docker
+
++
+This assumes that the `${docker-plugin.imageName}` property has been defined 
in the `webapp` module.
+Alternatively it can be specified on the command line using a system property, 
eg:
++
+[source,bash]
+
+mvn package -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
+
 
+* To upload the application as a docker image to 
link:https://hub.docker.com[docker hub]: +
++
+[source,bash]
+
+mvn deploy -Dmavenmixin-docker
+
++
+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.

http://git-wip-us.apache.org/repos/asf/isis/blob/735cb819/example/application/simpleapp/pom.xml
--
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index 0616fa7..464ffdf 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -89,7 +89,7 @@
 2.0-beta-2
 2.5
 
-0.0.1-SNAPSHOT
+0.0.2
 2.8.1
 0.4.13
 

http://git-wip-us.apache.org/repos/asf/isis/blob/735cb819/example/application/simpleapp/webapp/pom.xml
--
diff --git a/example/application/simpleapp/webapp/pom.xml 
b/example/application/simpleapp/webapp/pom.xml
index 41d77bb..d0a2e40 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -43,9 +43,8 @@
 
 
${project.parent.artifactId}
 
-
danhaywood/isis-app-simpleapp
+
DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}
 
${maven-war-plugin.warName}.war
-Apache Isis 
committers
 docker-hub
 
https://index.docker.io/v1/
 
@@ -128,76 +127,15 @@
 jettyconsole
 
${mavenmixin-jettyconsole.version}
 
+
+

[6/8] isis git commit: ISIS-1558: replaces configuration with mavenmixin-docker.

2016-12-22 Thread danhaywood

ISIS-1558: replaces configuration with mavenmixin-docker.


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

Branch: refs/heads/maint-1.13.3
Commit: 9ccf35ada8983460947ea9d71655a33ce4fc69b8
Parents: 8b025f3
Author: Dan Haywood 
Authored: Thu Dec 22 17:28:33 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:54:30 2016 +

--
 example/application/simpleapp/README.adoc   | 40 ++-
 example/application/simpleapp/pom.xml   |  2 +-
 example/application/simpleapp/webapp/pom.xml| 74 ++--
 .../webapp/src/main/resources/docker/Dockerfile |  1 -
 4 files changed, 46 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/isis/blob/9ccf35ad/example/application/simpleapp/README.adoc
--
diff --git a/example/application/simpleapp/README.adoc 
b/example/application/simpleapp/README.adoc
index df457bb..e61edec 100644
--- a/example/application/simpleapp/README.adoc
+++ b/example/application/simpleapp/README.adoc
@@ -51,7 +51,7 @@ Larger applications should consist of multiple modules; each 
such module can be
 
 
 |`webapp`
-|Assembles the application into a webapp (comprising both the Wicket viewer 
and Restful Objects viewer) and runs the `isis:swagger` goal.
+|Assembles the application into a webapp (comprising both the Wicket viewer 
and Restful Objects viewer) and also as a docker image, and runs the 
`isis:swagger` goal.
 
 |`_checks`
 |Checkstyle and PMD rule sets for static analysis.
@@ -88,6 +88,21 @@ cd webapp/target && java -jar 
simpleapp-webapp-xxx-jetty-console.war
 
 +
 Add additional flags, eg ``--headless`` or ``--port ``, if required.
++
+It can also be run using: +
++
+[source,bash]
+
+mvn -pl webapp && mvn antrun:run -Dmavenmixin-jettyconsole
+
++
+or to specify arguments:
++
+[source,bash]
+
+mvn -pl webapp && mvn antrun:run -Dmavenmixin-jettyconsole \
+-Dmaven-antrun-plugin.jettyconsole.args="--headless --port 9090"
+
 
 
 * To also generate source and javadoc JARs:
@@ -191,4 +206,27 @@ mvn -Dskip.danhaywood-mavenmixin-isisswagger
 By default, Swagger spec files are generated at 
`target/generated-resources/isis-swagger` (in the ``webapp`` module).
 
 
+* To package up the application as a docker image: +
++
+[source,bash]
+
+mvn package -Dmavenmixin-docker
+
++
+This assumes that the `${docker-plugin.imageName}` property has been defined 
in the `webapp` module.
+Alternatively it can be specified on the command line using a system property, 
eg:
++
+[source,bash]
+
+mvn package -Dmavenmixin-docker -Ddocker-plugin.imageName=mycompany/myapp
+
 
+* To upload the application as a docker image to 
link:https://hub.docker.com[docker hub]: +
++
+[source,bash]
+
+mvn deploy -Dmavenmixin-docker
+
++
+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.

http://git-wip-us.apache.org/repos/asf/isis/blob/9ccf35ad/example/application/simpleapp/pom.xml
--
diff --git a/example/application/simpleapp/pom.xml 
b/example/application/simpleapp/pom.xml
index 0616fa7..464ffdf 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -89,7 +89,7 @@
 2.0-beta-2
 2.5
 
-0.0.1-SNAPSHOT
+0.0.2
 2.8.1
 0.4.13
 

http://git-wip-us.apache.org/repos/asf/isis/blob/9ccf35ad/example/application/simpleapp/webapp/pom.xml
--
diff --git a/example/application/simpleapp/webapp/pom.xml 
b/example/application/simpleapp/webapp/pom.xml
index 41d77bb..d0a2e40 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -43,9 +43,8 @@
 
 
${project.parent.artifactId}
 
-
danhaywood/isis-app-simpleapp
+
DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}
 
${maven-war-plugin.warName}.war
-Apache Isis 
committers
 docker-hub
 
https://index.docker.io/v1/
 
@@ -128,76 +127,15 @@
 jettyconsole
 
${mavenmixin-jettyconsole.version}
 
+
+

[8/8] isis git commit: Merge branch 'maint-1.13.2.1' into maint-1.13.3

2016-12-22 Thread danhaywood

Merge branch 'maint-1.13.2.1' into maint-1.13.3


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

Branch: refs/heads/maint-1.13.3
Commit: e2f0a9f583b2a145096ac2da3b5e550219fe867e
Parents: 1e81a3a b47edb6
Author: Dan Haywood 
Authored: Thu Dec 22 18:54:59 2016 +
Committer: Dan Haywood 
Committed: Thu Dec 22 18:54:59 2016 +

--

--

[isis] Git Push Summary

[3/8] isis git commit: ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere also where possible.

[5/8] isis git commit: ISIS-1558: extends the simpleapp to use spotify maven plugin directly

[4/8] isis git commit: ISIS-1556: fixes DomainAppFixtureScriptsSpecificationProvider...

[1/8] isis git commit: ISIS-1558: extends the simpleapp to use spotify maven plugin directly

[7/8] isis git commit: ISIS-1559: removes the mixins from SimpleObject, and simplifies code elsewhere also where possible.

[2/8] isis git commit: ISIS-1558: replaces configuration with mavenmixin-docker.

[6/8] isis git commit: ISIS-1558: replaces configuration with mavenmixin-docker.

[8/8] isis git commit: Merge branch 'maint-1.13.2.1' into maint-1.13.3

9 matches

Site Navigation

Mail list logo

Footer information