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/12/03 18:04:11 UTC
[isis] branch master updated (86d0a14 -> 65b52a7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 86d0a14 ISIS-2205: moves wrapper factory from runtime-extensions to runtime-services
new f3b2710 ISIS-2206: moves isis-extensions/incubator to isis-incubator/incubator
new e083dcd ISIS-2205: fixes unit tests for wrapper factory moving
new 2525ddb ISIS-2206 renames incubator/other/incubator to incubator/core/model
new c2c2724 ISIS-2206: adds doc placeholders for incubator documentation
new a8d1e54 ISIS-2206: moves extensions/legacy to legacy/applib, legacy/core and legacy/runtime
new 65b52a7 ISIS-2206: fixes site.yml also
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archdesign/attachments/pom-hierarchy.pptx | Bin 50617 -> 51849 bytes
.../modules/ROOT/partials/component-nav.adoc | 6 +-
antora/components/incubator/antora.yml | 6 ++
.../incubator/modules/ROOT}/_attributes.adoc | 0
.../incubator/modules/ROOT/attachments}/.gitkeep | 0
.../incubator/modules/ROOT}/examples/.gitkeep | 0
.../incubator/modules/ROOT/images}/.gitkeep | 0
antora/components/incubator/modules/ROOT/nav.adoc | 1 +
.../incubator/modules/ROOT/pages}/_attributes.adoc | 0
.../incubator/modules/ROOT}/pages/about.adoc | 5 +-
.../modules/ROOT/partials}/_attributes.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 3 +
.../modules/ROOT/partials/module-nav.adoc | 0
antora/components/legacy/antora.yml | 6 ++
.../legacy/modules/ROOT}/_attributes.adoc | 0
.../legacy/modules/ROOT/attachments}/.gitkeep | 0
.../legacy/modules/ROOT}/examples/.gitkeep | 0
.../legacy/modules/ROOT/images}/.gitkeep | 0
antora/components/legacy/modules/ROOT/nav.adoc | 1 +
.../legacy/modules/ROOT/pages}/_attributes.adoc | 0
.../legacy/modules/ROOT}/pages/about.adoc | 5 +-
.../legacy/modules/ROOT/partials}/_attributes.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 5 ++
.../modules/ROOT/partials/module-nav.adoc | 0
.../components/toc/modules/ROOT/pages/about.adoc | 4 +-
.../toc/modules/ROOT/partials/module-nav.adoc | 4 +-
antora/playbooks/site-other.yml | 27 ++++++-
core-parent/pom.xml | 14 +---
.../WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
extensions/{other => core}/spring/pom.xml | 0
.../{other => core}/spring/src/main/doc/antora.yml | 0
.../src/main/doc/modules/spring}/_attributes.adoc | 0
.../main/doc/modules/spring/attachments}/.gitkeep | 0
.../src/main/doc/modules/spring}/examples/.gitkeep | 0
.../src/main/doc/modules/spring/images}/.gitkeep | 0
.../spring/src/main/doc/modules/spring/nav.adoc | 0
.../doc/modules/spring/pages}/_attributes.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../doc/modules/spring/partials}/_attributes.adoc | 0
.../doc/modules/spring/partials/module-nav.adoc | 0
.../isis/extensions/spring/ExtSpringModule.java | 0
.../extensions/spring/service/BeanDescriptor.java | 0
.../extensions/spring/service/ContextBeans.java | 0
.../spring/service/SpringBeansService.java | 0
extensions/other/incubator/src/main/doc/antora.yml | 2 -
.../src/main/doc/modules/incubator/nav.adoc | 1 -
.../doc/modules/incubator/partials/module-nav.adoc | 4 -
extensions/other/legacy/src/main/doc/antora.yml | 2 -
.../legacy/src/main/doc/modules/legacy/nav.adoc | 1 -
.../doc/modules/legacy/partials/module-nav.adoc | 4 -
extensions/pom.xml | 4 +-
.../other => incubator/core}/jsr303/README.adoc | 0
.../other => incubator/core}/jsr303/pom.xml | 0
.../examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../facets/jsr303/Jsr303ProgModelFacets.java | 0
.../jsr303/Jsr303PropertyValidationFacet.java | 0
.../examples/facets/jsr303/CustomPattern.java | 0
.../facets/jsr303/CustomPatternValidator.java | 0
.../examples/facets/jsr303/CustomPatterns.java | 0
.../facets/jsr303/DomainObjectVanilla.java | 0
.../jsr303/DomainObjectWithBuiltInValidation.java | 0
.../jsr303/DomainObjectWithCustomValidation.java | 0
.../facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../facets/jsr303/Jsr303FacetInstantiation.java | 0
.../jsr303/Jsr303FacetValidatingInteraction.java | 0
.../incubator => incubator/core/model}/pom.xml | 14 ++--
incubator/core/model/src/main/doc/antora.yml | 2 +
.../src/main/doc/modules/model}/_attributes.adoc | 0
.../core/model/src/main/doc/modules/model/nav.adoc | 1 +
.../main/doc/modules/model/pages}/_attributes.adoc | 0
.../src/main/doc/modules/model}/pages/about.adoc | 4 +-
.../doc/modules/model}/partials/_attributes.adoc | 0
.../doc/modules/model/partials/module-nav.adoc | 4 +
.../org/apache/isis/applib/annotation/Model.java | 0
.../incubator/IncubatorMetaModelPlugin.java | 0
.../extensions/incubator/IsisBootIncubator.java | 0
.../SupportingMethodValidatorRefinerFactory.java | 0
incubator/pom.xml | 77 ++++++++++++++++++
.../other/legacy => legacy/core/applib}/.gitignore | 0
.../other/legacy => legacy/core/applib}/pom.xml | 12 +--
legacy/core/applib/src/main/doc/antora.yml | 2 +
.../src/main/doc/modules/applib}/_attributes.adoc | 0
.../applib/src/main/doc/modules/applib/nav.adoc | 1 +
.../doc/modules/applib/pages}/_attributes.adoc | 0
.../src/main/doc/modules/applib}/pages/about.adoc | 4 +-
.../doc/modules/applib}/partials/_attributes.adoc | 0
.../doc/modules/applib/partials/module-nav.adoc | 4 +
.../apache/isis/applib/DomainObjectContainer.java | 0
.../java/org/apache/isis/applib/filter/Filter.java | 0
.../org/apache/isis/applib/filter/Filters.java | 0
.../background/BackgroundCommandService2.java | 0
.../services/background/BackgroundService.java | 0
.../services/background/BackgroundService2.java | 0
.../services/eventbus/ActionDomainEvent.java | 0
.../services/eventbus/CollectionDomainEvent.java | 0
.../services/eventbus/PropertyDomainEvent.java | 0
.../legacy => legacy/core/commons}/.gitignore | 0
.../other/legacy => legacy/core/commons}/pom.xml | 12 +--
legacy/core/commons/src/main/doc/antora.yml | 2 +
.../src/main/doc/modules/commons}/_attributes.adoc | 0
.../commons/src/main/doc/modules/commons/nav.adoc | 1 +
.../doc/modules/commons/pages}/_attributes.adoc | 0
.../src/main/doc/modules/commons}/pages/about.adoc | 4 +-
.../doc/modules/commons}/partials/_attributes.adoc | 0
.../doc/modules/commons/partials/module-nav.adoc | 4 +
.../FutureWithIndexIntoFutureOfList.java | 0
.../threadpool/ThreadPoolExecutionMode.java | 0
.../internal/threadpool/ThreadPoolSizeAdvisor.java | 0
.../internal/threadpool/ThreadPoolSupport.java | 0
.../internal/threadpool/ThreadPoolSupportTest.java | 0
.../legacy => legacy/core/runtime}/.gitignore | 0
.../other/legacy => legacy/core/runtime}/pom.xml | 12 +--
legacy/core/runtime/src/main/doc/antora.yml | 2 +
.../src/main/doc/modules/runtime}/_attributes.adoc | 0
.../runtime/src/main/doc/modules/runtime/nav.adoc | 1 +
.../doc/modules/runtime/pages}/_attributes.adoc | 0
.../src/main/doc/modules/runtime}/pages/about.adoc | 4 +-
.../doc/modules/runtime}/partials/_attributes.adoc | 0
.../doc/modules/runtime/partials/module-nav.adoc | 4 +
.../isis/core/runtime/snapshot/DomSerializer.java | 0
.../core/runtime/snapshot/DomSerializerJaxp.java | 0
.../isis/core/runtime/sysout/SystemPrinter.java | 0
.../system/persistence/LoggingLocation.java | 0
.../runtime/system/persistence/ObjectFactory.java | 0
.../system/persistence/SuspendableListener.java | 0
.../apache/isis/runtime/viewer/package-info.java | 0
.../viewer/web/AbstractServletOrFilterMapping.java | 0
.../runtime/viewer/web/FilterSpecification.java | 0
.../runtime/viewer/web/ServletSpecification.java | 0
.../runtime/viewer/web/WebAppSpecification.java | 0
legacy/pom.xml | 89 +++++++++++++++++++++
site.yml | 26 ++++--
137 files changed, 314 insertions(+), 81 deletions(-)
create mode 100644 antora/components/incubator/antora.yml
rename {extensions/other/spring/src/main/doc/modules/spring => antora/components/incubator/modules/ROOT}/_attributes.adoc (100%)
rename {extensions/other/spring/src/main/doc/modules/spring/images => antora/components/incubator/modules/ROOT/attachments}/.gitkeep (100%)
rename {extensions/other/spring/src/main/doc/modules/spring => antora/components/incubator/modules/ROOT}/examples/.gitkeep (100%)
rename {extensions/other/spring/src/main/doc/modules/spring/attachments => antora/components/incubator/modules/ROOT/images}/.gitkeep (100%)
create mode 100644 antora/components/incubator/modules/ROOT/nav.adoc
rename {extensions/other/spring/src/main/doc/modules/spring/partials => antora/components/incubator/modules/ROOT/pages}/_attributes.adoc (100%)
copy {extensions/other/legacy/src/main/doc/modules/legacy => antora/components/incubator/modules/ROOT}/pages/about.adoc (91%)
rename {extensions/other/spring/src/main/doc/modules/spring/pages => antora/components/incubator/modules/ROOT/partials}/_attributes.adoc (100%)
create mode 100644 antora/components/incubator/modules/ROOT/partials/component-nav.adoc
copy antora/components/{extensions => incubator}/modules/ROOT/partials/module-nav.adoc (100%)
create mode 100644 antora/components/legacy/antora.yml
rename {extensions/other/legacy/src/main/doc/modules/legacy => antora/components/legacy/modules/ROOT}/_attributes.adoc (100%)
rename {extensions/other/legacy/src/main/doc/modules/legacy/images => antora/components/legacy/modules/ROOT/attachments}/.gitkeep (100%)
rename {extensions/other/legacy/src/main/doc/modules/legacy => antora/components/legacy/modules/ROOT}/examples/.gitkeep (100%)
rename {extensions/other/legacy/src/main/doc/modules/legacy/attachments => antora/components/legacy/modules/ROOT/images}/.gitkeep (100%)
create mode 100644 antora/components/legacy/modules/ROOT/nav.adoc
rename {extensions/other/legacy/src/main/doc/modules/legacy/partials => antora/components/legacy/modules/ROOT/pages}/_attributes.adoc (100%)
copy {extensions/other/legacy/src/main/doc/modules/legacy => antora/components/legacy/modules/ROOT}/pages/about.adoc (82%)
rename {extensions/other/legacy/src/main/doc/modules/legacy/pages => antora/components/legacy/modules/ROOT/partials}/_attributes.adoc (100%)
create mode 100644 antora/components/legacy/modules/ROOT/partials/component-nav.adoc
copy antora/components/{extensions => legacy}/modules/ROOT/partials/module-nav.adoc (100%)
rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{ => runtime/services}/wrapper/WrapperFactoryDefaultTest_wrappedObject.java (99%)
rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{ => runtime/services}/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java (99%)
rename extensions/{other => core}/spring/pom.xml (100%)
rename extensions/{other => core}/spring/src/main/doc/antora.yml (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator => core/spring/src/main/doc/modules/spring}/_attributes.adoc (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator/images => core/spring/src/main/doc/modules/spring/attachments}/.gitkeep (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator => core/spring/src/main/doc/modules/spring}/examples/.gitkeep (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator/attachments => core/spring/src/main/doc/modules/spring/images}/.gitkeep (100%)
rename extensions/{other => core}/spring/src/main/doc/modules/spring/nav.adoc (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator/partials => core/spring/src/main/doc/modules/spring/pages}/_attributes.adoc (100%)
copy extensions/{other => core}/spring/src/main/doc/modules/spring/pages/about.adoc (100%)
rename extensions/{other/incubator/src/main/doc/modules/incubator/pages => core/spring/src/main/doc/modules/spring/partials}/_attributes.adoc (100%)
rename extensions/{other => core}/spring/src/main/doc/modules/spring/partials/module-nav.adoc (100%)
rename extensions/{other => core}/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java (100%)
rename extensions/{other => core}/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java (100%)
rename extensions/{other => core}/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java (100%)
rename extensions/{other => core}/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java (100%)
delete mode 100644 extensions/other/incubator/src/main/doc/antora.yml
delete mode 100644 extensions/other/incubator/src/main/doc/modules/incubator/nav.adoc
delete mode 100644 extensions/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
delete mode 100644 extensions/other/legacy/src/main/doc/antora.yml
delete mode 100644 extensions/other/legacy/src/main/doc/modules/legacy/nav.adoc
delete mode 100644 extensions/other/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
rename {extensions/other => incubator/core}/jsr303/README.adoc (100%)
rename {extensions/other => incubator/core}/jsr303/pom.xml (100%)
rename {extensions/other => incubator/core}/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java (100%)
rename {extensions/other => incubator/core}/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java (100%)
rename {extensions/other/incubator => incubator/core/model}/pom.xml (78%)
create mode 100644 incubator/core/model/src/main/doc/antora.yml
copy {starters/src/main/doc/modules/simpleapp => incubator/core/model/src/main/doc/modules/model}/_attributes.adoc (100%)
create mode 100644 incubator/core/model/src/main/doc/modules/model/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => incubator/core/model/src/main/doc/modules/model/pages}/_attributes.adoc (100%)
rename {extensions/other/incubator/src/main/doc/modules/incubator => incubator/core/model/src/main/doc/modules/model}/pages/about.adoc (90%)
copy {starters/src/main/doc/modules/simpleapp => incubator/core/model/src/main/doc/modules/model}/partials/_attributes.adoc (100%)
create mode 100644 incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
rename {extensions/other/incubator => incubator/core/model}/src/main/java/org/apache/isis/applib/annotation/Model.java (100%)
rename {extensions/other/incubator => incubator/core/model}/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java (100%)
rename {extensions/other/incubator => incubator/core/model}/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java (100%)
rename {extensions/other/incubator => incubator/core/model}/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java (100%)
create mode 100644 incubator/pom.xml
copy {extensions/other/legacy => legacy/core/applib}/.gitignore (100%)
copy {extensions/other/legacy => legacy/core/applib}/pom.xml (86%)
create mode 100644 legacy/core/applib/src/main/doc/antora.yml
copy {starters/src/main/doc/modules/simpleapp => legacy/core/applib/src/main/doc/modules/applib}/_attributes.adoc (100%)
create mode 100644 legacy/core/applib/src/main/doc/modules/applib/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => legacy/core/applib/src/main/doc/modules/applib/pages}/_attributes.adoc (100%)
rename {extensions/other/legacy/src/main/doc/modules/legacy => legacy/core/applib/src/main/doc/modules/applib}/pages/about.adoc (91%)
copy {starters/src/main/doc/modules/simpleapp => legacy/core/applib/src/main/doc/modules/applib}/partials/_attributes.adoc (100%)
create mode 100644 legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/DomainObjectContainer.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/filter/Filter.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/filter/Filters.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java (100%)
rename {extensions/other/legacy => legacy/core/applib}/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java (100%)
copy {extensions/other/legacy => legacy/core/commons}/.gitignore (100%)
copy {extensions/other/legacy => legacy/core/commons}/pom.xml (86%)
create mode 100644 legacy/core/commons/src/main/doc/antora.yml
copy {starters/src/main/doc/modules/simpleapp => legacy/core/commons/src/main/doc/modules/commons}/_attributes.adoc (100%)
create mode 100644 legacy/core/commons/src/main/doc/modules/commons/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => legacy/core/commons/src/main/doc/modules/commons/pages}/_attributes.adoc (100%)
copy {extensions/other/spring/src/main/doc/modules/spring => legacy/core/commons/src/main/doc/modules/commons}/pages/about.adoc (91%)
copy {starters/src/main/doc/modules/simpleapp => legacy/core/commons/src/main/doc/modules/commons}/partials/_attributes.adoc (100%)
create mode 100644 legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
rename {extensions/other/legacy => legacy/core/commons}/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java (100%)
rename {extensions/other/legacy => legacy/core/commons}/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java (100%)
rename {extensions/other/legacy => legacy/core/commons}/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java (100%)
rename {extensions/other/legacy => legacy/core/commons}/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java (100%)
rename {extensions/other/legacy => legacy/core/commons}/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/.gitignore (100%)
rename {extensions/other/legacy => legacy/core/runtime}/pom.xml (86%)
create mode 100644 legacy/core/runtime/src/main/doc/antora.yml
copy {starters/src/main/doc/modules/simpleapp => legacy/core/runtime/src/main/doc/modules/runtime}/_attributes.adoc (100%)
create mode 100644 legacy/core/runtime/src/main/doc/modules/runtime/nav.adoc
copy {starters/src/main/doc/modules/simpleapp/partials => legacy/core/runtime/src/main/doc/modules/runtime/pages}/_attributes.adoc (100%)
rename {extensions/other/spring/src/main/doc/modules/spring => legacy/core/runtime/src/main/doc/modules/runtime}/pages/about.adoc (91%)
copy {starters/src/main/doc/modules/simpleapp => legacy/core/runtime/src/main/doc/modules/runtime}/partials/_attributes.adoc (100%)
create mode 100644 legacy/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/viewer/package-info.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java (100%)
rename {extensions/other/legacy => legacy/core/runtime}/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java (100%)
create mode 100644 legacy/pom.xml
[isis] 03/06: ISIS-2206 renames incubator/other/incubator to
incubator/core/model
Posted by da...@apache.org.
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
commit 2525ddb11596ade1f52ee325c1e68608d3da0908
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:22:03 2019 +0000
ISIS-2206 renames incubator/other/incubator to incubator/core/model
also moves jsr303 (unused code)
---
core-parent/pom.xml | 13 +------------
incubator/{other => core}/jsr303/README.adoc | 0
incubator/{other => core}/jsr303/pom.xml | 0
.../examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../examples/facets/jsr303/Jsr303ProgModelFacets.java | 0
.../facets/jsr303/Jsr303PropertyValidationFacet.java | 0
.../metamodel/examples/facets/jsr303/CustomPattern.java | 0
.../examples/facets/jsr303/CustomPatternValidator.java | 0
.../metamodel/examples/facets/jsr303/CustomPatterns.java | 0
.../examples/facets/jsr303/DomainObjectVanilla.java | 0
.../facets/jsr303/DomainObjectWithBuiltInValidation.java | 0
.../facets/jsr303/DomainObjectWithCustomValidation.java | 0
.../examples/facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../facets/jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../facets/jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../facets/jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../facets/jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../examples/facets/jsr303/Jsr303FacetInstantiation.java | 0
.../facets/jsr303/Jsr303FacetValidatingInteraction.java | 0
incubator/{other/incubator => core/model}/pom.xml | 10 +++++-----
.../{other/incubator => core/model}/src/main/doc/antora.yml | 0
.../model}/src/main/doc/modules/incubator/_attributes.adoc | 0
.../src/main/doc/modules/incubator/attachments}/.gitkeep | 0
.../model}/src/main/doc/modules/incubator/examples/.gitkeep | 0
.../model/src/main/doc/modules/incubator/images}/.gitkeep | 0
.../model}/src/main/doc/modules/incubator/nav.adoc | 0
.../src/main/doc/modules/incubator/pages}/_attributes.adoc | 0
.../model}/src/main/doc/modules/incubator/pages/about.adoc | 0
.../main/doc/modules/incubator/partials}/_attributes.adoc | 0
.../src/main/doc/modules/incubator/partials/module-nav.adoc | 0
.../main/java/org/apache/isis/applib/annotation/Model.java | 0
.../isis/extensions/incubator/IncubatorMetaModelPlugin.java | 0
.../apache/isis/extensions/incubator/IsisBootIncubator.java | 0
.../support/SupportingMethodValidatorRefinerFactory.java | 0
incubator/pom.xml | 2 +-
35 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index df8696d..1c92b25 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -788,6 +788,7 @@ under the License.
<module>../core</module>
<module>../mavendeps</module>
<module>../extensions</module>
+ <module>../incubator</module>
<module>../starters</module>
</modules>
</profile>
@@ -816,18 +817,6 @@ under the License.
</modules>
</profile>
- <profile>
- <id>starter-apps-module</id>
- <activation>
- <property>
- <name>starter-apps-modules</name>
- </property>
- </activation>
- <modules>
- <module>../starters/helloworld</module>
- <module>../starters/simpleapp</module>
- </modules>
- </profile>
<!-- APACHE ISIS customisation 5/5: end -->
</profiles>
diff --git a/incubator/other/jsr303/README.adoc b/incubator/core/jsr303/README.adoc
similarity index 100%
rename from incubator/other/jsr303/README.adoc
rename to incubator/core/jsr303/README.adoc
diff --git a/incubator/other/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
similarity index 100%
rename from incubator/other/jsr303/pom.xml
rename to incubator/core/jsr303/pom.xml
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
diff --git a/incubator/other/incubator/pom.xml b/incubator/core/model/pom.xml
similarity index 82%
rename from incubator/other/incubator/pom.xml
rename to incubator/core/model/pom.xml
index 6bc1823..47827d1 100644
--- a/incubator/other/incubator/pom.xml
+++ b/incubator/core/model/pom.xml
@@ -21,15 +21,15 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-incubator-incubator</artifactId>
- <name>Apache Isis Inc - Incubator</name>
+ <artifactId>isis-incubator-model</artifactId>
+ <name>Apache Isis Inc - @Model</name>
<description>
- Provides experimental features.
+ Allows supporting methods to be annotated as @Model, to make explicit the bounds of the metamodel.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.incubator</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/incubator</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.incubator.model</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/incubator/model</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/incubator/other/incubator/src/main/doc/antora.yml b/incubator/core/model/src/main/doc/antora.yml
similarity index 100%
rename from incubator/other/incubator/src/main/doc/antora.yml
rename to incubator/core/model/src/main/doc/antora.yml
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc b/incubator/core/model/src/main/doc/modules/incubator/nav.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/nav.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc b/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java b/incubator/core/model/src/main/java/org/apache/isis/applib/annotation/Model.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
rename to incubator/core/model/src/main/java/org/apache/isis/applib/annotation/Model.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java b/incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
rename to incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java b/incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
rename to incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java b/incubator/core/model/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
rename to incubator/core/model/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 107f3bd..0d06593 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -69,7 +69,7 @@
</dependencyManagement>
<modules>
- <module>other/incubator</module>
+ <module>core/model</module>
</modules>
</project>
[isis] 02/06: ISIS-2205: fixes unit tests for wrapper factory moving
Posted by da...@apache.org.
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
commit e083dcd798dbc6f11cf9c25695a8b1fa6f802ea5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:16:05 2019 +0000
ISIS-2205: fixes unit tests for wrapper factory moving
---
.../services}/wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
similarity index 99%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index e76da08..d591c1a 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.wrapper;
+package org.apache.isis.runtime.services.wrapper;
import java.lang.reflect.Method;
import java.util.Collections;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
similarity index 99%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 6db4e51..975614b 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.wrapper;
+package org.apache.isis.runtime.services.wrapper;
import java.lang.reflect.Method;
import java.util.Arrays;
[isis] 06/06: ISIS-2206: fixes site.yml also
Posted by da...@apache.org.
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
commit 65b52a75ec4d8936b62d3de72cb55fded2616577
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 18:01:36 2019 +0000
ISIS-2206: fixes site.yml also
---
.../components/extensions/modules/ROOT/partials/component-nav.adoc | 6 ++++--
antora/components/legacy/antora.yml | 4 ++--
antora/components/legacy/modules/ROOT/partials/component-nav.adoc | 3 +++
antora/components/toc/modules/ROOT/pages/about.adoc | 4 +++-
antora/components/toc/modules/ROOT/partials/module-nav.adoc | 4 +++-
.../src/main/doc/modules/{commons => runtime}/_attributes.adoc | 0
.../core/runtime/src/main/doc/modules/{commons => runtime}/nav.adoc | 0
.../modules/{commons/partials => runtime/pages}/_attributes.adoc | 0
.../src/main/doc/modules/{commons => runtime}/pages/about.adoc | 0
.../modules/{commons/pages => runtime/partials}/_attributes.adoc | 0
.../main/doc/modules/{commons => runtime}/partials/module-nav.adoc | 0
11 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index ef6c2ec..03e6fe1 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,5 +1,7 @@
include::extensions:ROOT:partial$module-nav.adoc[]
include::extensions:spring:partial$module-nav.adoc[]
-include::extensions:incubator:partial$module-nav.adoc[]
-include::extensions:legacy:partial$module-nav.adoc[]
+//include::extensions:base:partial$module-nav.adoc[]
+//include::extensions:excel:partial$module-nav.adoc[]
+//include::extensions:fakedata:partial$module-nav.adoc[]
+//include::extensions:unittestsupport:partial$module-nav.adoc[]
diff --git a/antora/components/legacy/antora.yml b/antora/components/legacy/antora.yml
index 2cd7dc0..b75df3f 100644
--- a/antora/components/legacy/antora.yml
+++ b/antora/components/legacy/antora.yml
@@ -1,5 +1,5 @@
-name: incubator
-title: "Incubator Catalog"
+name: legacy
+title: "Legacy Catalog"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/legacy/modules/ROOT/partials/component-nav.adoc b/antora/components/legacy/modules/ROOT/partials/component-nav.adoc
index 004cf58..ac213e6 100644
--- a/antora/components/legacy/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/legacy/modules/ROOT/partials/component-nav.adoc
@@ -1,2 +1,5 @@
include::legacy:ROOT:partial$module-nav.adoc[]
+include::legacy:applib:partial$module-nav.adoc[]
+include::legacy:commons:partial$module-nav.adoc[]
+include::legacy:runtime:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 6249465..d7c29c7 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -55,9 +55,11 @@ include::_attributes.adoc[]
|
[discrete]
-== Extensions
+== Catalogs
* xref:extensions:ROOT:about.adoc[Extensions Catalog]
+* xref:incubator:ROOT:about.adoc[Incubator Catalog]
+* xref:legacy:ROOT:about.adoc[Legacy Catalog]
|
[discrete]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
index 82fe87c..4cc59a3 100644
--- a/antora/components/toc/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
@@ -31,9 +31,11 @@
** xref:odn:ROOT:about.adoc[DataNucleus Object Store]
-* Extensions
+* Catalogs
** xref:extensions:ROOT:about.adoc[Extensions Catalog]
+** xref:incubator:ROOT:about.adoc[Incubator Catalog]
+** xref:legacy:ROOT:about.adoc[Legacy Catalog]
* Support
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/_attributes.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/nav.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/nav.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/nav.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/nav.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/partials/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/partials/_attributes.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/pages/about.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/pages/about.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/pages/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/pages/_attributes.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/partials/module-nav.adoc b/legacy/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/commons/partials/module-nav.adoc
rename to legacy/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
[isis] 01/06: ISIS-2206: moves isis-extensions/incubator to
isis-incubator/incubator
Posted by da...@apache.org.
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
commit f3b2710bba120086e84507eebfef5b9906fc2492
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:13:16 2019 +0000
ISIS-2206: moves isis-extensions/incubator to isis-incubator/incubator
---
.../archdesign/attachments/pom-hierarchy.pptx | Bin 50617 -> 51849 bytes
extensions/pom.xml | 1 -
{extensions => incubator}/other/incubator/pom.xml | 8 +--
.../other/incubator/src/main/doc/antora.yml | 0
.../main/doc/modules/incubator/_attributes.adoc | 0
.../doc/modules/incubator/attachments}/.gitkeep | 0
.../main/doc/modules/incubator/examples/.gitkeep | 0
.../main/doc/modules/incubator/images}/.gitkeep | 0
.../src/main/doc/modules/incubator/nav.adoc | 0
.../doc/modules/incubator/pages}/_attributes.adoc | 0
.../main/doc/modules/incubator/pages/about.adoc | 0
.../modules/incubator/partials}/_attributes.adoc | 0
.../doc/modules/incubator/partials/module-nav.adoc | 0
.../org/apache/isis/applib/annotation/Model.java | 0
.../incubator/IncubatorMetaModelPlugin.java | 0
.../extensions/incubator/IsisBootIncubator.java | 0
.../SupportingMethodValidatorRefinerFactory.java | 0
{extensions => incubator}/other/jsr303/README.adoc | 0
{extensions => incubator}/other/jsr303/pom.xml | 0
.../examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../facets/jsr303/Jsr303ProgModelFacets.java | 0
.../jsr303/Jsr303PropertyValidationFacet.java | 0
.../examples/facets/jsr303/CustomPattern.java | 0
.../facets/jsr303/CustomPatternValidator.java | 0
.../examples/facets/jsr303/CustomPatterns.java | 0
.../facets/jsr303/DomainObjectVanilla.java | 0
.../jsr303/DomainObjectWithBuiltInValidation.java | 0
.../jsr303/DomainObjectWithCustomValidation.java | 0
.../facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../facets/jsr303/Jsr303FacetInstantiation.java | 0
.../jsr303/Jsr303FacetValidatingInteraction.java | 0
incubator/pom.xml | 77 +++++++++++++++++++++
36 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx b/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx
index 60ea7ae..0720727 100644
Binary files a/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx and b/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx differ
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 233dd03..b70e28e 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -185,7 +185,6 @@
</dependencyManagement>
<modules>
- <module>other/incubator</module>
<module>other/legacy</module>
<module>other/spring</module>
<module>security/secman</module>
diff --git a/extensions/other/incubator/pom.xml b/incubator/other/incubator/pom.xml
similarity index 91%
rename from extensions/other/incubator/pom.xml
rename to incubator/other/incubator/pom.xml
index cf1ac7d..6bc1823 100644
--- a/extensions/other/incubator/pom.xml
+++ b/incubator/other/incubator/pom.xml
@@ -15,14 +15,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-incubator</artifactId>
- <name>Apache Isis Ext - Incubator</name>
+ <artifactId>isis-incubator-incubator</artifactId>
+ <name>Apache Isis Inc - Incubator</name>
<description>
Provides experimental features.
</description>
diff --git a/extensions/other/incubator/src/main/doc/antora.yml b/incubator/other/incubator/src/main/doc/antora.yml
similarity index 100%
rename from extensions/other/incubator/src/main/doc/antora.yml
rename to incubator/other/incubator/src/main/doc/antora.yml
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/images/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/nav.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/nav.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/pages/about.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java b/incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java b/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java b/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java b/incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
diff --git a/extensions/other/jsr303/README.adoc b/incubator/other/jsr303/README.adoc
similarity index 100%
rename from extensions/other/jsr303/README.adoc
rename to incubator/other/jsr303/README.adoc
diff --git a/extensions/other/jsr303/pom.xml b/incubator/other/jsr303/pom.xml
similarity index 100%
rename from extensions/other/jsr303/pom.xml
rename to incubator/other/jsr303/pom.xml
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
diff --git a/incubator/pom.xml b/incubator/pom.xml
new file mode 100644
index 0000000..107f3bd
--- /dev/null
+++ b/incubator/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator</artifactId>
+
+ <name>Apache Isis Incubator</name>
+ <description>
+ Collection of Apache Isis extensions, currently incubating.
+ </description>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.incubator</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/incubator</git-plugin.propertiesDir>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator-incubator</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>other/incubator</module>
+ </modules>
+
+</project>
+
+
[isis] 04/06: ISIS-2206: adds doc placeholders for incubator
documentation
Posted by da...@apache.org.
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
commit c2c2724ca6d5d0065a3692066a83318f89301a68
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:28:42 2019 +0000
ISIS-2206: adds doc placeholders for incubator documentation
---
antora/components/incubator/antora.yml | 6 ++++++
.../components/incubator/modules/ROOT}/_attributes.adoc | 0
.../components/incubator/modules/ROOT/attachments}/.gitkeep | 0
.../components/incubator/modules/ROOT}/examples/.gitkeep | 0
.../components/incubator/modules/ROOT/images}/.gitkeep | 0
antora/components/incubator/modules/ROOT/nav.adoc | 1 +
.../components/incubator/modules/ROOT/pages}/_attributes.adoc | 0
.../components/incubator/modules/ROOT}/pages/about.adoc | 6 ++++--
.../components/incubator/modules/ROOT/partials}/_attributes.adoc | 0
.../incubator/modules/ROOT/partials/component-nav.adoc | 3 +++
.../components/incubator/modules/ROOT/partials/module-nav.adoc | 3 +++
incubator/core/model/src/main/doc/antora.yml | 2 +-
.../src/main/doc/modules/incubator/partials/module-nav.adoc | 4 ----
.../src/main/doc/modules/{incubator => model}/_attributes.adoc | 0
.../doc/modules/{incubator/images => model/attachments}/.gitkeep | 0
.../doc/modules/{incubator/images => model/examples}/.gitkeep | 0
.../src/main/doc/modules/{incubator => model}/images/.gitkeep | 0
.../model/src/main/doc/modules/{incubator => model}/nav.adoc | 0
.../modules/{incubator/partials => model/pages}/_attributes.adoc | 0
.../src/main/doc/modules/{incubator => model}/pages/about.adoc | 4 ++--
.../doc/modules/{incubator => model}/partials/_attributes.adoc | 0
.../model/src/main/doc/modules/model/partials/module-nav.adoc | 4 ++++
site.yml | 9 +++++++--
23 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/antora/components/incubator/antora.yml b/antora/components/incubator/antora.yml
new file mode 100644
index 0000000..2cd7dc0
--- /dev/null
+++ b/antora/components/incubator/antora.yml
@@ -0,0 +1,6 @@
+name: incubator
+title: "Incubator Catalog"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc b/antora/components/incubator/modules/ROOT/_attributes.adoc
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
copy to antora/components/incubator/modules/ROOT/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep b/antora/components/incubator/modules/ROOT/attachments/.gitkeep
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
copy to antora/components/incubator/modules/ROOT/attachments/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep b/antora/components/incubator/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep
rename to antora/components/incubator/modules/ROOT/examples/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep b/antora/components/incubator/modules/ROOT/images/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep
rename to antora/components/incubator/modules/ROOT/images/.gitkeep
diff --git a/antora/components/incubator/modules/ROOT/nav.adoc b/antora/components/incubator/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..a946dfb
--- /dev/null
+++ b/antora/components/incubator/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc b/antora/components/incubator/modules/ROOT/pages/_attributes.adoc
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
copy to antora/components/incubator/modules/ROOT/pages/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc b/antora/components/incubator/modules/ROOT/pages/about.adoc
similarity index 70%
copy from incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
copy to antora/components/incubator/modules/ROOT/pages/about.adoc
index eee63bd..a434b9d 100644
--- a/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
+++ b/antora/components/incubator/modules/ROOT/pages/about.adoc
@@ -1,6 +1,8 @@
-= Incubator
+= Incubator Catalog
:Notice: 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 ag [...]
include::_attributes.adoc[]
+:page-partial:
-TODO: v2: placeholder for documentation about extensions/incubator
+This catalog lists a number of extensions to the framework.
+There are also a small number of extensions documented elsewhere in other guides (in the xref:testing:ROOT:about.adoc[testing] guide, xref:security:ROOT:about.adoc[security] guide, and the xref:vw:ROOT:about.adoc[wicket viewer] guide).
diff --git a/incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc b/antora/components/incubator/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to antora/components/incubator/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/incubator/modules/ROOT/partials/component-nav.adoc b/antora/components/incubator/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..3ce7950
--- /dev/null
+++ b/antora/components/incubator/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,3 @@
+include::incubator:ROOT:partial$module-nav.adoc[]
+include::incubator:model:partial$module-nav.adoc[]
+
diff --git a/antora/components/incubator/modules/ROOT/partials/module-nav.adoc b/antora/components/incubator/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/antora/components/incubator/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+
+
diff --git a/incubator/core/model/src/main/doc/antora.yml b/incubator/core/model/src/main/doc/antora.yml
index eeeeb1e..74244f9 100644
--- a/incubator/core/model/src/main/doc/antora.yml
+++ b/incubator/core/model/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: incubator
version: master
diff --git a/incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
deleted file mode 100644
index 9781e39..0000000
--- a/incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-* xref:extensions:incubator:about.adoc[Incubator]
-
-
-
diff --git a/incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc b/incubator/core/model/src/main/doc/modules/model/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/model/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep b/incubator/core/model/src/main/doc/modules/model/attachments/.gitkeep
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
copy to incubator/core/model/src/main/doc/modules/model/attachments/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep b/incubator/core/model/src/main/doc/modules/model/examples/.gitkeep
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
copy to incubator/core/model/src/main/doc/modules/model/examples/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep b/incubator/core/model/src/main/doc/modules/model/images/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
rename to incubator/core/model/src/main/doc/modules/model/images/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/incubator/nav.adoc b/incubator/core/model/src/main/doc/modules/model/nav.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/nav.adoc
rename to incubator/core/model/src/main/doc/modules/model/nav.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/core/model/src/main/doc/modules/model/pages/_attributes.adoc
similarity index 100%
copy from incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
copy to incubator/core/model/src/main/doc/modules/model/pages/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc b/incubator/core/model/src/main/doc/modules/model/pages/about.adoc
similarity index 90%
rename from incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
rename to incubator/core/model/src/main/doc/modules/model/pages/about.adoc
index eee63bd..b39fbad 100644
--- a/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
+++ b/incubator/core/model/src/main/doc/modules/model/pages/about.adoc
@@ -1,6 +1,6 @@
-= Incubator
+= @Model Support
:Notice: 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 ag [...]
include::_attributes.adoc[]
-TODO: v2: placeholder for documentation about extensions/incubator
+TODO: v2: placeholder for documentation about incubator/model
diff --git a/incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/core/model/src/main/doc/modules/model/partials/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/model/partials/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
new file mode 100644
index 0000000..26d195f
--- /dev/null
+++ b/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:incubator:model:about.adoc[@Model]
+
+
+
diff --git a/site.yml b/site.yml
index 26ff951..26a436a 100644
--- a/site.yml
+++ b/site.yml
@@ -14,6 +14,9 @@ content:
start_path: antora/components/extensions # extensions
branches: HEAD
- url: .
+ start_path: antora/components/incubator # incubator
+ branches: HEAD
+ - url: .
start_path: antora/components/refguide # refguide
branches: HEAD
- url: .
@@ -107,10 +110,12 @@ content:
start_path: starters/src/main/doc
branches: HEAD
-# extensions
+# incubator
- url: .
- start_path: extensions/other/incubator/src/main/doc # other
+ start_path: incubator/core/model/src/main/doc # other
branches: HEAD
+
+# extensions
- url: .
start_path: extensions/other/legacy/src/main/doc # other
branches: HEAD
[isis] 05/06: ISIS-2206: moves extensions/legacy to legacy/applib,
legacy/core and legacy/runtime
Posted by da...@apache.org.
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
commit a8d1e547d783b04f1905db5b03aed21a762d0da7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:51:55 2019 +0000
ISIS-2206: moves extensions/legacy to legacy/applib, legacy/core and legacy/runtime
---
.../incubator/modules/ROOT/pages/about.adoc | 3 +--
antora/components/legacy/antora.yml | 6 +++++
.../legacy/modules/ROOT}/_attributes.adoc | 0
.../legacy/modules/ROOT/attachments}/.gitkeep | 0
.../legacy/modules/ROOT}/examples/.gitkeep | 0
.../legacy/modules/ROOT/images}/.gitkeep | 0
antora/components/legacy/modules/ROOT/nav.adoc | 1 +
.../legacy/modules/ROOT/pages}/_attributes.adoc | 0
.../legacy/modules/ROOT}/pages/about.adoc | 5 ++--
.../legacy/modules/ROOT/partials}/_attributes.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 2 ++
.../legacy/modules/ROOT/partials/module-nav.adoc | 3 +++
antora/playbooks/site-other.yml | 27 ++++++++++++++++---
core-parent/pom.xml | 1 +
extensions/{other => core}/spring/pom.xml | 0
.../{other => core}/spring/src/main/doc/antora.yml | 0
.../src/main/doc/modules/spring}/_attributes.adoc | 0
.../main/doc/modules/spring/attachments}/.gitkeep | 0
.../src/main/doc/modules/spring/examples/.gitkeep | 0
.../src/main/doc/modules/spring/images}/.gitkeep | 0
.../spring/src/main/doc/modules/spring/nav.adoc | 0
.../doc/modules/spring/pages}/_attributes.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../doc/modules/spring/partials}/_attributes.adoc | 0
.../doc/modules/spring/partials/module-nav.adoc | 0
.../isis/extensions/spring/ExtSpringModule.java | 0
.../extensions/spring/service/BeanDescriptor.java | 0
.../extensions/spring/service/ContextBeans.java | 0
.../spring/service/SpringBeansService.java | 0
extensions/other/legacy/src/main/doc/antora.yml | 2 --
.../main/doc/modules/legacy/attachments/.gitkeep | 0
.../src/main/doc/modules/legacy/examples/.gitkeep | 0
.../src/main/doc/modules/legacy/images/.gitkeep | 0
.../legacy/src/main/doc/modules/legacy/nav.adoc | 1 -
.../doc/modules/legacy/partials/module-nav.adoc | 4 ---
extensions/pom.xml | 3 +--
.../core/model/src/main/doc/modules/model/nav.adoc | 2 +-
incubator/pom.xml | 2 +-
.../other/legacy => legacy/core/applib}/.gitignore | 0
.../other/legacy => legacy/core/applib}/pom.xml | 12 ++++-----
legacy/core/applib/src/main/doc/antora.yml | 2 ++
.../src/main/doc/modules/applib}/_attributes.adoc | 0
.../applib/src/main/doc/modules/applib/nav.adoc | 1 +
.../doc/modules/applib/pages}/_attributes.adoc | 0
.../src/main/doc/modules/applib}/pages/about.adoc | 4 +--
.../doc/modules/applib}/partials/_attributes.adoc | 0
.../doc/modules/applib/partials/module-nav.adoc | 4 +++
.../apache/isis/applib/DomainObjectContainer.java | 0
.../java/org/apache/isis/applib/filter/Filter.java | 0
.../org/apache/isis/applib/filter/Filters.java | 0
.../background/BackgroundCommandService2.java | 0
.../services/background/BackgroundService.java | 0
.../services/background/BackgroundService2.java | 0
.../services/eventbus/ActionDomainEvent.java | 0
.../services/eventbus/CollectionDomainEvent.java | 0
.../services/eventbus/PropertyDomainEvent.java | 0
.../legacy => legacy/core/commons}/.gitignore | 0
.../other/legacy => legacy/core/commons}/pom.xml | 12 ++++-----
legacy/core/commons/src/main/doc/antora.yml | 2 ++
.../src/main/doc/modules/commons}/_attributes.adoc | 0
.../commons/src/main/doc/modules/commons/nav.adoc | 1 +
.../doc/modules/commons/pages}/_attributes.adoc | 0
.../src/main/doc/modules/commons}/pages/about.adoc | 4 +--
.../doc/modules/commons}/partials/_attributes.adoc | 0
.../doc/modules/commons/partials/module-nav.adoc | 4 +++
.../FutureWithIndexIntoFutureOfList.java | 0
.../threadpool/ThreadPoolExecutionMode.java | 0
.../internal/threadpool/ThreadPoolSizeAdvisor.java | 0
.../internal/threadpool/ThreadPoolSupport.java | 0
.../internal/threadpool/ThreadPoolSupportTest.java | 0
.../legacy => legacy/core/runtime}/.gitignore | 0
.../other/legacy => legacy/core/runtime}/pom.xml | 12 ++++-----
legacy/core/runtime/src/main/doc/antora.yml | 2 ++
.../src/main/doc/modules/commons}/_attributes.adoc | 0
.../runtime/src/main/doc/modules/commons/nav.adoc | 1 +
.../doc/modules/commons/pages}/_attributes.adoc | 0
.../src/main/doc/modules/commons}/pages/about.adoc | 4 +--
.../doc/modules/commons}/partials/_attributes.adoc | 0
.../doc/modules/commons/partials/module-nav.adoc | 4 +++
.../isis/core/runtime/snapshot/DomSerializer.java | 0
.../core/runtime/snapshot/DomSerializerJaxp.java | 0
.../isis/core/runtime/sysout/SystemPrinter.java | 0
.../system/persistence/LoggingLocation.java | 0
.../runtime/system/persistence/ObjectFactory.java | 0
.../system/persistence/SuspendableListener.java | 0
.../apache/isis/runtime/viewer/package-info.java | 0
.../viewer/web/AbstractServletOrFilterMapping.java | 0
.../runtime/viewer/web/FilterSpecification.java | 0
.../runtime/viewer/web/ServletSpecification.java | 0
.../runtime/viewer/web/WebAppSpecification.java | 0
{incubator => legacy}/pom.xml | 30 +++++++++++++++-------
site.yml | 21 +++++++++++----
92 files changed, 125 insertions(+), 57 deletions(-)
diff --git a/antora/components/incubator/modules/ROOT/pages/about.adoc b/antora/components/incubator/modules/ROOT/pages/about.adoc
index a434b9d..102e87c 100644
--- a/antora/components/incubator/modules/ROOT/pages/about.adoc
+++ b/antora/components/incubator/modules/ROOT/pages/about.adoc
@@ -3,6 +3,5 @@
include::_attributes.adoc[]
:page-partial:
-This catalog lists a number of extensions to the framework.
+TODO
-There are also a small number of extensions documented elsewhere in other guides (in the xref:testing:ROOT:about.adoc[testing] guide, xref:security:ROOT:about.adoc[security] guide, and the xref:vw:ROOT:about.adoc[wicket viewer] guide).
diff --git a/antora/components/legacy/antora.yml b/antora/components/legacy/antora.yml
new file mode 100644
index 0000000..2cd7dc0
--- /dev/null
+++ b/antora/components/legacy/antora.yml
@@ -0,0 +1,6 @@
+name: incubator
+title: "Incubator Catalog"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc b/antora/components/legacy/modules/ROOT/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc
copy to antora/components/legacy/modules/ROOT/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/images/.gitkeep b/antora/components/legacy/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/images/.gitkeep
rename to antora/components/legacy/modules/ROOT/attachments/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/model/examples/.gitkeep b/antora/components/legacy/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/examples/.gitkeep
rename to antora/components/legacy/modules/ROOT/examples/.gitkeep
diff --git a/incubator/core/model/src/main/doc/modules/model/attachments/.gitkeep b/antora/components/legacy/modules/ROOT/images/.gitkeep
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/attachments/.gitkeep
rename to antora/components/legacy/modules/ROOT/images/.gitkeep
diff --git a/antora/components/legacy/modules/ROOT/nav.adoc b/antora/components/legacy/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..a946dfb
--- /dev/null
+++ b/antora/components/legacy/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/antora/components/legacy/modules/ROOT/pages/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to antora/components/legacy/modules/ROOT/pages/_attributes.adoc
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc b/antora/components/legacy/modules/ROOT/pages/about.adoc
similarity index 82%
copy from extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
copy to antora/components/legacy/modules/ROOT/pages/about.adoc
index d824439..f2106cf 100644
--- a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
+++ b/antora/components/legacy/modules/ROOT/pages/about.adoc
@@ -1,6 +1,7 @@
-= Legacy
+= Legacy Catalog
:Notice: 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 ag [...]
include::_attributes.adoc[]
+:page-partial:
-TODO: v2: placeholder for documentation about extensions/incubator
+This catalog contains deprecated functionality that has been extracted from the core framework, prior to it being removed permanently.
diff --git a/extensions/other/spring/src/main/doc/modules/spring/pages/_attributes.adoc b/antora/components/legacy/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/pages/_attributes.adoc
rename to antora/components/legacy/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/legacy/modules/ROOT/partials/component-nav.adoc b/antora/components/legacy/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..004cf58
--- /dev/null
+++ b/antora/components/legacy/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,2 @@
+include::legacy:ROOT:partial$module-nav.adoc[]
+
diff --git a/antora/components/legacy/modules/ROOT/partials/module-nav.adoc b/antora/components/legacy/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/antora/components/legacy/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+
+
diff --git a/antora/playbooks/site-other.yml b/antora/playbooks/site-other.yml
index c9a4a92..9e11933 100644
--- a/antora/playbooks/site-other.yml
+++ b/antora/playbooks/site-other.yml
@@ -8,18 +8,37 @@ content:
# antora
- url: .
+ start_path: antora/components/extensions # other
+ branches: HEAD
+ - url: .
+ start_path: antora/components/incubator # other
+ branches: HEAD
+ - url: .
+ start_path: antora/components/legacy # other
+ branches: HEAD
+ - url: .
start_path: antora/components/toc
branches: HEAD
-# extensions
+# incubator
- url: .
- start_path: extensions/other/incubator/src/main/doc # other
+ start_path: incubator/core/model/src/main/doc # other
+ branches: HEAD
+
+# legacy
+ - url: .
+ start_path: legacy/core/applib/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/other/legacy/src/main/doc # other
+ start_path: legacy/core/commons/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/other/spring/src/main/doc # other
+ start_path: legacy/core/runtime/src/main/doc # other
+ branches: HEAD
+
+# extensions
+ - url: .
+ start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index 1c92b25..12bd9ad 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -789,6 +789,7 @@ under the License.
<module>../mavendeps</module>
<module>../extensions</module>
<module>../incubator</module>
+ <module>../legacy</module>
<module>../starters</module>
</modules>
</profile>
diff --git a/extensions/other/spring/pom.xml b/extensions/core/spring/pom.xml
similarity index 100%
rename from extensions/other/spring/pom.xml
rename to extensions/core/spring/pom.xml
diff --git a/extensions/other/spring/src/main/doc/antora.yml b/extensions/core/spring/src/main/doc/antora.yml
similarity index 100%
rename from extensions/other/spring/src/main/doc/antora.yml
rename to extensions/core/spring/src/main/doc/antora.yml
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc
similarity index 100%
rename from extensions/other/legacy/src/main/doc/modules/legacy/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc
diff --git a/extensions/other/spring/src/main/doc/modules/spring/images/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/attachments/.gitkeep
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/images/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/attachments/.gitkeep
diff --git a/extensions/other/spring/src/main/doc/modules/spring/examples/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/examples/.gitkeep
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/examples/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/examples/.gitkeep
diff --git a/extensions/other/spring/src/main/doc/modules/spring/attachments/.gitkeep b/extensions/core/spring/src/main/doc/modules/spring/images/.gitkeep
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/attachments/.gitkeep
rename to extensions/core/spring/src/main/doc/modules/spring/images/.gitkeep
diff --git a/extensions/other/spring/src/main/doc/modules/spring/nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/nav.adoc
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/nav.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/nav.adoc
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc
similarity index 100%
rename from extensions/other/legacy/src/main/doc/modules/legacy/partials/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc
diff --git a/extensions/other/spring/src/main/doc/modules/spring/pages/about.adoc b/extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/pages/about.adoc
copy to extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc b/extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc
similarity index 100%
rename from extensions/other/legacy/src/main/doc/modules/legacy/pages/_attributes.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/partials/module-nav.adoc
rename to extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
diff --git a/extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
similarity index 100%
rename from extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/ExtSpringModule.java
diff --git a/extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
similarity index 100%
rename from extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
diff --git a/extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
similarity index 100%
rename from extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
diff --git a/extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
similarity index 100%
rename from extensions/other/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
rename to extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
diff --git a/extensions/other/legacy/src/main/doc/antora.yml b/extensions/other/legacy/src/main/doc/antora.yml
deleted file mode 100644
index eeeeb1e..0000000
--- a/extensions/other/legacy/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: extensions
-version: master
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/attachments/.gitkeep b/extensions/other/legacy/src/main/doc/modules/legacy/attachments/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/examples/.gitkeep b/extensions/other/legacy/src/main/doc/modules/legacy/examples/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/images/.gitkeep b/extensions/other/legacy/src/main/doc/modules/legacy/images/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/nav.adoc b/extensions/other/legacy/src/main/doc/modules/legacy/nav.adoc
deleted file mode 100644
index 28945c3..0000000
--- a/extensions/other/legacy/src/main/doc/modules/legacy/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::extensions:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc b/extensions/other/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
deleted file mode 100644
index f9bf1d2..0000000
--- a/extensions/other/legacy/src/main/doc/modules/legacy/partials/module-nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-* xref:extensions:legacy:about.adoc[Legacy]
-
-
-
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b70e28e..472e801 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -185,8 +185,7 @@
</dependencyManagement>
<modules>
- <module>other/legacy</module>
- <module>other/spring</module>
+ <module>core/spring</module>
<module>security/secman</module>
<module>testing/fixtures</module>
<module>testing/specsupport</module>
diff --git a/incubator/core/model/src/main/doc/modules/model/nav.adoc b/incubator/core/model/src/main/doc/modules/model/nav.adoc
index 28945c3..a946dfb 100644
--- a/incubator/core/model/src/main/doc/modules/model/nav.adoc
+++ b/incubator/core/model/src/main/doc/modules/model/nav.adoc
@@ -1 +1 @@
-include::extensions:ROOT:partial$component-nav.adoc[]
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 0d06593..2cb825a 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-incubator</artifactId>
+ <artifactId>isis-incubator-model</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/extensions/other/legacy/.gitignore b/legacy/core/applib/.gitignore
similarity index 100%
copy from extensions/other/legacy/.gitignore
copy to legacy/core/applib/.gitignore
diff --git a/extensions/other/legacy/pom.xml b/legacy/core/applib/pom.xml
similarity index 86%
copy from extensions/other/legacy/pom.xml
copy to legacy/core/applib/pom.xml
index abb0d2e..f1b1dad 100644
--- a/extensions/other/legacy/pom.xml
+++ b/legacy/core/applib/pom.xml
@@ -15,21 +15,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-legacy</artifactId>
- <name>Apache Isis Ext - Legacy</name>
+ <artifactId>isis-legacy-applib</artifactId>
+ <name>Apache Isis Legacy - Applib</name>
<description>
To ease migration from Apache Isis versions 1.16+ to 2.0.0.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.legacy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/legacy</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.legacy.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/legacy/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/legacy/core/applib/src/main/doc/antora.yml b/legacy/core/applib/src/main/doc/antora.yml
new file mode 100644
index 0000000..0a5830f
--- /dev/null
+++ b/legacy/core/applib/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: legacy
+version: master
diff --git a/extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc b/legacy/core/applib/src/main/doc/modules/applib/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc
copy to legacy/core/applib/src/main/doc/modules/applib/_attributes.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/nav.adoc b/legacy/core/applib/src/main/doc/modules/applib/nav.adoc
new file mode 100644
index 0000000..42fa9f2
--- /dev/null
+++ b/legacy/core/applib/src/main/doc/modules/applib/nav.adoc
@@ -0,0 +1 @@
+include::legacy:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to legacy/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc b/legacy/core/applib/src/main/doc/modules/applib/pages/about.adoc
similarity index 91%
copy from extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
copy to legacy/core/applib/src/main/doc/modules/applib/pages/about.adoc
index d824439..14802e4 100644
--- a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
+++ b/legacy/core/applib/src/main/doc/modules/applib/pages/about.adoc
@@ -1,6 +1,6 @@
-= Legacy
+= Applib (Legacy)
:Notice: 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 ag [...]
include::_attributes.adoc[]
-TODO: v2: placeholder for documentation about extensions/incubator
+TODO: v2: placeholder for documentation about legacy/applib
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to legacy/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc b/legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
new file mode 100644
index 0000000..99c1753
--- /dev/null
+++ b/legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:legacy:applib:about.adoc[Applib]
+
+
+
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/filter/Filter.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/filter/Filters.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java b/legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
rename to legacy/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
diff --git a/extensions/other/legacy/.gitignore b/legacy/core/commons/.gitignore
similarity index 100%
copy from extensions/other/legacy/.gitignore
copy to legacy/core/commons/.gitignore
diff --git a/extensions/other/legacy/pom.xml b/legacy/core/commons/pom.xml
similarity index 86%
copy from extensions/other/legacy/pom.xml
copy to legacy/core/commons/pom.xml
index abb0d2e..5b62a10 100644
--- a/extensions/other/legacy/pom.xml
+++ b/legacy/core/commons/pom.xml
@@ -15,21 +15,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-legacy</artifactId>
- <name>Apache Isis Ext - Legacy</name>
+ <artifactId>isis-legacy-commons</artifactId>
+ <name>Apache Isis Legacy - Commons</name>
<description>
To ease migration from Apache Isis versions 1.16+ to 2.0.0.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.legacy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/legacy</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.legacy.commons</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/legacy/commons</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/legacy/core/commons/src/main/doc/antora.yml b/legacy/core/commons/src/main/doc/antora.yml
new file mode 100644
index 0000000..0a5830f
--- /dev/null
+++ b/legacy/core/commons/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: legacy
+version: master
diff --git a/extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc b/legacy/core/commons/src/main/doc/modules/commons/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc
copy to legacy/core/commons/src/main/doc/modules/commons/_attributes.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/nav.adoc b/legacy/core/commons/src/main/doc/modules/commons/nav.adoc
new file mode 100644
index 0000000..42fa9f2
--- /dev/null
+++ b/legacy/core/commons/src/main/doc/modules/commons/nav.adoc
@@ -0,0 +1 @@
+include::legacy:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to legacy/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc
diff --git a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc b/legacy/core/commons/src/main/doc/modules/commons/pages/about.adoc
similarity index 91%
rename from extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
rename to legacy/core/commons/src/main/doc/modules/commons/pages/about.adoc
index d824439..b706dd2 100644
--- a/extensions/other/legacy/src/main/doc/modules/legacy/pages/about.adoc
+++ b/legacy/core/commons/src/main/doc/modules/commons/pages/about.adoc
@@ -1,6 +1,6 @@
-= Legacy
+= Commons
:Notice: 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 ag [...]
include::_attributes.adoc[]
-TODO: v2: placeholder for documentation about extensions/incubator
+TODO: v2: placeholder for documentation about legacy/commons
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to legacy/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc b/legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
new file mode 100644
index 0000000..2cc4bbe
--- /dev/null
+++ b/legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:legacy:commons:about.adoc[Commons]
+
+
+
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java b/legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
rename to legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java b/legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
rename to legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolExecutionMode.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java b/legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
rename to legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
rename to legacy/core/commons/src/main/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupport.java
diff --git a/extensions/other/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java b/legacy/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
similarity index 100%
rename from extensions/other/legacy/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
rename to legacy/core/commons/src/test/java/org/apache/isis/commons/internal/threadpool/ThreadPoolSupportTest.java
diff --git a/extensions/other/legacy/.gitignore b/legacy/core/runtime/.gitignore
similarity index 100%
rename from extensions/other/legacy/.gitignore
rename to legacy/core/runtime/.gitignore
diff --git a/extensions/other/legacy/pom.xml b/legacy/core/runtime/pom.xml
similarity index 86%
rename from extensions/other/legacy/pom.xml
rename to legacy/core/runtime/pom.xml
index abb0d2e..3344fb0 100644
--- a/extensions/other/legacy/pom.xml
+++ b/legacy/core/runtime/pom.xml
@@ -15,21 +15,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-legacy</artifactId>
- <name>Apache Isis Ext - Legacy</name>
+ <artifactId>isis-legacy-runtime</artifactId>
+ <name>Apache Isis Legacy - Runtime</name>
<description>
To ease migration from Apache Isis versions 1.16+ to 2.0.0.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.legacy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/legacy</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.legacy.runtime</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/legacy/runtime</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/legacy/core/runtime/src/main/doc/antora.yml b/legacy/core/runtime/src/main/doc/antora.yml
new file mode 100644
index 0000000..0a5830f
--- /dev/null
+++ b/legacy/core/runtime/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: legacy
+version: master
diff --git a/extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/commons/_attributes.adoc
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/_attributes.adoc
rename to legacy/core/runtime/src/main/doc/modules/commons/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/nav.adoc b/legacy/core/runtime/src/main/doc/modules/commons/nav.adoc
new file mode 100644
index 0000000..42fa9f2
--- /dev/null
+++ b/legacy/core/runtime/src/main/doc/modules/commons/nav.adoc
@@ -0,0 +1 @@
+include::legacy:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/commons/pages/_attributes.adoc
similarity index 100%
copy from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
copy to legacy/core/runtime/src/main/doc/modules/commons/pages/_attributes.adoc
diff --git a/extensions/other/spring/src/main/doc/modules/spring/pages/about.adoc b/legacy/core/runtime/src/main/doc/modules/commons/pages/about.adoc
similarity index 91%
rename from extensions/other/spring/src/main/doc/modules/spring/pages/about.adoc
rename to legacy/core/runtime/src/main/doc/modules/commons/pages/about.adoc
index f035090..9e234e8 100644
--- a/extensions/other/spring/src/main/doc/modules/spring/pages/about.adoc
+++ b/legacy/core/runtime/src/main/doc/modules/commons/pages/about.adoc
@@ -1,6 +1,6 @@
-= Spring
+= Runtime
:Notice: 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 ag [...]
include::_attributes.adoc[]
-TODO
+TODO: v2: placeholder for documentation about legacy/commons
diff --git a/extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/legacy/core/runtime/src/main/doc/modules/commons/partials/_attributes.adoc
similarity index 100%
rename from extensions/other/spring/src/main/doc/modules/spring/partials/_attributes.adoc
rename to legacy/core/runtime/src/main/doc/modules/commons/partials/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/commons/partials/module-nav.adoc b/legacy/core/runtime/src/main/doc/modules/commons/partials/module-nav.adoc
new file mode 100644
index 0000000..7b27889
--- /dev/null
+++ b/legacy/core/runtime/src/main/doc/modules/commons/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:legacy:runtime:about.adoc[Runtime]
+
+
+
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java b/legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java b/legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java b/legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/LoggingLocation.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/ObjectFactory.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/SuspendableListener.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/package-info.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/package-info.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
diff --git a/extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java b/legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
similarity index 100%
rename from extensions/other/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
rename to legacy/core/runtime/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
diff --git a/incubator/pom.xml b/legacy/pom.xml
similarity index 69%
copy from incubator/pom.xml
copy to legacy/pom.xml
index 0d06593..13cb20e 100644
--- a/incubator/pom.xml
+++ b/legacy/pom.xml
@@ -21,19 +21,19 @@
<relativePath>../core/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator</artifactId>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy</artifactId>
- <name>Apache Isis Incubator</name>
+ <name>Apache Isis Legacy</name>
<description>
- Collection of Apache Isis extensions, currently incubating.
+ Collection of deprecated Apache Isis functionality, for removal.
</description>
<packaging>pom</packaging>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.incubator</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/incubator</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.legacy</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/legacy</git-plugin.propertiesDir>
</properties>
<build>
@@ -61,15 +61,27 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-incubator</artifactId>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy-commons</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.legacy</groupId>
+ <artifactId>isis-legacy-runtime</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
- <module>core/model</module>
+ <module>core/applib</module>
+ <module>core/commons</module>
+ <module>core/runtime</module>
</modules>
</project>
diff --git a/site.yml b/site.yml
index 26a436a..a20a5df 100644
--- a/site.yml
+++ b/site.yml
@@ -11,10 +11,13 @@ content:
start_path: antora/components/core # core
branches: HEAD
- url: .
- start_path: antora/components/extensions # extensions
+ start_path: antora/components/extensions # other
branches: HEAD
- url: .
- start_path: antora/components/incubator # incubator
+ start_path: antora/components/incubator # other
+ branches: HEAD
+ - url: .
+ start_path: antora/components/legacy # other
branches: HEAD
- url: .
start_path: antora/components/refguide # refguide
@@ -115,12 +118,20 @@ content:
start_path: incubator/core/model/src/main/doc # other
branches: HEAD
-# extensions
+# legacy
+ - url: .
+ start_path: legacy/core/applib/src/main/doc # other
+ branches: HEAD
- url: .
- start_path: extensions/other/legacy/src/main/doc # other
+ start_path: legacy/core/commons/src/main/doc # other
branches: HEAD
- url: .
- start_path: extensions/other/spring/src/main/doc # other
+ start_path: legacy/core/runtime/src/main/doc # other
+ branches: HEAD
+
+# extensions
+ - url: .
+ start_path: extensions/core/spring/src/main/doc # other
branches: HEAD
- url: .
start_path: extensions/security/secman/src/main/doc # security secman