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 2018/07/25 16:45:14 UTC
[isis] 01/12: Merge branch 'release-2.0.0-M1-RC1'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 63c2856d6d187bc0ec1fd34f11a10e9e79e30dd3
Merge: f00996b 2b483d0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 25 07:09:12 2018 +0100
Merge branch 'release-2.0.0-M1-RC1'
core/pom.xml | 3 +
.../application/helloworld/nb-configuration.xml | 19 --
example/application/helloworld/nbactions.xml | 50 ---
.../java/domainapp/dom/impl/HelloWorldObject.java | 32 +-
.../src/main/java/domainapp/dom/types/Name.java | 24 ++
.../src/main/java/domainapp/dom/types/Notes.java | 25 ++
.../modules/simple/dom/impl/SimpleObject.java | 29 +-
.../domainapp/modules/simple/dom/types/Name.java | 3 +-
.../domainapp/modules/simple/dom/types/Notes.java | 25 ++
example/application/simpleapp/pom.xml | 8 +-
example/archetype/helloworld/pom.xml | 141 ++++----
.../appended-resources/supplemental-models.xml | 26 --
.../META-INF/maven/archetype-metadata.xml | 136 ++++----
.../resources/archetype-resources/.gitattributes | 51 ---
.../main/resources/archetype-resources/.gitignore | 41 ---
.../src/main/resources/archetype-resources/pom.xml | 348 ++++++++++----------
.../application/isis-non-changing.properties | 4 +-
.../java/domainapp/dom/impl/HelloWorldObject.java | 32 +-
.../java/domainapp/dom/impl/HelloWorldObjects.java | 8 +-
.../src/main/java/domainapp/dom/types/Name.java | 27 ++
.../src/main/java/domainapp/dom/types/Notes.java | 28 ++
.../src/main/webapp/META-INF/context.xml | 5 +
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 7 +-
...lete.java => HelloWorldObject_delete_Test.java} | 2 +-
....java => HelloWorldObject_updateName_Test.java} | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
example/archetype/simpleapp/pom.xml | 144 +++++----
.../appended-resources/supplemental-models.xml | 26 --
.../META-INF/maven/archetype-metadata.xml | 359 ++++++++++-----------
.../resources/archetype-resources/.gitlab-ci.yml | 28 +-
.../resources/archetype-resources/.m2/settings.xml | 8 +-
.../archetype-resources/application/pom.xml | 2 +-
.../fixture/scenarios/DomainAppDemo.java | 6 +-
.../manifest/isis-non-changing.properties | 4 +-
.../bdd/specglue/BootstrappingGlue.java | 4 +-
...ingGlue.java => BootstrappingGlueAbstract.java} | 25 +-
.../application/translations.pot | 105 ++++--
.../archetype-resources/module-simple/pom.xml | 42 ++-
.../domainapp/modules/simple/SimpleModule.java | 6 +-
.../modules/simple/dom/impl/SimpleObject.java | 51 +--
.../simple/dom/impl/SimpleObjectRepository.java | 58 ----
.../modules/simple/dom/impl/SimpleObjects.java | 13 +-
.../domainapp/modules/simple/dom/types/Name.java | 6 +-
.../domainapp/modules/simple/dom/types/Notes.java | 28 ++
.../simple/fixture/SimpleObject_persona.java | 6 +-
.../modules/simple/dom/impl/SimpleObject_Test.java | 7 +-
.../simple/dom/impl/SimpleObjects_Test.java | 9 +-
.../integtests/SimpleModuleIntegTestAbstract.java | 6 +-
.../tests/SimpleObjectMenu_IntegTest.java | 30 +-
.../integtests/tests/SimpleObject_IntegTest.java | 42 ++-
.../module-simple/translations.pot | 105 ++++--
.../src/main/resources/archetype-resources/pom.xml | 288 ++++++++---------
.../resources/archetype-resources/webapp/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 7 +-
.../resources/projects/basic/archetype.properties | 2 +-
scripts/recreate-archetype.sh | 6 +-
scripts/updateGeneratedArchetypeSources.groovy | 274 ++++++++--------
59 files changed, 1385 insertions(+), 1400 deletions(-)