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/09 23:58:07 UTC
[2/6] isis git commit: Merge remote-tracking branch 'upstream/master'
into replace_jetty_uber_with_webapp
Merge remote-tracking branch 'upstream/master' into replace_jetty_uber_with_webapp
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6320b566
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6320b566
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6320b566
Branch: refs/heads/master
Commit: 6320b566fe087b3e7164ba73acac52d87ad1b35e
Parents: 52c0649 140293a
Author: Martin Hesse <mw...@gmail.com>
Authored: Mon Jan 9 13:36:31 2017 +0700
Committer: Martin Hesse <mw...@gmail.com>
Committed: Mon Jan 9 13:36:31 2017 +0700
----------------------------------------------------------------------
STATUS | 2 +
.../main/asciidoc/_release-notes_1.13.2.1.adoc | 20 +
.../src/main/asciidoc/doap_isis.rdf | 12 +-
.../src/main/asciidoc/documentation.adoc | 2 +-
.../src/main/asciidoc/downloads.adoc | 2 +-
.../guides/_cgcom_cutting-a-release.adoc | 23 +-
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 50 ++-
.../_tg_stop-scaffolding-start-coding.adoc | 9 +-
...fun_getting-started_simpleapp-archetype.adoc | 2 +-
.../documentation/src/main/asciidoc/index.html | 2 +-
.../src/main/asciidoc/release-notes.adoc | 12 +-
.../IsisConfigurationDefault_safe_Test.java | 18 +
example/application/simpleapp/README.adoc | 59 ++-
.../application/simpleapp/application/pom.xml | 7 +-
...nAppFixtureScriptsSpecificationProvider.java | 6 +-
.../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 | 22 +-
example/application/simpleapp/webapp/pom.xml | 17 +-
.../webapp/src/main/resources/docker/Dockerfile | 4 +
.../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 +-
.../webapp/src/main/webapp/about/index.html | 22 +-
example/archetype/simpleapp/pom.xml | 11 +-
.../META-INF/maven/archetype-metadata.xml | 25 ++
.../archetype-resources/.gitattributes | 51 +++
.../resources/archetype-resources/.gitignore | 41 ++
.../resources/archetype-resources/README.adoc | 59 ++-
.../application/lib/.gitignore | 5 +
.../archetype-resources/application/pom.xml | 7 +-
...nAppFixtureScriptsSpecificationProvider.java | 6 +-
.../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 | 53 ---
.../application/bdd/specs/RunIntegBddSpecs.java | 5 +-
.../SimpleObjectSpec_listAllAndCreate.feature | 2 +-
.../application/integtests/Smoke_IntegTest.java | 4 +-
.../application/translations.pot | 421 ------------------
.../module-simple/.gitignore | 5 +
.../simple/dom/SimpleModuleDomSubmodule.java | 2 +-
.../modules/simple/dom/impl/SimpleObject.java | 180 ++------
.../fixture/SimpleModuleFixtureSubmodule.java | 3 +-
.../fixture/data/SimpleObjectMenu_create.java | 61 ---
.../fixture/scenario/CreateSimpleObjects.java | 84 ++++
.../fixture/scenario/RecreateSimpleObjects.java | 79 ----
.../tests/SimpleObjectMenu_IntegTest.java | 8 +-
.../tests/SimpleObject_IntegTest.java | 10 +-
.../simple/specglue/SimpleObjectMenuGlue.java | 56 +++
.../module-simple/translations.pot | 435 -------------------
.../main/resources/archetype-resources/pom.xml | 24 +-
.../archetype-resources/webapp/lib/.gitignore | 5 +
.../archetype-resources/webapp/pom.xml | 16 +-
.../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 +-
.../webapp/src/main/webapp/about/index.html | 22 +-
.../projects/basic/archetype.properties | 2 +-
81 files changed, 906 insertions(+), 1723 deletions(-)
----------------------------------------------------------------------