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/10/19 13:06:20 UTC
[22/24] git commit: Merge branch 'prepare/isis-1.7.0'
Merge branch 'prepare/isis-1.7.0'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/74821b8d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/74821b8d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/74821b8d
Branch: refs/heads/master
Commit: 74821b8d1bd5a1fdf5f58df67c9b7abf28ee6fb9
Parents: b60eb22 dd955f9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Oct 19 10:04:27 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Oct 19 10:04:27 2014 +0100
----------------------------------------------------------------------
component/viewer/wicket/applib/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
.../imagecache/ImageResourceCacheKeyTest.java | 18 +
component/viewer/wicket/model/pom.xml | 2 +-
component/viewer/wicket/pom.xml | 18 +-
component/viewer/wicket/tck/pom.xml | 6 +-
component/viewer/wicket/ui/pom.xml | 2 +-
.../viewer/wicket/ui/errors/JGrowlUtilTest.java | 18 +
.../wicket/ui/pages/PageAbstractTest.java | 18 +
core/applib/pom.xml | 2 +-
.../command/Command2ContractTestAbstract.java | 18 +
.../services/command/CommandDefaultTest.java | 18 +
.../ExceptionRecognizerCompositeTest.java | 1 -
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/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 71 +-
core/runtime/pom.xml | 2 +-
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
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/tck/tck-viewer-restfulobjects/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 6 +-
.../simpleapp/webapp/coverage-error.log | 585 ---------
.../dom/src/main/java/dom/todo/ToDoItem.java | 9 +-
example/application/todoapp/pom.xml | 7 +-
.../todoapp/webapp/coverage-error.log | 1170 ------------------
example/archetype/simpleapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 9 +-
.../resources/archetype-resources/dom/pom.xml | 112 +-
.../src/main/java/dom/simple/SimpleObject.java | 6 +-
.../java/dom/simple/SimpleObject.layout.json | 50 +-
.../src/main/java/dom/simple/SimpleObject.png | Bin 0 -> 557 bytes
.../src/main/java/dom/simple/SimpleObjects.java | 24 +-
.../src/main/resources/images/SimpleObject.png | Bin 557 -> 0 bytes
.../java/dom/simple/SimpleObjectTest_name.java | 9 +-
.../dom/simple/SimpleObjectsTest_create.java | 10 +-
.../archetype-resources/fixture/pom.xml | 20 +-
.../fixture/simple/SimpleObjectsFixture.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 +-
.../integration/SimpleAppSystemInitializer.java | 5 +
.../SimpleObjectsTest_listAll_and_create.java | 5 +-
.../main/resources/archetype-resources/pom.xml | 10 +-
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 1 -
.../launch/SimpleApp__enhance_only_.xml | 1 -
.../archetype-resources/webapp/pom.xml | 70 --
.../ComponentFactoryRegistrarForSimpleApp.java | 36 -
.../src/main/java/webapp/SimpleApplication.java | 26 +-
.../webapp/prototyping/DeveloperUtilities.java | 53 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 47 +-
.../main/webapp/WEB-INF/persistor.properties | 18 +-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 2 +-
.../webapp/src/main/webapp/css/application.css | 1 -
.../projects/basic/archetype.properties | 2 +-
example/archetype/todoapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 10 +-
.../resources/archetype-resources/dom/pom.xml | 107 +-
.../dom/src/main/java/app/ToDoAppDashboard.java | 4 -
.../dom/src/main/java/app/ToDoAppDashboard.png | Bin 0 -> 684 bytes
.../dom/src/main/java/app/ToDoItemAnalysis.java | 10 +-
.../java/app/ToDoItemsByCategoryViewModel.java | 24 +-
.../java/app/ToDoItemsByDateRangeViewModel.java | 25 +-
.../src/main/java/dom/todo/ToDoItem-done.png | Bin 0 -> 1363 bytes
.../src/main/java/dom/todo/ToDoItem-todo.png | Bin 0 -> 971 bytes
.../dom/src/main/java/dom/todo/ToDoItem.java | 87 +-
.../dom/src/main/java/dom/todo/ToDoItem.png | Bin 0 -> 971 bytes
.../java/dom/todo/ToDoItemSubscriptions.java | 10 +-
.../dom/src/main/java/dom/todo/ToDoItems.java | 10 -
.../dom/src/main/resources/images/Dashboard.png | Bin 684 -> 0 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1363 -> 0 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 971 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 971 -> 0 bytes
.../archetype-resources/fixture/pom.xml | 20 +-
.../fixture/todo/ToDoItemsFixturesService.java | 2 +-
.../integtests/ToDoItemsIntegTestFixture.java | 2 +-
.../fixture/todo/simple/ToDoItemsRecreate.java | 2 +-
.../ToDoItemsRecreateAndCompleteSeveral.java | 2 +-
.../archetype-resources/integtests/pom.xml | 30 +-
.../java/integration/ToDoSystemInitializer.java | 8 +
.../tests/ToDoItemContributionsIntegTest.java | 12 +-
.../integration/tests/ToDoItemIntegTest.java | 13 +-
.../integration/tests/ToDoItemsIntegTest.java | 36 +-
.../main/resources/archetype-resources/pom.xml | 32 +-
.../archetype-resources/webapp/pom.xml | 46 -
.../ComponentFactoryRegistrarForToDoApp.java | 36 -
.../main/java/webapp/CustomMementoService.java | 64 +
.../webapp/CustomRepresentationService.java | 35 +
.../java/webapp/PageClassListForToDoApp.java | 64 -
.../src/main/java/webapp/ToDoApplication.java | 22 +-
.../src/main/java/webapp/admin/Admin.java | 176 ---
.../java/webapp/admin/AdminContributions.java | 110 --
.../webapp/prototyping/DeveloperUtilities.java | 53 -
.../prototyping/ExternalLinksService.java | 2 +-
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 --
.../BackgroundCommandExecutionQuartzJob.java | 31 -
.../webapp/scheduler/SchedulerConstants.java | 30 -
.../webapp/src/main/resources/webapp/realm1.ini | 29 +-
.../webapp/src/main/resources/webapp/realm2.ini | 66 -
.../webapp/scheduler/quartz-config.xml | 65 -
.../webapp/scheduler/quartz.properties | 28 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 -
.../src/main/webapp/WEB-INF/isis.properties | 49 +-
.../main/webapp/WEB-INF/persistor.properties | 20 +-
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../webapp/WEB-INF/viewer_wicket.properties | 8 +
.../webapp/src/main/webapp/WEB-INF/web.xml | 21 +-
.../webapp/src/main/webapp/about/index.html | 14 +-
.../projects/basic/archetype.properties | 2 +-
132 files changed, 736 insertions(+), 3655 deletions(-)
----------------------------------------------------------------------