Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2263: bump schema XSDs to v2/2.0

    • -1
    • +1
    ./DomainServiceLayoutFacetFactory.java
  1. … 271 more files in changeset.
ISIS-2259: fixes up package name of isis-core-metamodel

    • -0
    • +36
    ./DomainServiceLayoutFacet.java
    • -0
    • +54
    ./DomainServiceLayoutFacetAbstract.java
    • -0
    • +70
    ./DomainServiceLayoutFacetFactory.java
    • -0
    • +36
    ./NamedFacetForDomainServiceLayoutAnnotation.java
    • -0
    • +34
    ./annotation/DomainServiceLayoutFacetAnnotation.java
  1. … 3161 more files in changeset.
ISIS-2126 aligning most pkg names for module 'metamodel'

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

    • -62
    • +0
    ./DomainServiceLayoutFacetAbstract.java
    • -89
    • +0
    ./DomainServiceLayoutFacetFactory.java
    • -36
    • +0
    ./NamedFacetForDomainServiceLayoutAnnotation.java
    • -35
    • +0
    ./annotation/DomainServiceLayoutFacetAnnotation.java
  1. … 3137 more files in changeset.
ISIS-1974: fixes regression with domain service layout handling

    • -9
    • +37
    ./DomainServiceLayoutFacetFactory.java
    • -7
    • +1
    ./NamedFacetForDomainServiceLayoutAnnotation.java
  1. … 4 more files in changeset.
ISIS-2003: DomainServiceLayoutFacet: revert last changes and restore original behavior

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

    • -2
    • +1
    ./DomainServiceLayoutFacetFactory.java
ISIS-2003: proposed fix for DomainServiceLayout facet picked up even if not specified

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

    • -27
    • +10
    ./DomainServiceLayoutFacetFactory.java
    • -12
    • +6
    ./NamedFacetForDomainServiceLayoutAnnotation.java
Merge remote-tracking branch 'origin/master' into v2

    • -0
    • +8
    ./DomainServiceLayoutFacetAbstract.java
  1. … 143 more files in changeset.
adds FacetWithAttributes interface

makes existing facets implement

    • -0
    • +8
    ./DomainServiceLayoutFacetAbstract.java
  1. … 161 more files in changeset.
ISIS-1976: cleaning up some raw types, unchecked casts and incomplete switches

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

    • -11
    • +0
    ./DomainServiceLayoutFacetFactory.java
  1. … 46 more files in changeset.
    • -5
    • +2
    ./NamedFacetForDomainServiceLayoutAnnotation.java
  1. … 315 more files in changeset.
ISIS-1976: removes OA map, stream for metamodel, excising guava

Key achievements:

Metamodel: almost all guava Function and Predicate idioms removed

Metamodel: slight API improvements, such that some of the internal meta-data that is kept in Java

Collections is no longer copied into immutable lists for any calling client, instead Java Streams are returned (which treat the underlying collections un-modifiable by design)

the ObjectAdapter per-session map/cache is history

the legacy modules have been removed, for convenince and ease of migration the legacy/transition-1-2- module remains and shall provide legacy glue code

shiro was moved to plugins, and its artifact renamed, to be inline with the other plugins

    • -0
    • +1
    ./NamedFacetForDomainServiceLayoutAnnotation.java
  1. … 558 more files in changeset.
ISIS-1841 automated source cleanup

Add missing '@Override' annotations

Remove trailing white spaces on all lines

Correct indentation

    • -2
    • +4
    ./DomainServiceLayoutFacetAbstract.java
    • -22
    • +22
    ./DomainServiceLayoutFacetFactory.java
  1. … 1409 more files in changeset.
ISIS-1632: fixes test regression

    • -1
    • +2
    ./DomainServiceLayoutFacetFactory.java
  1. … 1 more file 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

    • -2
    • +1
    ./DomainServiceLayoutFacetFactory.java
  1. … 119 more files in changeset.
ISIS-1785: fixes comparison, the undefined value is (Integer.MAX_VALUE - 100), not Integer.MAX_VALUE (this in DomainServiceMenuOrder)

Other changes in this commit are just cosmetic refactorings etc

    • -11
    • +2
    ./DomainServiceLayoutFacetFactory.java
  1. … 9 more files in changeset.
ISIS-1632: converts facet factories to support meta annotations ... code now compiles

but haven't tried unit tests yet, let alone integ tests etc..

Also:

- removed support for boolean flags in annotations, replaced with enums. Need to review to ensure is complete.

    • -11
    • +17
    ./DomainServiceLayoutFacetFactory.java
    • -6
    • +14
    ./NamedFacetForDomainServiceLayoutAnnotation.java
  1. … 93 more files in changeset.
ISIS-1632: generalises Annotations utility to return a list of annotations rather than first matching. (INCOMPLETE, DOESN'T EVEN COMPILE)

The idea here is that the calling code can look for the first non-default value for whichever attribute of the annotation that they might be interested in.

    • -2
    • +2
    ./DomainServiceLayoutFacetFactory.java
  1. … 42 more files in changeset.
ISIS-1611: sets the default menuOrder to be less than that of the menuOrder for all framework-provided implementations; also updates docs and migration guide

    • -2
    • +2
    ./DomainServiceLayoutFacetFactory.java
  1. … 76 more files in changeset.
ISIS-993: metadata classes, facet factory, starting on the wicket component

    • -0
    • +84
    ./DomainServiceLayoutFacetFactory.java
  1. … 41 more files in changeset.
ISIS-995 Allow the label of a property to be rendered as HTML. Also, allow the label of boolean panels to be rendered on the right hand side.

Add support for 'namedEscaped' attribute to @CollectionLayout, @PropertyLayout and @ParameterLayout.

    • -1
    • +1
    ./NamedFacetForDomainServiceLayoutAnnotation.java
  1. … 28 more files in changeset.
ISIS-964, ISIS-969: rename @ClassLayout to @DomainObjectLayout; introduce @DomainServiceLayout and move @DomainService(menuBar=... over to it) and replace DomainServiceFacet#getMenuOrder() with DomainServiceLayout#getMenuOrder().

Also updated ServicesInstallerFromAnnotation that reads directly from the annotation (no facets are available at the point at which it runs).

    • -0
    • +45
    ./DomainServiceLayoutFacet.java
    • -0
    • +52
    ./DomainServiceLayoutFacetAbstract.java
    • -0
    • +84
    ./DomainServiceLayoutFactory.java
    • -0
    • +42
    ./NamedFacetForDomainServiceLayoutAnnotation.java
    • -0
    • +35
    ./annotation/DomainServiceLayoutFacetAnnotation.java
  1. … 52 more files in changeset.