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:34:29 UTC
[3/5] git commit: ISIS-550 and ISIS-776: merging
ISIS-550 and ISIS-776: merging
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1dac3edf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1dac3edf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1dac3edf
Branch: refs/heads/ISIS-550
Commit: 1dac3edff844f427a9916fc67aad8c1f615128f3
Parents: 2637a05 55c4ea8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 9 17:54:04 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 9 17:54:04 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1dac3edf/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --cc example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index 153f3f9,a6f1e96..a542934
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@@ -189,7 -189,7 +189,8 @@@ isis.services =
org.apache.isis.applib.annotation.Bulk$InteractionContext,\
org.apache.isis.applib.services.scratchpad.Scratchpad,\
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,\
+ org.apache.isis.core.wrapper.WrapperFactoryDefault,\
+ org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections,\
\
# JDO implementation of the EventBusService, \
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,\