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:18 UTC
[6/6] isis git commit: Merge branch 'release-1.13.2.1-RC1' into
maint-1.13.3
Merge branch 'release-1.13.2.1-RC1' 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/b05ed58e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b05ed58e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b05ed58e
Branch: refs/heads/maint-1.13.3
Commit: b05ed58ed2f23b29ba28ed2b39d902c201ceaa4b
Parents: e2f0a9f 1538333
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jan 3 19:06:33 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jan 3 19:06:33 2017 +0000
----------------------------------------------------------------------
example/application/simpleapp/README.adoc | 23 ++-
.../META-INF/maven/archetype-metadata.xml | 6 +
.../resources/archetype-resources/README.adoc | 59 +++++-
.../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 +-
.../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 ++++++
.../main/resources/archetype-resources/pom.xml | 18 ++
.../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 +-
.../projects/basic/archetype.properties | 2 +-
31 files changed, 334 insertions(+), 412 deletions(-)
----------------------------------------------------------------------