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 2017/02/14 15:13:10 UTC
[20/20] isis git commit: Merge branch 'maint-1.14.0'
Merge branch 'maint-1.14.0'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/98f9fa9b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/98f9fa9b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/98f9fa9b
Branch: refs/heads/master
Commit: 98f9fa9b257b8954ab0b5e8bac21a294663302b8
Parents: 5fca181 794dce5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 14 15:11:19 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 14 15:11:19 2017 +0000
----------------------------------------------------------------------
.../asciidoc/guides/_rgant-Discriminator.adoc | 35 +-
.../guides/_rgant-DomainObject_objectType.adoc | 38 +-
.../asciidoc/guides/_rgant-DomainService.adoc | 8 +
.../guides/_rgant-DomainService_objectType.adoc | 58 +++
.../guides/_rgant-PersistenceCapable.adoc | 38 +-
.../main/asciidoc/guides/_rgant-ViewModel.adoc | 6 +
.../guides/_rgant-ViewModel_objectType.adoc | 64 +++
.../asciidoc/guides/_rgant_aaa_deprecated.adoc | 12 +-
.../guides/_rgcfg_configuring-core.adoc | 151 +++++--
.../guides/_rgcms_methods_prefixes_disable.adoc | 55 +--
.../guides/_rgcms_methods_prefixes_hide.adoc | 44 +--
.../_rgcms_methods_prefixes_validate.adoc | 32 +-
.../guides/_rgcms_methods_reserved_getId.adoc | 48 ++-
.../guides/_rgsvc_api_ConfigurationService.adoc | 16 +-
.../guides/_rgsvc_api_EmailService.adoc | 2 +-
.../guides/_ugbtb_decoupling_mixins.adoc | 2 +-
.../isis/applib/annotation/DomainObject.java | 6 +-
.../isis/applib/annotation/DomainService.java | 11 +
.../applib/fixturescripts/FixtureResult.java | 5 +-
.../applib/fixturescripts/FixtureScripts.java | 2 +-
.../BookmarkHolderActionContributions.java | 106 -----
.../BookmarkHolderAssociationContributions.java | 105 -----
.../bookmark/BookmarkHolder_lookup.java | 57 +++
.../bookmark/BookmarkHolder_object.java | 54 +++
.../services/config/ConfigurationProperty.java | 3 +-
.../config/ConfigurationServiceMenu.java | 5 +-
.../fixturespec/FixtureScriptsDefault.java | 8 +-
.../services/layout/LayoutServiceMenu.java | 4 +-
.../metamodel/MetaModelServicesMenu.java | 4 +-
.../queryresultscache/QueryResultsCache.java | 4 +-
.../services/swagger/SwaggerServiceMenu.java | 5 +-
.../MethodPrefixBasedFacetFactoryAbstract.java | 27 +-
...oicesForCollectionParameterFacetFactory.java | 125 ++++++
.../facets/members/disabled/DisabledFacet.java | 9 +
.../members/disabled/DisabledFacetAbstract.java | 25 +-
.../disabled/DisabledFacetAbstractImpl.java | 10 +
.../DisableForContextFacetViaMethodFactory.java | 22 +-
.../HideForContextFacetViaMethodFactory.java | 17 +-
.../DomainObjectAnnotationFacetFactory.java | 50 ++-
.../editing/EditingObjectsConfiguration.java | 2 +-
...bleObjectFacetForDomainObjectAnnotation.java | 5 -
.../DomainServiceFacetAnnotationFactory.java | 112 +++++-
.../mixin/MetaModelValidatorForMixinTypes.java | 54 +++
.../MixinFacetForDomainObjectAnnotation.java | 5 +-
.../MixinFacetForMixinAnnotationFactory.java | 17 +-
.../ObjectSpecIdFacetDerivedFromClassName.java | 3 +
...tSpecIdFacetDerivedFromClassNameFactory.java | 115 +++++-
...vedFromDomainServiceAnnotationElseGetId.java | 33 ++
...etOnPropertyDerivedFromImmutableFactory.java | 6 +
.../DisabledFacetForPropertyAnnotation.java | 4 +-
...tForPropertyAnnotationInvertedSemantics.java | 33 ++
.../core/metamodel/services/ServiceUtil.java | 55 ++-
.../Persistable_datanucleusIdLong.java | 8 +-
.../Persistable_datanucleusVersionLong.java | 8 +-
...Persistable_datanucleusVersionTimestamp.java | 8 +-
.../Persistable_downloadJdoMetadata.java | 6 +-
.../metamodel/spec/ObjectSpecification.java | 3 +
.../specimpl/ObjectActionContributee.java | 3 +-
.../specimpl/ObjectActionMixedIn.java | 8 +-
.../specimpl/ObjectSpecificationAbstract.java | 14 +-
.../validator/MetaModelValidatorVisiting.java | 2 +-
.../query/JdoQueryAnnotationFacetFactory.java | 168 +++++++-
.../dflt/ProgrammingModelFacetsJava5.java | 5 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 17 +-
.../metamodel/services/ServiceUtil_Test.java | 104 +++++
.../testspec/ObjectSpecificationStub.java | 12 +-
.../JdoQueryAnnotationFacetFactoryTest.java | 101 +++++
.../CommandDtoServiceInternalDefault.java | 17 +-
.../i18n/po/TranslationServicePoMenu.java | 5 +-
.../session/IsisSessionFactoryBuilder.java | 53 ++-
.../wicket/WebRequestCycleForIsis.java | 2 +-
.../entity/fieldset/PropertyGroup.java | 14 +-
.../ui/pages/actionprompt/ActionPromptPage.java | 10 +-
...nAppFixtureScriptsSpecificationProvider.java | 4 +-
.../manifest/DomainAppAppManifest.java | 73 +++-
.../DomainAppAppManifestBypassSecurity.java | 10 +-
.../DomainAppAppManifestWithFixtures.java | 23 +-
...ppAppManifestWithFixturesBypassSecurity.java | 10 +-
.../services/dbmanager/HsqlDbManagerMenu.java | 3 +-
.../services/homepage/HomePageService.java | 3 +-
.../services/homepage/HomePageViewModel.java | 8 +-
.../application/manifest/isis.properties | 395 +++++++++++++++++++
.../modules/simple/dom/impl/SimpleObject.java | 9 +-
.../simple/dom/impl/SimpleObjectMenu.java | 1 +
.../fixture/scenario/CreateSimpleObjects.java | 18 +-
.../fixture/scenario/SimpleObjectData.java | 49 +++
.../SimpleModuleIntegTestAbstract.java | 2 +
.../tests/SimpleObject_IntegTest.java | 10 +-
.../src/main/webapp/WEB-INF/isis.properties | 266 +------------
.../main/webapp/WEB-INF/persistor.properties | 15 -
.../WEB-INF/persistor_datanucleus.properties | 91 -----
91 files changed, 2364 insertions(+), 911 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/98f9fa9b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/98f9fa9b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_hide.adoc
----------------------------------------------------------------------
diff --cc adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_hide.adoc
index 4e6da72,91054af..8f4c27d
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_hide.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_hide.adoc
@@@ -24,13 -16,13 +16,13 @@@ The signature of the supporting method
[source,java]
----
-public bool hideXxx() { ... }
+public boolean hideXxx() { ... }
----
- with no parameters at all. Returning `true` will hide the action, returning `false` leaves it visible.
+ Returning `true` will hide the property, collection or action, returning `false` leaves it visible.
- For example:
+ For example, to hide an action:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/98f9fa9b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_decoupling_mixins.adoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/98f9fa9b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
----------------------------------------------------------------------