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/07/28 15:29:16 UTC
[38/39] git commit: Merge branch 'prepare/isis-1.6.0-RC3'
Merge branch 'prepare/isis-1.6.0-RC3'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fee6d393
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fee6d393
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fee6d393
Branch: refs/heads/master
Commit: fee6d3937f5424325ee1d7b72e71f0bc7ff7b8d1
Parents: 0af3219 15e4c14
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jul 28 14:21:52 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jul 28 14:21:52 2014 +0100
----------------------------------------------------------------------
STATUS | 5 +
component/viewer/scimpi/pom.xml | 2 +-
component/viewer/wicket/applib/pom.xml | 2 +-
component/viewer/wicket/impl/pom.xml | 2 +-
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 +-
.../wicket/ui/components/about/AboutPanel.java | 6 +-
.../FixedObjectAdapterMementoProviderTest.java | 18 +
core/applib/pom.xml | 2 +-
.../background/ActionInvocationMemento.java | 8 +-
.../background/BackgroundCommandService.java | 2 +-
.../ClassDiscoveryServiceUsingReflections.java | 121 +-
.../applib/services/wrapper/WrapperFactory.java | 2 +-
core/bytecode-cglib/pom.xml | 2 +-
core/bytecode-javassist/pom.xml | 2 +-
core/integtestsupport/pom.xml | 6 +-
core/log4j/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
.../facets/actions/interaction/CommandUtil.java | 2 +-
core/module-audit-jdo/pom.xml | 2 +-
.../service/audit/AuditingServiceJdo.java | 7 +-
core/module-background/pom.xml | 8 +-
.../background/BackgroundCommandExecution.java | 171 +++
.../background/BackgroundServiceDefault.java | 287 +++++
core/module-command-jdo/pom.xml | 12 +-
.../service/command/CommandServiceJdo.java | 2 +
...xecutionFromBackgroundCommandServiceJdo.java | 3 +
core/module-devutils/applib/pom.xml | 2 +-
core/module-devutils/impl/pom.xml | 2 +-
core/module-devutils/pom.xml | 10 +-
core/module-publishing-jdo/pom.xml | 2 +-
.../service/publish/PublishingServiceJdo.java | 2 +
.../module-publishingeventserializer-ro/pom.xml | 2 +-
core/module-settings/applib/pom.xml | 2 +-
core/module-settings/impl-jdo/pom.xml | 2 +-
core/module-settings/pom.xml | 10 +-
core/module-wrapper/pom.xml | 139 ---
.../core/wrapper/WrapperFactoryAbstract.java | 314 ------
.../isis/core/wrapper/WrapperFactoryCglib.java | 30 -
.../core/wrapper/WrapperFactoryDefault.java | 39 -
.../core/wrapper/WrapperFactoryJavassist.java | 30 -
.../dispatchers/InteractionEventDispatcher.java | 28 -
.../InteractionEventDispatcherTypeSafe.java | 34 -
.../AbstractCollectionInvocationHandler.java | 92 --
.../handlers/CollectionInvocationHandler.java | 53 -
.../handlers/DelegatingInvocationHandler.java | 32 -
.../DelegatingInvocationHandlerDefault.java | 131 ---
.../handlers/DomainObjectInvocationHandler.java | 720 ------------
.../wrapper/handlers/MapInvocationHandler.java | 48 -
.../wrapper/handlers/ProxyContextHandler.java | 84 --
.../core/wrapper/internal/util/Constants.java | 52 -
.../internal/util/MethodPrefixFinder.java | 48 -
.../isis/core/wrapper/internal/util/Util.java | 53 -
.../core/wrapper/proxy/ProxyInstantiator.java | 26 -
.../proxy/ProxyInstantiatorForCglib.java | 101 --
.../proxy/ProxyInstantiatorForJavassist.java | 77 --
.../wrapper/WrapperFactoryAbstractTest.java | 109 --
...rapperFactoryAbstractTest_wrappedObject.java | 376 -------
...oryAbstractTest_wrappedObject_transient.java | 257 -----
.../WrapperFactoryCglibTest_wrappedObject.java | 32 -
...actoryCglibTest_wrappedObject_transient.java | 34 -
...apperFactoryJavassistTest_wrappedObject.java | 32 -
...ryJavassistTest_wrappedObject_transient.java | 31 -
core/objectstore-inmemory/pom.xml | 2 +-
core/objectstore-jdo-datanucleus/pom.xml | 2 +-
core/objectstore-jdo-metamodel/pom.xml | 2 +-
core/pom.xml | 123 ++-
core/profilestore-inmemory/pom.xml | 2 +-
core/runtime/pom.xml | 2 +-
.../ServicesInstallerFromAnnotation.java | 3 +
.../background/BackgroundCommandExecution.java | 171 ---
.../background/BackgroundServiceDefault.java | 286 -----
.../services/DeweyOrderComparatorTest.java | 18 +
.../runtime/services/DeweyOrderUtilTest.java | 18 +
core/security-noop/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
.../IsisPermissionTest_equals.java | 18 +
core/specsupport/pom.xml | 6 +-
core/tck/pom.xml | 5 +-
core/tck/tck-dom/pom.xml | 2 +-
core/tck/tck-fixture/pom.xml | 2 +-
core/tck/tck-viewer-restfulobjects/pom.xml | 5 +-
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 | 138 +++
.../core/wrapper/WrapperFactoryAbstract.java | 314 ++++++
.../isis/core/wrapper/WrapperFactoryCglib.java | 30 +
.../core/wrapper/WrapperFactoryDefault.java | 39 +
.../core/wrapper/WrapperFactoryJavassist.java | 30 +
.../dispatchers/InteractionEventDispatcher.java | 28 +
.../InteractionEventDispatcherTypeSafe.java | 34 +
.../AbstractCollectionInvocationHandler.java | 92 ++
.../handlers/CollectionInvocationHandler.java | 53 +
.../handlers/DelegatingInvocationHandler.java | 32 +
.../DelegatingInvocationHandlerDefault.java | 131 +++
.../handlers/DomainObjectInvocationHandler.java | 720 ++++++++++++
.../wrapper/handlers/MapInvocationHandler.java | 48 +
.../wrapper/handlers/ProxyContextHandler.java | 84 ++
.../core/wrapper/internal/util/Constants.java | 52 +
.../internal/util/MethodPrefixFinder.java | 48 +
.../isis/core/wrapper/internal/util/Util.java | 53 +
.../core/wrapper/proxy/ProxyInstantiator.java | 26 +
.../proxy/ProxyInstantiatorForCglib.java | 101 ++
.../proxy/ProxyInstantiatorForJavassist.java | 77 ++
.../wrapper/WrapperFactoryAbstractTest.java | 127 +++
...rapperFactoryAbstractTest_wrappedObject.java | 376 +++++++
...oryAbstractTest_wrappedObject_transient.java | 257 +++++
.../WrapperFactoryCglibTest_wrappedObject.java | 32 +
...actoryCglibTest_wrappedObject_transient.java | 34 +
...apperFactoryJavassistTest_wrappedObject.java | 32 +
...ryJavassistTest_wrappedObject_transient.java | 31 +
example/application/simpleapp/dom/pom.xml | 2 +-
.../src/main/java/dom/simple/SimpleObjects.java | 2 +-
example/application/simpleapp/fixture/pom.xml | 2 +-
.../simple/SimpleObjectsFixturesService.java | 2 +-
.../application/simpleapp/integtests/pom.xml | 6 +-
example/application/simpleapp/pom.xml | 6 +-
.../launch/SimpleApp-PROTOTYPE-jrebel.launch | 2 +-
.../SimpleApp-PROTOTYPE-no-fixtures.launch | 2 +-
.../SimpleApp-PROTOTYPE-with-fixtures.launch | 2 +-
.../launch/SimpleApp-SERVER-no-fixtures.launch | 2 +-
.../webapp/ide/intellij/launch/README.txt | 2 +
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 29 +
.../launch/SimpleApp__enhance_only_.xml | 23 +
example/application/simpleapp/webapp/pom.xml | 17 +-
.../src/main/resources/webapp/welcome.html | 8 +-
.../src/main/webapp/WEB-INF/isis.properties | 8 +-
.../webapp/src/main/webapp/about/index.html | 86 +-
example/application/todoapp/dom/pom.xml | 2 +-
example/application/todoapp/fixture/pom.xml | 2 +-
example/application/todoapp/integtests/pom.xml | 6 +-
example/application/todoapp/pom.xml | 6 +-
.../launch/ToDoApp-PROTOTYPE-jrebel.launch | 2 +-
.../ToDoApp-PROTOTYPE-with-fixtures.launch | 2 +-
.../ide/eclipse/launch/ToDoApp-PROTOTYPE.launch | 2 +-
.../ide/eclipse/launch/ToDoApp-SERVER.launch | 2 +-
.../webapp/ide/intellij/launch/README.txt | 3 +
.../ide/intellij/launch/TodoApp_PROTOTYPE.xml | 29 +
.../intellij/launch/TodoApp__enhance_only_.xml | 23 +
example/application/todoapp/webapp/pom.xml | 10 +-
.../src/main/resources/webapp/welcome.html | 7 +-
.../src/main/webapp/WEB-INF/isis.properties | 8 +-
.../webapp/src/main/webapp/about/index.html | 119 +-
example/archetype/simpleapp/pom.xml | 8 +-
.../META-INF/maven/archetype-metadata.xml | 9 +-
.../resources/archetype-resources/dom/pom.xml | 23 +-
.../src/main/java/dom/simple/SimpleObjects.java | 6 +-
.../archetype-resources/fixture/pom.xml | 2 +-
.../fixture/simple/SimpleObjectsFixture.java | 14 +-
.../simple/SimpleObjectsFixturesService.java | 70 ++
.../archetype-resources/integtests/pom.xml | 6 +-
.../integration/SimpleAppSystemInitializer.java | 22 +-
.../main/resources/archetype-resources/pom.xml | 33 +-
.../webapp/ide/intellij/launch/README.txt | 5 +
.../ide/intellij/launch/SimpleApp_PROTOTYPE.xml | 32 +
.../launch/SimpleApp__enhance_only_.xml | 26 +
.../archetype-resources/webapp/pom.xml | 83 +-
.../webapp/prototyping/DeveloperUtilities.java | 4 +-
.../SimpleObjectsFixturesService.java | 71 --
.../src/main/resources/webapp/welcome.html | 8 +-
.../src/main/webapp/WEB-INF/isis.properties | 65 +-
.../webapp/src/main/webapp/about/index.html | 88 +-
.../projects/basic/archetype.properties | 2 +-
example/archetype/todoapp/pom.xml | 8 +-
.../META-INF/maven/archetype-metadata.xml | 9 +-
.../resources/archetype-resources/dom/pom.xml | 16 +-
.../dom/src/main/java/app/ToDoAppDashboard.java | 9 -
.../main/java/app/ToDoAppDashboardService.java | 41 +-
.../dom/src/main/java/app/ToDoItemAnalysis.java | 13 +-
.../java/app/ToDoItemAnalysisContributions.java | 10 +-
.../java/app/ToDoItemsByCategoryViewModel.java | 15 -
.../java/app/ToDoItemsByDateRangeViewModel.java | 16 -
.../dom/src/main/java/dom/todo/Categorized.java | 35 +
.../dom/src/main/java/dom/todo/ToDoItem.java | 126 ++-
.../src/main/java/dom/todo/ToDoItem.layout.json | 192 ++--
.../dom/todo/ToDoItemChangedPayloadFactory.java | 1 +
.../java/dom/todo/ToDoItemContributions.java | 27 +-
.../java/dom/todo/ToDoItemSubscriptions.java | 248 ++++-
.../dom/src/main/java/dom/todo/ToDoItems.java | 41 +-
.../src/test/java/dom/todo/ToDoItemTest.java | 94 ++
.../test/java/dom/todo/ToDoTest_completed.java | 71 --
.../java/dom/todo/ToDoTest_notYetCompleted.java | 71 --
.../archetype-resources/fixture/pom.xml | 2 +-
.../fixture/todo/ToDoItemsFixturesService.java | 10 +
.../archetype-resources/integtests/pom.xml | 6 +-
.../java/integration/ToDoSystemInitializer.java | 47 +-
.../tests/AbstractToDoIntegTest.java | 41 +
.../java/integration/tests/ToDoIntegTest.java | 41 -
.../tests/ToDoItemContributionsIntegTest.java | 152 +++
.../integration/tests/ToDoItemIntegTest.java | 1040 ++++++++++++++++++
.../integration/tests/ToDoItemsIntegTest.java | 116 ++
...oDoItemContributionsTest_updateCategory.java | 106 --
.../tests/actions/ToDoItemTest_completed.java | 174 ---
.../tests/actions/ToDoItemTest_duplicate.java | 83 --
.../actions/ToDoItemTest_notYetCompleted.java | 79 --
.../ToDoItemContributionsTest_similarTo.java | 71 --
.../colls/ToDoItemTest_dependencies_add.java | 181 ---
.../colls/ToDoItemTest_dependencies_remove.java | 176 ---
.../ToDoItemContributionsTest_priority.java | 75 --
.../tests/props/ToDoItemTest_attachment.java | 82 --
.../tests/props/ToDoItemTest_category.java | 62 --
.../tests/props/ToDoItemTest_cost.java | 100 --
.../tests/props/ToDoItemTest_description.java | 220 ----
.../tests/props/ToDoItemTest_dueBy.java | 106 --
.../tests/props/ToDoItemTest_notes.java | 90 --
.../tests/props/ToDoItemTest_ownedBy.java | 61 -
.../tests/props/ToDoItemTest_subcategory.java | 62 --
.../tests/repo/ToDoItemsTest_finders.java | 84 --
.../repo/ToDoItemsTest_newToDo_and_delete.java | 68 --
.../tests/smoke/ToDoItemTest_title.java | 116 --
.../main/resources/archetype-resources/pom.xml | 40 +-
.../webapp/ide/intellij/launch/README.txt | 6 +
.../ide/intellij/launch/TodoApp_PROTOTYPE.xml | 32 +
.../intellij/launch/TodoApp__enhance_only_.xml | 26 +
.../archetype-resources/webapp/pom.xml | 48 +-
.../src/main/java/webapp/admin/Admin.java | 1 +
.../java/webapp/admin/AdminContributions.java | 7 +-
.../webapp/prototyping/DeveloperUtilities.java | 6 +-
.../prototyping/ExternalLinksService.java | 8 +-
.../prototyping/WicketDeveloperUtilities.java | 42 +
.../webapp/ToDoApplication_en.properties | 54 +
.../webapp/src/main/resources/webapp/realm1.ini | 26 +
.../src/main/resources/webapp/welcome.html | 7 +-
.../src/main/webapp/WEB-INF/isis.properties | 76 +-
.../src/main/webapp/WEB-INF/logging.properties | 32 +
.../main/webapp/WEB-INF/persistor.properties | 12 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 10 +
.../webapp/src/main/webapp/about/index.html | 149 +--
.../webapp/src/main/webapp/css/application.css | 2 +-
.../projects/basic/archetype.properties | 2 +-
scripts/recreate-archetype.sh | 79 ++
tool/maven-plugin/pom.xml | 2 +-
237 files changed, 6782 insertions(+), 6826 deletions(-)
----------------------------------------------------------------------