Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-1841 comments: reduce visual clutter

replace 'region .. endregion' comment markers with just headers

  1. … 121 more files in changeset.
Merge branch 'maint-1.16.1' into master

# Conflicts:

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BulkInteractionContext.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc

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

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_actions.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_eager-rendering.adoc

# adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc

# adocs/documentation/src/main/asciidoc/pages/tg/_tg_pet-clinic.adoc

# adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc

# core/applib/src/main/java/org/apache/isis/applib/annotation/Action.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/Command.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/CommandExecuteIn.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java

# core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java

# core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java

# core/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionService3.java

# core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForCommandAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacetAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/mustsatisfyspec/MustSatisfySpecificationFacetAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForParameterAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForPropertyAnnotation.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/services/persistsession/PersistenceSessionServiceInternal.java

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

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

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.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/facetprocessor/FacetProcessor.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/dflt/ObjectSpecificationDefault.java

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

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

# core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java

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

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java

  1. … 111 more files in changeset.
ISIS-1858: converts logging calls to use slf4j placeholders rather than string concatenation.

Removes some isDebugEnabled and isInfoEnabled guards where no longer really necessary.

  1. … 58 more files in changeset.
Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

# Conflicts:

# adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc

# adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_schema-aim.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_ActionInvocationContext.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_MessageService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_TitleService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_TransactionService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_WrapperFactory.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_BackgroundCommandService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_HomePageProviderService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi_ClassDiscoveryService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_ClockService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_ConfigurationService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_FactoryService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_Scratchpad.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_UserService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_EmailService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_JaxbService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_MementoService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_XmlSnapshotService.adoc

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

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

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

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_IsisJdoSupport.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_MetricsService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_QueryResultsCache.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api_RepositoryService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_EventSerializer.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublisherService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublishingService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_UserRegistrationService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-api_AcceptHeaderService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-api_DeepLinkService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_EmailNotificationService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ErrorReportingService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ExceptionRecognizer.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_GridLoaderService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_GridSystemService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_HintStore.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_LocaleProvider.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_TranslationService.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_TranslationsResolver.adoc

# adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc

# adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_abstract-class.adoc

# adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc

# core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java

# core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java

# core/mavendeps/intellij/pom.xml

# core/mavendeps/testing/pom.xml

# core/mavendeps/webapp/pom.xml

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutAnnotation.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/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutAnnotation.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.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/services/persistsession/PersistenceSessionServiceInternal.java

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

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.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/FacetedMethodsBuilder.java

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

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

# core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java

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

# core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/DomainServiceProvider.java

# example/application/simpleapp/pom.xml

  1. … 119 more files in changeset.
ISIS-1799: adds TransactionService3#nextTransaction(Policy) overload, and uses from integration tests (HeadlessWithBootstrappingAbstract)

  1. … 13 more files in changeset.
ISIS-1716: reverts change in 1.15.0; now propogate exception if aborted, to redirect to error page.

In 1.15.0, exceptions swallowed silently

ISIS-1613: refactors the way that errors are caught and handled

  1. … 13 more files in changeset.
ISIS-1468: extends TransactionService, adding in getTransactionState

This promotes TransactionState to the applib, and removes the internal TransactionStateProividerInternalXxx domain services; moved to TransacionServiceDefault simply delegate to the PersistenceSessionServiceInternal for the underlying implementation.

Also updated docs.

  1. … 21 more files in changeset.
ISIS-1502: previous fix wasn't correctly handling nested transactions

ISIS-1502: previous fix wasn't correctly handling nested transactions

ISIS-1502: prevents infinite loop in IsisTransactionManager#endTransaction() when there is an error in domain logic code

ISIS-1502: prevents infinite loop in IsisTransactionManager#endTransaction() when there is an error in domain logic code

ISIS-1498: introduces new clearAbortCauseAndContinue() internal API for IsisTransaction, and leverage within BackgroundCommandExecution for the case where an action throws an exception (want to capture that, mark on the background Command, and persist).

  1. … 1 more file in changeset.
ISIS-1498: introduces new clearAbortCauseAndContinue() internal API for IsisTransaction, and leverage within BackgroundCommandExecution for the case where an action throws an exception (want to capture that, mark on the background Command, and persist).

  1. … 1 more file in changeset.
ISIS-1476: Transaction interface: Expose "clearAbortCause" for don't pick up handled persistence Exceptions

  1. … 1 more file in changeset.
ISIS-1476: Transaction interface: Expose "clearAbortCause" for don't pick up handled persistence Exceptions

  1. … 1 more file in changeset.
ISIS-1452: reinstates logic to abort transaction if an exception is thrown.

Previously (1.12.x) this was done using transaction facet decorators, but the work done under ISIS-1291 and others for this release removed those classes, without moving the responsibility elsewhere.

This commit reintroduces the handling, with the ActionInvocationFacet and PropertySetterOrClearFacet using the looked-up PersistenceSessionServiceInternal to executeWithinTransaction; this is basically the same place in the call stack that the decorator facets would have been.

The *Default impl of this - as used in runtime - delegates to the IsisTransactionManager#executeWithinTransaction(...).

  1. … 7 more files in changeset.
ISIS-1427: renamed IsisSystem to IsisSessionFactoryBuilder; bind IsisSessionFactory to http servlet context rather than IsisSystem (also do this in IsisWicketApplication); make OidMarshaller a singleton; remove convenience accessors from ServicesInjector; bind DeploymentCategory as a "service" (bean) in ServicesInjector; similarly refactor to remove AuthenticationSessionProvider service; MSG_ constants now listed in MessageRegistry

  1. … 57 more files in changeset.
ISIS-1427: simplifying IsisContext and minimizing calls to it; also removed Localization (unused)

    • -110
    • +45
    ./IsisTransactionManager.java
  1. … 214 more files in changeset.
ISIS-1427: IsisTransaction constructor simplified. Also, obtain MessageBroker from either AuthenticationSession or from ServicesInjector convenience method.

  1. … 8 more files in changeset.
ISIS-1429: removing unused fields in IsisTransaction

ISIS-1430: replace AuditingService with AuditerService.

  1. … 30 more files in changeset.
ISIS-1428: removing unnecessary 'synchronized' modifiers (either session-scoped or singletons, or singletons used only during bootstrapping, or singletons but race conditions would be harmless).

  1. … 5 more files in changeset.
ISIS-1427: AuthenticationSession eagerly creates its MessageBroker (rather than have IsisTransactionManager set it lazily).

Ratonale:

- simpler code, also removes a 'synchronized'

  1. … 3 more files in changeset.
ISIS-1414: introduced sequence for chg.xsd so that PublishedObjects can have a sequence; promoted WithTransactionScope interface to applib; QueryResultsCache now implements this interface.

The "transactionId" is really an interaction id, and there could be multiple transactions within a single such interaction. Therefore any PublishedObjects (= set of dirtied objects within a transaction) needs to have a sequence number to distinguish from other transactions, and also from any interaction executions.

  1. … 17 more files in changeset.
ISIS-1410: replacing Ensure hamcrest assertions with Java assert keyword

  1. … 17 more files in changeset.
ISIS-1414: removing 'numberOfPropertiesModified' from ixn.xsd and MetricsService; this is xactn-scoped information, not request-scoped. Also introduced WithTransactionScoped as a means to indicate which of the request-scoped members are really transaction-scoped.

    • -0
    • +27
    ./WithTransactionScope.java
  1. … 13 more files in changeset.
ISIS-1414: moving the @RequestScoped initialization/close stuff out of IsisTransactionManager and IsisTransaction, and into PersistenceSession.

Also:

- CommandService#startTransaction is no longer called.

- remove unused code/hashmap in PersistenceSession

    • -118
    • +16
    ./IsisTransactionManager.java
  1. … 7 more files in changeset.
ISIS-1411: removing DomainObjectContainerResolve helper class (inlining its functionality); removing inner interfaces only implemented by PersistenceSession.

  1. … 10 more files in changeset.
ISIS-1407: removed SpecificationLoaderAware.

Also:

- minor extension to ServiceRegistry2

- collapsed ServicesInjector, ServicesInjectorSpi and ServicesInjectorDefault to just ServicesInjector.

  1. … 270 more files in changeset.