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 2015/08/07 12:11:44 UTC
[17/17] isis git commit: Merge branch 'ISIS-848'
Merge branch 'ISIS-848'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cd84e55a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cd84e55a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cd84e55a
Branch: refs/heads/master
Commit: cd84e55a6ae863575842e2f77e478b4f272da985
Parents: 1ed4eef 10b93a7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 7 11:10:45 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 7 11:10:45 2015 +0100
----------------------------------------------------------------------
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 1 +
..._ug_getting-started_simpleapp-archetype.adoc | 3 +
.../org/apache/isis/applib/AppManifest.java | 161 +++++++++++++
.../IsisComponentProviderDefault.java | 238 +++++++++++--------
.../integtestsupport/IsisSystemForTest.java | 174 ++++++++------
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 5 +-
.../config/IsisConfigurationBuilder.java | 8 +
...IsisConfigurationBuilderResourceStreams.java | 11 +-
.../isis/core/commons/lang/ClassUtil.java | 32 +++
.../FixturesInstallerFromConfiguration.java | 3 +-
.../installerregistry/InstallerLookup.java | 123 +++++-----
.../core/runtime/runner/IsisInjectModule.java | 10 +-
.../runtime/services/ServicesInstaller.java | 3 +-
.../services/ServicesInstallerAbstract.java | 35 ---
.../ServicesInstallerFromAnnotation.java | 37 ++-
.../ServicesInstallerFromConfiguration.java | 74 +++---
...InstallerFromConfigurationAndAnnotation.java | 24 +-
.../isis/core/runtime/system/IsisSystem.java | 6 +-
.../core/runtime/system/IsisSystemFactory.java | 5 +-
.../core/runtime/system/SystemConstants.java | 27 +--
.../IsisComponentProvider.java | 23 +-
.../IsisComponentProviderAbstract.java | 213 +++++++++++++++++
.../IsisComponentProviderUsingInstallers.java | 176 ++++++++------
.../IsisSystemThatUsesInstallersFactory.java | 45 +++-
.../jdo/service/RegisterEntities.java | 27 ++-
.../viewer/wicket/viewer/IsisWicketModule.java | 10 +-
example/application/simpleapp/app/pom.xml | 68 ++++++
.../java/domainapp/home/SimpleAppManifest.java | 100 ++++++++
.../home/SimpleAppManifestBypassSecurity.java | 35 +++
.../home/SimpleAppManifestNoFixtures.java | 36 +++
.../home/services/homepage/HomePageService.java | 51 ++++
.../services/homepage/HomePageViewModel.java | 50 ++++
.../homepage/HomePageViewModel.layout.json | 43 ++++
.../services/homepage/HomePageViewModel.png | Bin 0 -> 456 bytes
.../domainapp/dom/DomainAppDomainModule.java | 24 ++
.../dom/app/homepage/HomePageService.java | 51 ----
.../dom/app/homepage/HomePageViewModel.java | 50 ----
.../app/homepage/HomePageViewModel.layout.json | 43 ----
.../dom/app/homepage/HomePageViewModel.png | Bin 456 -> 0 bytes
.../dom/modules/simple/SimpleObject.java | 149 ------------
.../dom/modules/simple/SimpleObject.layout.json | 56 -----
.../dom/modules/simple/SimpleObject.png | Bin 653 -> 0 bytes
.../dom/modules/simple/SimpleObjects.java | 107 ---------
.../java/domainapp/dom/simple/SimpleObject.java | 149 ++++++++++++
.../dom/simple/SimpleObject.layout.json | 56 +++++
.../java/domainapp/dom/simple/SimpleObject.png | Bin 0 -> 653 bytes
.../domainapp/dom/simple/SimpleObjects.java | 107 +++++++++
.../dom/modules/simple/SimpleObjectTest.java | 49 ----
.../dom/modules/simple/SimpleObjectsTest.java | 104 --------
.../domainapp/dom/simple/SimpleObjectTest.java | 49 ++++
.../domainapp/dom/simple/SimpleObjectsTest.java | 104 ++++++++
example/application/simpleapp/fixture/pom.xml | 7 +
.../fixture/DomainAppFixtureModule.java | 24 ++
...nAppFixtureScriptsSpecificationProvider.java | 44 ++++
.../fixture/DomainAppFixturesProvider.java | 44 ----
.../fixture/dom/simple/SimpleObjectCreate.java | 71 ++++++
.../dom/simple/SimpleObjectsTearDown.java | 36 +++
.../modules/simple/SimpleObjectCreate.java | 71 ------
.../modules/simple/SimpleObjectsTearDown.java | 36 ---
.../scenarios/RecreateSimpleObjects.java | 6 +-
.../application/simpleapp/integtests/pom.xml | 12 +-
.../bootstrap/SimpleAppSystemInitializer.java | 29 +--
.../modules/simple/SimpleObjectGlue.java | 4 +-
.../modules/simple/SimpleObjectIntegTest.java | 2 +-
.../modules/simple/SimpleObjectsIntegTest.java | 6 +-
example/application/simpleapp/pom.xml | 6 +
example/application/simpleapp/webapp/pom.xml | 31 +--
.../domainapp/webapp/SimpleApplication.java | 60 +----
.../src/main/webapp/WEB-INF/isis.properties | 128 +++-------
.../WEB-INF/persistor_datanucleus.properties | 3 -
.../META-INF/maven/archetype-metadata.xml | 17 ++
.../resources/archetype-resources/app/pom.xml | 65 +++++
.../java/domainapp/home/SimpleAppManifest.java | 103 ++++++++
.../home/SimpleAppManifestBypassSecurity.java | 38 +++
.../home/SimpleAppManifestNoFixtures.java | 39 +++
.../home/services/homepage/HomePageService.java | 54 +++++
.../services/homepage/HomePageViewModel.java | 53 +++++
.../homepage/HomePageViewModel.layout.json | 43 ++++
.../services/homepage/HomePageViewModel.png | Bin 0 -> 456 bytes
.../domainapp/dom/DomainAppDomainModule.java | 27 +++
.../dom/app/homepage/HomePageService.java | 54 -----
.../dom/app/homepage/HomePageViewModel.java | 53 -----
.../app/homepage/HomePageViewModel.layout.json | 43 ----
.../dom/app/homepage/HomePageViewModel.png | Bin 456 -> 0 bytes
.../dom/modules/simple/SimpleObject.java | 152 ------------
.../dom/modules/simple/SimpleObject.layout.json | 56 -----
.../dom/modules/simple/SimpleObject.png | Bin 653 -> 0 bytes
.../dom/modules/simple/SimpleObjects.java | 110 ---------
.../java/domainapp/dom/simple/SimpleObject.java | 152 ++++++++++++
.../dom/simple/SimpleObject.layout.json | 56 +++++
.../java/domainapp/dom/simple/SimpleObject.png | Bin 0 -> 653 bytes
.../domainapp/dom/simple/SimpleObjects.java | 110 +++++++++
.../dom/modules/simple/SimpleObjectTest.java | 52 ----
.../dom/modules/simple/SimpleObjectsTest.java | 107 ---------
.../domainapp/dom/simple/SimpleObjectTest.java | 52 ++++
.../domainapp/dom/simple/SimpleObjectsTest.java | 107 +++++++++
.../archetype-resources/fixture/pom.xml | 7 +
.../fixture/DomainAppFixtureModule.java | 27 +++
...nAppFixtureScriptsSpecificationProvider.java | 47 ++++
.../fixture/DomainAppFixturesProvider.java | 47 ----
.../fixture/dom/simple/SimpleObjectCreate.java | 74 ++++++
.../dom/simple/SimpleObjectsTearDown.java | 39 +++
.../modules/simple/SimpleObjectCreate.java | 74 ------
.../modules/simple/SimpleObjectsTearDown.java | 39 ---
.../scenarios/RecreateSimpleObjects.java | 6 +-
.../archetype-resources/integtests/pom.xml | 12 +-
.../bootstrap/SimpleAppSystemInitializer.java | 29 +--
.../modules/simple/SimpleObjectGlue.java | 4 +-
.../modules/simple/SimpleObjectIntegTest.java | 2 +-
.../modules/simple/SimpleObjectsIntegTest.java | 6 +-
.../main/resources/archetype-resources/pom.xml | 5 +
.../archetype-resources/webapp/pom.xml | 31 +--
.../domainapp/webapp/SimpleApplication.java | 60 +----
.../src/main/webapp/WEB-INF/isis.properties | 128 +++-------
.../WEB-INF/persistor_datanucleus.properties | 3 -
.../projects/basic/archetype.properties | 2 +-
116 files changed, 3310 insertions(+), 2450 deletions(-)
----------------------------------------------------------------------