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 2019/11/19 00:11:08 UTC

[isis] branch master updated: ISIS-2084: more messing about with config props

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e8ce90  ISIS-2084: more messing about with config props
6e8ce90 is described below

commit 6e8ce90b5011c4f0c1eb047dfc4f9d7d5309ad04
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 19 00:10:50 2019 +0000

    ISIS-2084: more messing about with config props
    
    this time for simpleapp
---
 .../domainapp/conf/SimpleAppConfiguration.java     |   1 -
 .../domainapp/conf/isis-non-changing.properties    | 738 ---------------------
 .../webapp/src/main/resources/application.yml      | 135 ++++
 .../main/resources/config/application.properties   |   0
 4 files changed, 135 insertions(+), 739 deletions(-)

diff --git a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java b/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
index bdaf22a..c39bbf3 100644
--- a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
+++ b/examples/apps/simpleapp/application/src/main/java/domainapp/conf/SimpleAppConfiguration.java
@@ -44,7 +44,6 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
  */
 @Configuration
 @PropertySources({
-    @PropertySource("classpath:/domainapp/conf/isis-non-changing.properties"),
     @PropertySource(IsisPresets.H2InMemory),
     //@PropertySource(IsisPresets.NoTranslations),
     @PropertySource(IsisPresets.DataNucleusAutoCreate),
diff --git a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/isis-non-changing.properties b/examples/apps/simpleapp/application/src/main/java/domainapp/conf/isis-non-changing.properties
deleted file mode 100644
index bdcbc36..0000000
--- a/examples/apps/simpleapp/application/src/main/java/domainapp/conf/isis-non-changing.properties
+++ /dev/null
@@ -1,738 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#         http://www.apache.org/licenses/LICENSE-2.0
-#         
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-
-
-
-#################################################################################
-#
-# core
-#
-#################################################################################
-
-
-# -- auto wired by plugins -- 
-#isis.services.eventbus.implementation=guava
-#isis.services.eventbus.implementation=axon
-
-
-########################################
-#
-# MetaModel
-#
-# The metamodel typically does not require additional configuration, although
-# the system components (defined above) may refine the metamodel for their needs.
-#
-########################################
-
-
-#
-# Additional programming model facet factories, or remove standard facet factories.
-# Comma separated list of fully qualified class names.
-#
-#isis.reflector.facets.include=
-#isis.reflector.facets.exclude=
-
-
-#
-# Metamodel validation (in addition to that automatically performed by the programming model facet factories)
-# Default implementation does nothing.
-#
-# Use a custom implementation to enforce additional constraints specific to your app/project/company.
-#
-#isis.reflector.validator=org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault
-
-
-
-#
-# Whether to allow deprecated annotations/method prefixes (otherwise raise metamodel validation errors).
-# If not specified, default is to allow.
-#
-isis.reflector.validator.allowDeprecated=false
-
-
-#
-# Whether to check that JAXB view models are not abstract.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelNotAbstract=true
-
-#
-# Whether to check that JAXB view models are not inner classes.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelNotInnerClass=true
-
-#
-# Whether to check that JAXB view models have no-arg constructors.  If not specified, default is NOT to validate.
-#
-#isis.reflector.validator.jaxbViewModelNoArgConstructor=false
-
-#
-# Whether to check that, for JAXB view model with properties referencing persistent entities, that those entities
-# are annotated with @XmlJavaTypeAdapter.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelReferenceTypeAdapter=true
-
-#
-# Whether to check that, for JAXB view model with date/time properties, that those properties are annotated with
-# @XmlJavaTypeAdapter.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelDateTimeTypeAdapter=true
-
-
-#
-# Whether to validate JDOQL clauses.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jdoqlFromClause=true
-#isis.reflector.validator.jdoqlVariablesClause=true
-
-
-#
-# Whether to only allow hideXxx() and disableXxx() methods with no params.
-# If not specified, defaults to false (ie will also search for methods with parameter types matching the action).
-#
-isis.reflector.validator.noParamsOnly=true
-
-
-#
-# Whether to require the object type to be specified explicitly for entities.
-# If not specified, defaults to false
-#
-isis.reflector.validator.explicitObjectType=true
-
-
-#
-# Whether to ignore or honour (at least some of the) deprecated annotations/method prefixes.
-# If not specified, default is to honour
-#
-#isis.reflector.facets.ignoreDeprecated=false
-
-
-#
-# Whether to enforce the rule that domain services can only declare actions, not properties and collections.
-# If not specified, defaults to false
-#
-isis.reflector.validator.serviceActionsOnly=true
-
-
-#
-# Whether to use only mixins, and no contributed services.
-# If not specified, defaults to false
-#
-isis.reflector.validator.mixinsOnly=true
-
-
-
-
-#
-# patterns for applying CssClassFa facet (font-awesome icons), matching on action names
-#
-isis.reflector.facet.cssClassFa.patterns=\
-                        new.*:fa-plus,\
-                        add.*:fa-plus-square,\
-                        create.*:fa-plus,\
-                        update.*:fa-edit,\
-                        delete.*:fa-trash,\
-                        save.*:fa-floppy-o,\
-                        change.*:fa-edit,\
-                        edit.*:fa-pencil-square-o,\
-                        maintain.*:fa-edit,\
-                        remove.*:fa-minus-square,\
-                        copy.*:fa-copy,\
-                        move.*:fa-exchange,\
-                        first.*:fa-star,\
-                        find.*:fa-search,\
-                        lookup.*:fa-search,\
-                        search.*:fa-search,\
-                        view.*:fa-search,\
-                        clear.*:fa-remove,\
-                        previous.*:fa-step-backward,\
-                        next.*:fa-step-forward,\
-                        list.*:fa-list, \
-                        all.*:fa-list, \
-                        download.*:fa-download, \
-                        upload.*:fa-upload, \
-                        export.*:fa-download,\
-                        switch.*:fa-exchange,\
-                        import.*:fa-upload,\
-                        execute.*:fa-bolt, \
-                        run.*:fa-bolt, \
-                        calculate.*:fa-calculator, \
-                        verify.*:fa-check-circle, \
-                        refresh.*:fa-refresh, \
-                        install.*:fa-wrench,\
-                        stop.*:fa-stop,\
-                        terminate.*:fa-stop,\
-                        cancel.*:fa-stop,\
-                        discard.*:fa-trash-o,\
-                        pause.*:fa-pause,\
-                        suspend.*:fa-pause,\
-                        resume.*:fa-play,\
-                        renew.*:fa-repeat,\
-                        reset.*:fa-repeat,\
-                        categorise.*:fa-folder-open-o,\
-                        assign.*:fa-hand-o-right,\
-                        approve.*:fa-thumbs-o-up,\
-                        decline.*:fa-thumbs-o-down
-
-
-#
-# patterns for applying CssClass facet (CSS styles), matching on member names
-#
-isis.reflector.facet.cssClass.patterns=\
-                        delete.*:btn-danger,\
-                        discard.*:btn-warning,\
-                        remove.*:btn-warning
-
-
-#
-# Whether actions require @Action annotation to be recognised
-#
-isis.reflector.explicitAnnotations.action=true
-
-#
-# whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
-#
-
-#isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
-#isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
-#isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
-
-#isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
-#isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
-#isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
-
-#isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault=false
-#isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault=false
-
-########################################
-#
-# Domain Service configuration
-#
-########################################
-
-#
-# required by EmailServiceDefault
-#
-#isis.service.email.sender.address=some.valid@email.address
-#isis.service.email.sender.password=the.password.for-isis.service.email.sender.address
-
-
-#
-# whether ExceptionRecognizers should also log any recognized exceptions
-# (default false; enable for diagnostics/debugging)
-#
-#isis.services.exceprecog.logRecognizedExceptions=true
-
-
-#
-# disable to (automatically registered) ExceptionRecognizerCompositeForJdoObjectStore service
-# almost all of this service should be registered.  Since all exception recognizer implementations
-# are consulted in the event of an exception, it's not sufficient to override the implementation
-# (in isis.services); instead this configuration property disables this particular implementation.
-#
-#isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable=true
-
-
-########################################
-#
-# Auditing, Commands, Publishing
-#
-########################################
-
-#
-# Whether changes to objects should be audited; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
-# - if set to "all", can explicitly disable using @DomainObject(auditing=Auditing.DISABLED)
-#
-#isis.services.audit.objects=all|none
-isis.services.audit.objects=all
-
-
-#
-# Whether all (or all non-query only) actions should be reified as commands; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Action(command=CommandReification.ENABLED)
-# - if set to "all", can explicitly disable using @Action(command=CommandReification.DISABLED)
-#
-#isis.services.command.actions=all|none|ignoreSafe
-isis.services.command.actions=ignoreSafe
-
-
-#
-# Whether property edits should be reified into commands; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Property(command=CommandReification.ENABLED)
-# - if set to "all", can explicitly disable using @Property(command=CommandReification.DISABLED)
-#
-#isis.services.command.properties=all|none
-isis.services.command.properties=all
-
-
-
-#
-# Whether changes to objects should be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.objects=all|none
-isis.services.publish.objects=all
-
-
-#
-# Whether all (or all non-query only) action invocations should be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Action(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Action(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.actions=all|none|ignoreSafe
-isis.services.publish.actions=all
-
-
-#
-# Whether all property edits sshould be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Property(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Property(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.properties=all|none
-isis.services.publish.properties=all
-
-
-
-#
-# Whether the ApplicationFeatureRepository should eagerly initialize itself (increasing start-up times)
-# or initialize itself lazily.  Default is lazy initialization.
-#
-#isis.services.applicationFeatures.init=lazy|eager
-
-
-#
-# Whether the framework supports inject...() and set...() styles of dependency injection.   By default the former
-# is disabled, the latter is enabled.  Disabling these settings can reduce application start-up times.
-#
-#isis.services.injector.injectPrefix=false|true
-#isis.services.injector.setPrefix=false|true
-isis.services.injector.setPrefix=false
-
-
-
-
-########################################
-#
-# Policies
-#
-########################################
-
-#
-# Whether editing of object properties is allowed; if not set, defaults to "true"
-# - if not set or set to "true", can explicitly disable using @DomainObject(editing=Editing.DISABLED)
-# - if set to "false", can explicitly enable using @DomainObject(editing=Editing.ENABLED)
-#
-#isis.objects.editing=true|false
-isis.objects.editing=false
-
-
-
-########################################
-#
-# i18n
-#
-########################################
-
-#
-# force read translations, even if running in prototype mode
-#
-#isis.services.translation.po.mode=read
-
-
-
-
-
-
-
-########################################
-#
-# Value facet defaults
-#
-# (see also viewer-specific config files, eg viewer_wicket.properties)
-#
-########################################
-
-# as used by @Title of a date
-isis.value.format.date=dd-MM-yyyy
-
-
-
-#################################################################################
-#
-# authentication_shiro
-#
-#################################################################################
-
-#
-# if the shiro Subject is still authenticated, then just reuse.
-# Prior to 1.13.0, we forced an auto-logout, so set to 'true' to reinstate this behaviour.
-# See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm
-#
-#isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false
-
-
-
-#################################################################################
-#
-# persistor_datanucleus
-#
-#################################################################################
-
-
-########################################
-#
-# Persistor
-#
-########################################
-
-
-
-# generally speaking this should not be enabled
-isis.persistor.disableConcurrencyChecking=false
-
-
-
-#
-# If enabled, uses a more efficient implementation to render standalone collections.
-# default is 'false' (disabled)
-#
-isis.persistor.datanucleus.standaloneCollection.bulkLoad=true
-
-
-#
-# hook to perform additional initialization when JDO class metadata is loaded
-# default implementation will attempt to run 'create schema' for the specified schema.
-#
-# this implementation is installed by default:
-#isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata
-
-
-# whether to persist the event data as a "clob" or as a "zipped" byte[]
-# default is "zipped"
-#isis.persistor.datanucleus.PublishingService.serializedForm=zipped
-
-
-
-
-########################################
-#
-# DataNucleus' configuration
-#
-# The 'isis.persistor.datanucleus.impl' prefix is stripped off,
-# remainder is passed through to DataNucleus
-#
-########################################
-
-isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
-
-
-#
-# Require explicit persistence (since entities are Comparable and using ObjectContracts#compareTo).
-# see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
-#
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-
-
-#
-# How column names are identified
-# (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
-#
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
-
-#
-# L2 cache
-# off except if explicitly marked as cacheable
-# http://www.datanucleus.org/products/datanucleus/jdo/cache.html
-#
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-
-
-
-#
-# uncomment to use JNDI rather than direct JDBC
-#
-#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactoryName=java:comp/env/jdbc/quickstart
-
-#
-# uncomment to use JTA resource
-#
-#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactory2Name=java:comp/env/jdbc/quickstart-nontx
-#isis.persistor.datanucleus.impl.javax.jdo.option.TransactionType=JTA
-
-
-
-#
-#
-# JDBC connection details
-# ... are in WEB-INF/isis.properties
-#
-#
-
-
-
-#################################################################################
-#
-# viewer_restfulobjects.properties
-#
-#################################################################################
-
-
-
-# renders param details in the (incorrect) form that they were for GSOC2013 viewers
-# isis.viewer.restfulobjects.gsoc2013.legacyParamDetails=true
-
-# whether to honor UI hints, in particular Render(EAGERLY).  Defaults to false.
-#isis.viewer.restfulobjects.honorUiHints=false
-
-
-
-########################################
-# Non-standard configuration settings.
-#
-# If enabled of the following are enabled then the viewer is deviating from the
-# RO spec standard; compatibility may be compromised with RO clients.
-########################################
-
-# whether to show only object properties for object members
-# (on the object representation only)
-# Takes precedence over the other 'suppress' below.
-#isis.viewer.restfulobjects.objectPropertyValuesOnly=true
-
-# whether to suppress "describedby" links.  Defaults to false.
-#isis.viewer.restfulobjects.suppressDescribedByLinks=true
-
-# whether to suppress "update" links.  Defaults to false.
-#isis.viewer.restfulobjects.suppressUpdateLink=true
-
-# whether to suppress "id" json-prop for object members.  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberId=true
-
-# whether to suppress "links" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberLinks=true
-
-# whether to suppress "extensions" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberExtensions=true
-
-# whether to suppress "disabledReason" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberDisabledReason=true
-
-
-
-#################################################################################
-#
-# viewer_wicket
-#
-#################################################################################
-
-
-isis.viewer.wicket.application.name=Simple App
-isis.viewer.wicket.application.css=css/application.css
-isis.viewer.wicket.application.js=scripts/application.js
-isis.viewer.wicket.application.about=Simple App
-
-isis.viewer.wicket.credit[0].image=/images/apache-isis/logo-48x48.png
-isis.viewer.wicket.credit[0].name=Apache Isis
-isis.viewer.wicket.credit[0].url=http://isis.apache.org
-
-#
-# The maximum length of titles to display in standalone or parented tables.
-# Titles longer than this length will be truncated with trailing ellipses (...)
-#
-# For example, if set to 12, the title
-# "Buy milk on 15-Feb-13" will be truncated to "Buy milk ..."
-#
-# If set to 0, then only the icon will be shown.
-#
-isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
-isis.viewer.wicket.maxTitleLengthInParentedTables=0
-
-
-#
-# in Firefox and more recent versions of Chrome 54+, cannot copy out of disabled fields; instead we use the
-# readonly attribute (https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#the-readonly-attribute)
-# This behaviour is enabled by default but can be disabled using this flag
-#
-#isis.viewer.wicket.replaceDisabledTagWithReadonlyTag=true
-
-
-#
-# Whether to disable buttons after it has been clicked (for both form submit and no-arg actions), to prevent users
-# causing an error if they do a double click.
-# Also, whether to show an indicator alongside the button.
-#
-# This behaviour is enabled by default, but can be disabled using this flag.
-#
-#isis.viewer.wicket.preventDoubleClickForFormSubmit=true
-#isis.viewer.wicket.preventDoubleClickForNoArgAction=true
-#isis.viewer.wicket.useIndicatorForFormSubmit=true
-#isis.viewer.wicket.useIndicatorForNoArgAction=true
-
-
-#isis.viewer.wicket.datePicker.minDate=1900-01-01T00:00:00.000Z
-#isis.viewer.wicket.datePicker.maxDate=2100-01-01T00:00:00.000Z
-
-#isis.viewer.wicket.datePattern=dd-MM-yyyy
-#isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm
-
-#isis.viewer.wicket.datePattern=dd/MM/yy
-#isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
-
-
-#
-# whether to strip wicket tags from markup (default is true, as they may break some CSS rules)
-#
-#isis.viewer.wicket.stripWicketTags=false
-
-
-#
-# action prompt='dialog' style for objects ('sidebar' or 'modal', default is 'sidebar')
-#
-#isis.viewer.wicket.dialogMode=modal
-
-#
-# action prompt='dialog' style for services ('sidebar' or 'modal', default is 'modal')
-#
-#isis.viewer.wicket.dialogModeForMenu=sidebar
-
-
-#
-# whether to suppress the 'rememberMe' checkbox on the login page (default is false)
-#
-#isis.viewer.wicket.rememberMe.suppress=false
-
-
-#
-# Encryption key is used to encrypt the rememberMe user/password.  It should be set to a unique and private value.
-# If a hard-coded and publicly known value is used, then it would be possible for rememberMe user/password to be
-# intercepted and decrypted, compromising access.
-#
-# If no value is set then (for safety) a random UUID will be used as the encryption key.  The net effect of this
-# default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will
-# have to log in again).
-#
-#isis.viewer.wicket.rememberMe.encryptionKey=myEncryptionKey
-
-
-#
-# if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
-# through to that destination after successful login.  If you consider this to be a security risk then this flag
-# disables that behaviour (default is false).
-#
-#isis.viewer.wicket.clearOriginalDestination=true
-
-
-#
-# whether to show the Wicket debug bar and any other development utilities
-# (default depends on whether running in prototype mode or not; this property overrides that)
-#
-#isis.viewer.wicket.developmentUtilities.enable=true
-isis.viewer.wicket.developmentUtilities.enable=true
-
-
-
-#
-# whether to show bookmarks (defaults to true)
-#
-#isis.viewer.wicket.bookmarkedPages.showChooser=true
-
-
-#
-# the maximum number of pages to list in bookmark (default is 15)
-#
-#isis.viewer.wicket.bookmarkedPages.maxSize=15
-
-
-#
-# whether to show breadcrumbs (defaults to true)
-#
-#isis.viewer.wicket.breadcrumbs.showChooser=true
-
-
-
-
-
-#isis.viewers.paged.standalone=30
-#isis.viewers.paged.parented=10
-
-
-#isis.viewers.propertyLayout.labelPosition=LEFT
-#isis.viewers.parameterLayout.labelPosition=LEFT
-
-
-#
-# whether to show the bootstrap theme chooser (defaults false)
-#
-#isis.viewer.wicket.themes.showChooser=false
-isis.viewer.wicket.themes.showChooser=true
-
-
-#
-# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com, excluding Amelia which is broken).
-#
-isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
-
-
-isis.viewer.wicket.themes.initial=Flatly
-
-
-#
-# whether to automatically select dependent choice when the choice it depends upon changes.
-#
-#isis.viewer.wicket.disableDependentChoiceAutoSelection=false
-
-
-#
-# enable liveReload.  For example, use with gradle -t -b liveReload.gradle --offline &
-#
-#isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
-
-
-
-#
-# cookie key holding the (encrypted) 'rememberMe' user/password.
-# If not specified then the cookie key 'isisWicketRememberMe' will be used; there is generally no need to change this.
-#
-#isis.viewer.wicket.rememberMe.cookieKey=isisWicketRememberMe
-
-
-#
-# specifies whether an INLINE or DIALOG prompt should be used for property edits and for action invocations (of actions
-# associated with a property).  This is a fallback where not specified on a case-by-case using @PropertyLayout or
-# @ActionLayout (or equivalents in the Xxx.layout.xml file).
-#
-# If not specified then the default is an inline prompt.
-#
-#isis.viewer.wicket.promptStyle=INLINE
-
-
-#
-# If set then reverts to pre-1.15.0 behaviour of redirecting to a new page on any action invocation or property edit.
-# If left to its default then the page will be updated if the same object is rendered, making for a smoother user
-# experience.
-#
-#isis.viewer.wicket.redirectEvenIfSameObject=false
diff --git a/examples/apps/simpleapp/webapp/src/main/resources/application.yml b/examples/apps/simpleapp/webapp/src/main/resources/application.yml
new file mode 100644
index 0000000..5128a51
--- /dev/null
+++ b/examples/apps/simpleapp/webapp/src/main/resources/application.yml
@@ -0,0 +1,135 @@
+isis:
+  reflector:
+    validator:
+      allowDeprecated: false
+      noParamsOnly: true
+      explicitObjectType: true
+      serviceActionsOnly: true
+      mixinsOnly: true
+
+    facet:
+      cssClassFa:
+        patterns:
+          new.*:fa-plus,\
+          add.*:fa-plus-square,\
+          create.*:fa-plus,\
+          update.*:fa-edit,\
+          delete.*:fa-trash,\
+          save.*:fa-floppy-o,\
+          change.*:fa-edit,\
+          edit.*:fa-pencil-square-o,\
+          maintain.*:fa-edit,\
+          remove.*:fa-minus-square,\
+          copy.*:fa-copy,\
+          move.*:fa-exchange,\
+          first.*:fa-star,\
+          find.*:fa-search,\
+          lookup.*:fa-search,\
+          search.*:fa-search,\
+          view.*:fa-search,\
+          clear.*:fa-remove,\
+          previous.*:fa-step-backward,\
+          next.*:fa-step-forward,\
+          list.*:fa-list, \
+          all.*:fa-list, \
+          download.*:fa-download, \
+          upload.*:fa-upload, \
+          export.*:fa-download,\
+          switch.*:fa-exchange,\
+          import.*:fa-upload,\
+          execute.*:fa-bolt, \
+          run.*:fa-bolt, \
+          calculate.*:fa-calculator, \
+          verify.*:fa-check-circle, \
+          refresh.*:fa-refresh, \
+          install.*:fa-wrench,\
+          stop.*:fa-stop,\
+          terminate.*:fa-stop,\
+          cancel.*:fa-stop,\
+          discard.*:fa-trash-o,\
+          pause.*:fa-pause,\
+          suspend.*:fa-pause,\
+          resume.*:fa-play,\
+          renew.*:fa-repeat,\
+          reset.*:fa-repeat,\
+          categorise.*:fa-folder-open-o,\
+          assign.*:fa-hand-o-right,\
+          approve.*:fa-thumbs-o-up,\
+          decline.*:fa-thumbs-o-down
+
+      cssClass:
+        patterns:
+          delete.*:btn-danger,\
+          discard.*:btn-warning,\
+          remove.*:btn-warning
+
+    explicitAnnotations:
+      action: true
+
+  objects:
+    editing: false
+
+  services:
+    audit:
+      objects: all
+    command:
+      actions: ignore_safe
+      properties: all
+    publish:
+      objects: all
+      actions: all
+      properties: all
+
+    injector:
+      setPrefix: false
+
+  value:
+    format:
+      date: dd-MM-yyyy
+
+  viewer:
+    wicket:
+      application:
+        name: Simple App
+        css: css/application.css
+        js: scripts/application.js
+        about: Simple App
+      welcome:
+        file: welcome.html
+
+      credit[0]:
+        image: /images/apache-isis/logo-48x48.png
+        name: Apache Isis
+        url: http://isis.apache.org
+
+      themes:
+        initial: Flatly
+        showChooser: true
+        enabled: bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
+
+      maxTitleLengthInStandaloneTables: 0
+      maxTitleLengthInParentedTables: 0
+
+      developmentUtilities:
+        enable: true
+
+  persistor:
+    datanucleus:
+      impl:
+        datanucleus:
+          schema:
+            validateTables: true
+            validateConstraints: true
+
+          persistenceByReachabilityAtCommit: false
+          identifier:
+            case: MixedCase
+
+          cache:
+            level2:
+              type: none
+              mode: ENABLE_SELECTIVE
+
+      standaloneCollection:
+        bulkLoad: true
+
diff --git a/examples/apps/simpleapp/application/src/main/resources/config/application.properties b/examples/apps/simpleapp/webapp/src/main/resources/config/application.properties
similarity index 100%
rename from examples/apps/simpleapp/application/src/main/resources/config/application.properties
rename to examples/apps/simpleapp/webapp/src/main/resources/config/application.properties