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:16 UTC
[isis] 05/06: ISIS-2206: moves extensions/legacy to legacy/applib,
legacy/core and legacy/runtime
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