Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2259: fixes up package name of isis-core-metamodel

    • -0
    • +123
    ./CommandFacetAbstract.java
  1. … 3164 more files in changeset.
ISIS-2126 aligning most pkg names for module 'metamodel'

- o.a.i.core.metamodel.* -> o.a.i.metamodel.*

  1. … 3140 more files in changeset.
ISIS-2112: backporting from '2033-IoC_Spring' branch

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

  1. … 1098 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

  1. … 468 more files in changeset.
Merge remote-tracking branch 'origin/master' into v2

  1. … 143 more files in changeset.
adds FacetWithAttributes interface

makes existing facets implement

  1. … 161 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

  1. … 1410 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. … 110 more files in changeset.
ISIS-1569: renames CommandWithDtoProcessor to CommandDtoProcessor ...

... and updates docs

  1. … 21 more files in changeset.
ISIS-1569: various fixes for ContentMappingService (while manual testing of replication)

ContentMappingServiceForCommandsDto

- allows to be used from menu services

- if mapping returns null, then just ignore (so can avoid replicating certain commands)

CommandWithDtoProcessor

- decided to move abstract implementations up to top-level

- introduced new Null implementation (to ignore)

CommandWithDtoProcessor

- no longer generic

CommonDtoUtils

- for blob and clob values of parameters, continue to save as REFERENCE rather than BLOB/CLOB

ApplicationFeatureId

- fix for getObjectSpecId for classes whose objectType doesn't include a "packageName"

  1. … 12 more files in changeset.
ISIS-1569: adds support for @Action(commandWithDtoProcessor=...) and @Property(commandWithDtoProcessor=....)

In support, MetaModelService5 introduced, to allow the associated commandWithDtoProcessor to be obtained for a given action or property (if any).

ContentMappingServiceForCommand(s)Dto now delegate to the processor if present.

Also, extended common.xsd to support blobs and clobs.

  1. … 27 more files in changeset.
ISIS-1742: removes @Command annotation and supporting facets

  1. … 17 more files in changeset.
ISIS-970: unit testing of @Action annotation

Includes:

- HiddenFacet is now multi-typed (as a minor improvement so that all hidden facets are held (as HidingInteractionAdvisors) and added to, rather than potentially being replaced as the "blessed" facet impl.

- slight alteration (simplification) of the design of @Action(restrictoTo=...)

    • -42
    • +0
    ./configuration/ActionConfiguration.java
    • -41
    • +0
    ./configuration/CommandFacetFromConfiguration.java
  1. … 97 more files in changeset.
ISIS-970: consolidating processing into DomainObjectAnnotationFacetFactory, ActionAnnotationFF, PropertyAnnotationFF, CollectionAnnotationFF

Also:

- renamed XxxInteractionFacet to XxxDomainEventFacet throughout.

    • -46
    • +0
    ./annotation/CommandFacetAnnotation.java
    • -39
    • +0
    ./annotation/CommandFacetAnnotationFactory.java
    • -41
    • +0
    ./configuration/CommandFacetFromConfigurationFactory.java
  1. … 218 more files in changeset.
ISIS-970: starting writing tests for @Action annotation.

    • -49
    • +4
    ./configuration/CommandFacetFromConfigurationFactory.java
  1. … 14 more files in changeset.
ISIS-970: fixing merge conflicts and fixing unit and integ tests

    • -4
    • +3
    ./configuration/ActionConfiguration.java
  1. … 27 more files in changeset.
ISIS-970: completed the ActionAnnotationFacetFactory, with additional refactoring for DomainObjectFacetFactory

... so that these do all the processing of auditing, commands, publishing.

ActionAnnotationFacetFactory also does all the processing of @Bulk

In addition:

- gone through the todoapp and simpleapp, updated annotations.

    • -3
    • +11
    ./annotation/CommandFacetAnnotation.java
    • -13
    • +3
    ./annotation/CommandFacetAnnotationFactory.java
    • -0
    • +43
    ./configuration/ActionConfiguration.java
    • -1
    • +6
    ./configuration/CommandFacetFromConfiguration.java
    • -26
    • +4
    ./configuration/CommandFacetFromConfigurationFactory.java
  1. … 117 more files in changeset.
ISIS-831: more tidy-up, now passing tests.

* introduced an EXECUTING phase as well as EXECUTED.

    • -1
    • +1
    ./configuration/CommandFacetFromConfigurationFactory.java
  1. … 75 more files in changeset.
ISIS-831: digression: moving progmodel/facets into metamodel/facets

... and getting names consistent.

    • -0
    • +74
    ./CommandFacetAbstract.java
    • -0
    • +38
    ./annotation/CommandFacetAnnotation.java
    • -0
    • +49
    ./annotation/CommandFacetAnnotationFactory.java
    • -0
    • +36
    ./configuration/CommandFacetFromConfiguration.java
    • -0
    • +108
    ./configuration/CommandFacetFromConfigurationFactory.java
  1. … 1820 more files in changeset.
ISIS-728, ISIS-729: config-based audit and commands

In detail:

- @Command and @Audited now have disabled flag

- new CommandFromConfigurationFacetFactory and CommandFacetFromConfiguration

- new AuditableFromConfigurationFacetFactory and AuditableFacetFromConfiguration

- in ActionInvocationFacetViaMethod, check that command is not disabled

- in IsisTransaction, check that auditable facet is not disabled

Also:

- renamed existing facet factory and facet for @Auditable annotation, added unit test

- added pngs for audit entry, command, published event

- new JDOQL queries for commands, available in CommandServiceJdoRepository#findByFromAndTo

- new JDOQL queries for audit entries available in AuditingServiceJdoRepository#findByFromAndTo

- new JDOQL queries for published events, available in PublishingServiceJdoRepository#findByFromAndTo

- recentChanges contributed action now includes published events

- listAll() removed from BackgroundCommandServiceJdoRepository

- updates to todo app to expose new JDOQL queries in Admin menu

- updated some icons in example todo app

  1. … 52 more files in changeset.
ISIS-667,ISIS-684,ISIS-685: async commands, tidy-up

ISIS-684:

- rename BackgroundActionService to BackgroundCommandService

ISIS-667:

- memberIdentifier, targetClass, targetAction, targetStr consistent across PublishedEventJdo, AuditEntryJdo, CommandJdo

ISIS-685:

- @Command annotation extended, with persistence() and executeIn() attributes

- corresponding updates to CommandFacet

- Command#executor and Command#executedIn keep track of whether being run by user or background

- ActionInvocationFacetViaMethod new logic, short-circuits execution if executor = user but executedIn = background,

and return the command instead (if persistable)

- CommandService API extended to allow callers to request persistence of Command early

(as used by ActionInvocationFacetViaMethod)

  1. … 46 more files in changeset.
ISIS-684: renamed ReifiableAction to Command

also:

- @Reified to @Command

- ReifiedActionContext to CommandContext

- ReifiedActionService to CommandService

  1. … 54 more files in changeset.