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/05/09 19:35:20 UTC

[5/6] git commit: Merge branch 'master' into ISIS-769

Merge branch 'master' into ISIS-769


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cf5a0ab8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf5a0ab8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf5a0ab8

Branch: refs/heads/ISIS-769
Commit: cf5a0ab8fa594065b40faf02f7af8be4903aa7f9
Parents: a51496d 55c4ea8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 9 17:47:18 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 9 17:47:18 2014 +0100

----------------------------------------------------------------------
 ...Put_whenArgValid_thenPropertyUpdated_ok.java | 262 ------------------
 ...henArgValid_thenPropertyUpdated_ok_TODO.java | 267 +++++++++++++++++++
 .../components/widgets/cssmenu/CssMenuPanel.css |   2 +-
 .../viewer/wicket/ui/pages/PageAbstract.css     |   2 +-
 core/applib/pom.xml                             |   6 +
 .../isis/applib/DomainObjectContainer.java      |   6 +
 .../fixturescripts/CompositeFixtureScript.java  |  90 +++++++
 .../applib/fixturescripts/FixtureResult.java    |  68 +++++
 .../fixturescripts/FixtureResultList.java       |  72 +++++
 .../applib/fixturescripts/FixtureScript.java    | 208 +++++++++++++++
 .../applib/fixturescripts/FixtureScripts.java   | 164 ++++++++++++
 .../fixturescripts/SimpleFixtureScript.java     |  56 ++++
 .../classdiscovery/ClassDiscoveryService.java   |  30 +++
 .../ClassDiscoveryServiceUsingReflections.java  |  42 +++
 .../metamodel/adapter/DomainObjectServices.java |   2 +
 .../noruntime/RuntimeContextNoRuntime.java      |   5 +
 .../container/DomainObjectContainerDefault.java |  11 +
 .../internal/RuntimeContextFromSession.java     |   5 +
 .../src/main/java/dom/todo/ToDoItem.layout.json |   6 +-
 .../fixture/todo/ToDoItemsCreateForUser.java    | 105 ++++++++
 .../fixture/todo/ToDoItemsDeleteForUser.java    |  60 +++++
 .../java/fixture/todo/ToDoItemsFixture.java     |  75 +-----
 .../fixture/todo/ToDoItemsFixturesService.java  |  34 +++
 .../fixture/todo/ToDoItemsResetForUser.java     |  75 ++++++
 .../java/integration/ToDoSystemInitializer.java |  12 +-
 .../integration/glue/CatalogOfFixturesGlue.java |   3 +-
 .../webapp/prototyping/DeveloperUtilities.java  |   2 +
 .../prototyping/ToDoItemsFixturesService.java   |  84 ------
 .../src/main/webapp/WEB-INF/isis.properties     |   3 +-
 29 files changed, 1329 insertions(+), 428 deletions(-)
----------------------------------------------------------------------