Clone Tools
  • last updated 24 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v2

# Conflicts:

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

  1. … 1 more file in changeset.
ISIS-2072: now any exception will cause fallback welcome text to be used

  1. … 4 more files in changeset.
ISIS-2033: fixes RequestScope disposed too early

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 2 more files in changeset.
ISIS-2033: utilizes the Seam-SPI to provide a ConversationContext

disables the ConversationContextServiceWeld, as introduced prior

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 9 more files in changeset.
ISIS-2033: provides a simplified ConversationContext

resuming of the context as required when 'long-running', is not

implemented yet

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 12 more files in changeset.
ISIS-2033: provides a RequestContextServiceDefault

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 5 more files in changeset.
ISIS-2033: integrate RequestContextService with Wicket

fixes 'No active contexts for scope type

javax.enterprise.context.RequestScoped'

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 4 more files in changeset.
ISIS-2033: fixes provisioning of email related services

also handle serialization aspects such that injection points are

transient

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -10
    • +3
    ./viewer/services/EmailNotificationServiceWicket.java
  1. … 11 more files in changeset.
ISIS-2033: split MetaModelValidationException into 2 parts

MetaModelDeficiencies to hold the validation result

MetaModelValidationException to be constructed from

MetaModelDeficiencies

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 12 more files in changeset.
ISIS-2033: fixes provisioning of TranslationService + MessageService

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -14
    • +12
    ./viewer/services/TranslationsResolverWicket.java
  1. … 10 more files in changeset.
ISIS-2056: try with resources, number of params in log output

  1. … 3 more files in changeset.
merge 'v2' into '2033-IoC'

  1. … 2 more files in changeset.
ISIS-2082: let ThreadPoolSupport.HIGHEST_CONCURRENCY_EXECUTION_MODE_ALLOWED act as an upper bound for the concurrency level supported by ThreadPoolSupport

Task-Url: https://issues.apache.org/jira/browse/ISIS-2082

  1. … 5 more files in changeset.
ISIS-2033: removing @ApplicationScoped where @Singleton is already used

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./viewer/services/EmailNotificationServiceWicket.java
  1. … 52 more files in changeset.
ISIS-2033: correcting javax.ejb.Singleton -> javax.inject.Singleton

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./viewer/services/EmailNotificationServiceWicket.java
  1. … 53 more files in changeset.
    • -1
    • +1
    ./viewer/TargetRespondListenerToResetQueryResultCache.java
    • -1
    • +1
    ./viewer/integration/wicket/LocalizerForIsis.java
  1. … 44 more files in changeset.
ISIS-2033: minor: renaming methods (prefixing 'is')

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./viewer/integration/wicket/LocalizerForIsis.java
  1. … 4 more files in changeset.
ISIS-2033: trying to fix provisioning (on payara)

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +2
    ./viewer/services/EmailNotificationServiceWicket.java
  1. … 59 more files in changeset.
ISIS-2033: rename IsisContext#getServicesInjector -> getServiceInjector

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./viewer/services/EmailNotificationServiceWicket.java
  1. … 4 more files in changeset.
Merge branch 'v2' into 2033-IoC

Conflicts:

core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java

core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/pom.xml

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 37 more files in changeset.
ISIS-1899: wicket-viewer: fixes NPE when welcome-file is missing

Merge branch 'release-1.17.0-RC3' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/__versions.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc

# adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc

# core/.m2/settings.xml

# core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

# core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

# example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties

# example/application/helloworld/src/main/webapp/WEB-INF/web.xml

# example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml

# example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml

# example/archetype/helloworld/pom.xml

# example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/isis-non-changing.properties

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

# example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties

# example/archetype/simpleapp/pom.xml

# example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties

# example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

# recreate_archetype_RELEASE.sh

# recreate_archetype_SNAPSHOT.sh

# scripts/updateGeneratedArchetypeSources.groovy

# scripts/verify-isis-release.sh

  1. … 44 more files in changeset.
ISIS-1899: fixes bug, welcome.html was not being rendered.

  1. … 2 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

# core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

# core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java

# core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

# example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

    • -7
    • +11
    ./viewer/IsisWicketApplication.java
  1. … 61 more files in changeset.
ISIS-2033: Major: MetaModel refactoring

removing instances of 'ServicesInjector' being passed around in

constructors

removing 'ServicesInjectorAware' interface

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -2
    • +2
    ./viewer/TargetRespondListenerToResetQueryResultCache.java
    • -2
    • +2
    ./viewer/integration/wicket/LocalizerForIsis.java
  1. … 465 more files in changeset.
ISIS-1997: adds a sidebar, can toggle

  1. … 7 more files in changeset.
ISIS-2033: proper support for CDI lifecycle

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -18
    • +3
    ./viewer/IsisWicketApplication.java
  1. … 13 more files in changeset.
ISIS-2033: remove AppManifestProvider interface and do some cleanup

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 24 more files in changeset.
ISIS-2033: Major (interim): thrown away Installers and Guice

prepare for full provisioning utilizing CDI

this commit breaks provisioning and SudoService

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -56
    • +36
    ./viewer/IsisWicketApplication.java
    • -70
    • +0
    ./viewer/integration/isis/IsisInjectModule.java
    • -1
    • +3
    ./viewer/services/EmailNotificationServiceWicket.java
    • -55
    • +0
    ./viewer/services/EmailServiceWicket.java
  1. … 167 more files in changeset.