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 2014/03/17 23:50:09 UTC
[50/50] [abbrv] git commit: Merge branch 'prepare/isis-1.4.0-RC1'
Merge branch 'prepare/isis-1.4.0-RC1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e9bb5422
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e9bb5422
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e9bb5422
Branch: refs/heads/master
Commit: e9bb5422cd626755058c7efa6ef146bd499816f2
Parents: 38a7afa 46cfced
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 17 22:20:54 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 17 22:20:54 2014 +0000
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 4 +-
.../objectstore/jdo/jdo-datanucleus/pom.xml | 2 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 2 +-
component/objectstore/jdo/pom.xml | 17 +-
.../appended-resources/supplemental-models.xml | 37 +++
component/objectstore/nosql/pom.xml | 2 +-
component/objectstore/xml/pom.xml | 2 +-
component/profilestore/xml/pom.xml | 2 +-
component/progmodel/groovy/pom.xml | 2 +-
component/security/file/pom.xml | 6 +-
.../appended-resources/supplemental-models.xml | 16 +
component/security/shiro/pom.xml | 14 +-
component/viewer/dnd/pom.xml | 2 +-
component/viewer/dnd/tck/pom.xml | 2 +-
component/viewer/restfulobjects/applib/pom.xml | 2 +-
component/viewer/restfulobjects/pom.xml | 16 +-
.../viewer/restfulobjects/rendering/pom.xml | 2 +-
component/viewer/restfulobjects/server/pom.xml | 2 +-
.../appended-resources/supplemental-models.xml | 54 ++-
component/viewer/restfulobjects/tck/pom.xml | 6 +-
component/viewer/scimpi/pom.xml | 2 +-
component/viewer/scimpi/tck/pom.xml | 4 +-
component/viewer/wicket/impl/pom.xml | 2 +-
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 16 +-
component/viewer/wicket/tck/pom.xml | 8 +-
component/viewer/wicket/ui/pom.xml | 2 +-
core/applib/pom.xml | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/objectstore-inmemory/pom.xml | 2 +-
core/pom.xml | 46 +--
core/profilestore-inmemory/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/tck/pom.xml | 2 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
.../application/quickstart_scimpi_nosql/pom.xml | 4 +-
.../quickstart_wicket_restful_jdo/pom.xml | 11 +-
.../src/main/resources/images/SimpleObject.gif | Bin 794 -> 0 bytes
.../src/main/resources/images/SimpleObject.png | Bin 0 -> 557 bytes
.../simple_wicket_restful_jdo/pom.xml | 11 +-
.../quickstart_wicket_restful_jdo/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 16 +-
.../resources/archetype-resources/dom/pom.xml | 26 +-
.../dom/src/main/java/app/ToDoAppDashboard.java | 6 +-
.../main/java/app/ToDoAppDashboardService.java | 13 +-
.../dom/src/main/java/app/ToDoItemAnalysis.java | 16 +-
.../java/app/ToDoItemAnalysisContributions.java | 13 +-
.../java/app/ToDoItemsByCategoryViewModel.java | 9 +-
.../java/app/ToDoItemsByDateRangeViewModel.java | 12 +-
.../dom/src/main/java/dom/todo/ToDoItem.java | 330 +++++++++++++------
.../src/main/java/dom/todo/ToDoItem.layout.json | 117 ++++++-
.../java/dom/todo/ToDoItemContributions.java | 120 ++++---
.../dom/src/main/java/dom/todo/ToDoItems.java | 153 +++++----
.../src/main/java/services/ClockService.java | 36 --
.../src/main/resources/images/AuditEntry.png | Bin 2215 -> 0 bytes
.../dom/src/main/resources/images/Dashboard.png | Bin 2512 -> 684 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1794 -> 1363 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 1257 -> 971 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 1285 -> 971 bytes
.../test/java/dom/todo/ToDoTest_completed.java | 14 +-
.../java/dom/todo/ToDoTest_notYetCompleted.java | 5 +
.../main/java/fixture/LogonAsSvenFixture.java | 33 --
.../java/fixture/todo/ToDoItemsFixture.java | 15 +-
.../integtests/logging.properties | 28 +-
.../java/integration/ToDoSystemInitializer.java | 8 +-
.../integration/glue/todoitem/ToDoItemGlue.java | 18 +-
...oDoItemContributionsTest_updateCategory.java | 3 +-
.../ToDoItemContributionsTest_priority.java | 2 +-
.../tests/props/ToDoItemTest_description.java | 14 +-
.../main/resources/archetype-resources/pom.xml | 109 +++---
.../launch/ToDoApp-PROTOTYPE-jrebel.launch | 26 ++
.../launch/ToDoApp-PROTOTYPE-no-fixtures.launch | 25 ++
.../ToDoApp-PROTOTYPE-with-fixtures.launch | 22 ++
.../launch/ToDoApp-SERVER-no-fixtures.launch | 25 ++
.../launch/ToDoApp-no-fixtures-PROTOTYPE.launch | 26 --
.../launch/ToDoApp-no-fixtures-SERVER.launch | 22 --
.../eclipse/launch/ToDoApp-with-fixtures.launch | 26 --
.../archetype-resources/webapp/pom.xml | 38 +--
.../java/webapp/PageClassListForToDoApp.java | 4 +-
.../src/main/java/webapp/ToDoApplication.java | 5 +-
.../src/main/java/webapp/admin/Admin.java | 182 ++++++++++
.../java/webapp/admin/AdminContributions.java | 113 +++++++
.../webapp/prototyping/DeveloperUtilities.java | 10 +-
.../prototyping/ExternalLinksService.java | 62 ++++
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 ++++++
.../BackgroundCommandExecutionQuartzJob.java | 31 ++
.../webapp/scheduler/SchedulerConstants.java | 30 ++
.../webapp/src/main/resources/webapp/realm1.ini | 68 ++++
.../webapp/src/main/resources/webapp/realm2.ini | 66 ++++
.../webapp/scheduler/quartz-config.xml | 65 ++++
.../webapp/scheduler/quartz.properties | 28 ++
.../src/main/webapp/WEB-INF/isis.properties | 103 +++++-
.../src/main/webapp/WEB-INF/logging.properties | 23 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 76 +++--
.../webapp/WEB-INF/viewer_wicket.properties | 10 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 28 ++
.../webapp/src/main/webapp/about/index.html | 14 +-
.../webapp/src/main/webapp/css/application.css | 9 +-
.../projects/basic/archetype.properties | 2 +-
.../archetype/simple_wicket_restful_jdo/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../resources/archetype-resources/dom/pom.xml | 18 +-
.../src/main/java/dom/simple/SimpleObject.java | 17 +-
.../src/main/java/dom/simple/SimpleObjects.java | 25 +-
.../src/main/java/services/ClockService.java | 36 --
.../src/main/resources/images/SimpleObject.gif | Bin 794 -> 0 bytes
.../src/main/resources/images/SimpleObject.png | Bin 0 -> 557 bytes
.../dom/simple/SimpleObjectsTest_create.java | 2 +-
.../dom/simple/SimpleObjectsTest_listAll.java | 12 +-
.../main/java/fixture/LogonAsSvenFixture.java | 33 --
.../fixture/simple/SimpleObjectsFixture.java | 13 +-
.../integtests/logging.properties | 30 +-
.../integration/SimpleAppSystemInitializer.java | 1 -
.../main/resources/archetype-resources/pom.xml | 107 +++---
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 33 ++
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 25 ++
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 22 ++
.../launch/SimpleApp-SERVER-no-fixtures.launch | 25 ++
.../SimpleApp-no-fixtures-PROTOTYPE.launch | 26 --
.../launch/SimpleApp-no-fixtures-SERVER.launch | 22 --
.../launch/SimpleApp-with-fixtures.launch | 26 --
.../archetype-resources/webapp/pom.xml | 37 +--
.../src/main/java/webapp/SimpleApplication.java | 8 +-
.../webapp/prototyping/DeveloperUtilities.java | 8 +-
.../src/main/resources/webapp/welcome.html | 3 +
.../src/main/webapp/WEB-INF/isis.properties | 94 +++++-
.../src/main/webapp/WEB-INF/logging.properties | 21 +-
.../webapp/WEB-INF/viewer_wicket.properties | 10 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 8 +
.../projects/basic/archetype.properties | 2 +-
tool/maven-plugin/pom.xml | 2 +-
141 files changed, 2283 insertions(+), 1086 deletions(-)
----------------------------------------------------------------------