You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/05/20 06:23:44 UTC
[isis] branch master updated: ISIS-2367: Promote @Model support
from 'incubator' to 'extension'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 760ba84 ISIS-2367: Promote @Model support from 'incubator' to 'extension'
760ba84 is described below
commit 760ba84507229d50b234b84536c1a33ada5cc856
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 20 08:23:33 2020 +0200
ISIS-2367: Promote @Model support from 'incubator' to 'extension'
renaming artifact -> isis-extensions-modelannotation
renaming packages -> org.apache.isis.extensions.modelannotation
---
examples/demo/pom.xml | 10 ++--
.../DependentArgsActionDemo_bulkAction.java | 2 +-
.../DependentArgsActionDemo_useAutoComplete.java | 2 +-
.../DependentArgsActionDemo_useChoices.java | 2 +-
.../DependentArgsActionDemo_useDefault.java | 2 +-
.../DependentArgsActionDemo_useDisable.java | 2 +-
.../depargs/DependentArgsActionDemo_useHide.java | 2 +-
.../DependentArgsActionDemo_useIndependent.java | 2 +-
.../main/java/demoapp/dom/tooltip/TooltipDemo.java | 2 +-
.../java/demoapp/dom/types/time/TemporalDemo.java | 2 +-
.../main/java/demoapp/webapp/DemoAppManifest.java | 5 +-
examples/demo/vaadin/pom.xml | 2 +-
examples/demo/wicket/pom.xml | 62 ----------------------
examples/smoketests/pom.xml | 10 ++--
.../testdomain/conf/Configuration_headless.java | 9 +---
.../Configuration_usingActionSemantics.java | 4 +-
.../bad/Configuration_usingInvalidDomain.java | 4 +-
.../model/bad/InvalidOrphanedActionSupport.java | 2 +-
.../bad/InvalidOrphanedCollectionSupport.java | 2 +-
.../model/bad/InvalidOrphanedPropertySupport.java | 2 +-
.../model/good/Configuration_usingValidDomain.java | 4 +-
.../testdomain/model/good/ProperMemberSupport.java | 2 +-
.../model/good/ProperMemberSupport_action.java | 2 +-
.../model/good/ProperMemberSupport_action2.java | 2 +-
.../model/good/ProperMemberSupport_collection.java | 2 +-
.../good/ProperMemberSupport_collection2.java | 2 +-
.../model/good/ProperMemberSupport_property.java | 2 +-
.../model/good/ProperMemberSupport_property2.java | 2 +-
.../model/good/ProperParameterSupport.java | 2 +-
.../model/good/ProperPrefixedMember.java | 2 +-
.../model/layout/Configuration_usingLayout.java | 4 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 1 +
.../core/model-annotation}/pom.xml | 14 ++---
.../model-annotation}/src/main/adoc/antora.yml | 0
.../src/main/adoc/modules/model/nav.adoc | 0
.../src/main/adoc/modules/model/pages/about.adoc | 0
.../adoc/modules/model/partials/module-nav.adoc | 0
.../applib/IsisModuleIncModelApplib.java | 2 +-
.../modelannotation}/applib/annotation/Model.java | 2 +-
.../metamodel/IsisModuleExtModelAnnotation.java | 8 +--
.../SupportingMethodValidatorRefinerFactory.java | 4 +-
.../services/IncubatorMetaModelPlugin.java | 4 +-
extensions/pom.xml | 7 +++
.../adoc/modules/ROOT/partials/component-nav.adoc | 1 -
incubator/pom.xml | 7 ---
45 files changed, 67 insertions(+), 139 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index f76c387..1f20669 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -76,17 +76,15 @@
<artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-model</artifactId>
- <!-- incubator version is not managed by app starter bundles -->
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-sse-ui</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-modelannotation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-cors-impl</artifactId>
</dependency>
<dependency>
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
index 5ee5246..40e40c2 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_bulkAction.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.debug._Probe;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
index b7d6ac8..da62b8d 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useAutoComplete.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
index bdf65a6..d8c712a 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useChoices.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
index ffb27d9..b4e4dfc 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDefault.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
index 369cefe..56d90f9 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useDisable.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
index 2c3061c..6f98237 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useHide.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useIndependent.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useIndependent.java
index 25e7aec..517ce67 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useIndependent.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionDemo_useIndependent.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
index 6112d9b..d80ad38 100644
--- a/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/tooltip/TooltipDemo.java
@@ -43,7 +43,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
index e2cb85b..1b9e060 100644
--- a/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/types/time/TemporalDemo.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.util.JaxbAdapters.OffsetDateTimeAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter;
import org.apache.isis.applib.util.JaxbAdapters.SqlTimestampAdapter;
import org.apache.isis.core.commons.internal.debug._Probe;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoAppManifest.java b/examples/demo/src/main/java/demoapp/webapp/DemoAppManifest.java
index 01cca84..2009bf2 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoAppManifest.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoAppManifest.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.extensions.cors.impl.IsisModuleExtCorsImpl;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -40,7 +40,6 @@ import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
import org.apache.isis.extensions.viewer.wicket.exceldownload.ui.IsisModuleExtExcelDownloadUi;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -86,7 +85,7 @@ import demoapp.utils.LibraryPreloadingService;
IsisModuleTestingFixturesApplib.class,
IsisModuleTestingH2ConsoleUi.class,
- IsisModuleIncModelMetaModel.class, // @Model support (incubator)
+ IsisModuleExtModelAnnotation.class, // @Model support
IsisModuleExtExcelDownloadUi.class, // allows for collection download as excel
LibraryPreloadingService.class, // just a performance enhancement
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index c4bc194..1f73f7b 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -115,7 +115,7 @@
<groupId>org.apache.isis.incubator.viewer</groupId>
<artifactId>isis-viewer-vaadin-viewer</artifactId>
<!-- incubator version is not managed by app starter bundles -->
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- EXTENSIONS -->
diff --git a/examples/demo/wicket/pom.xml b/examples/demo/wicket/pom.xml
index 33955ae..486ce8b 100644
--- a/examples/demo/wicket/pom.xml
+++ b/examples/demo/wicket/pom.xml
@@ -85,68 +85,6 @@
<type>pom</type>
</dependency>
- <!-- EXTENSIONS -->
-
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-model</artifactId>
- <!-- incubator version is not managed by app starter bundles -->
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-sse-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-cors-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-exceldownload-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-persistence-jdo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-shiro-realm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-h2console-ui</artifactId>
- </dependency>
-
- <!-- OTHER DEPENDENCIES -->
-
-<!-- <dependency> -->
-<!-- <groupId>org.hsqldb</groupId> -->
-<!-- <artifactId>hsqldb</artifactId> -->
-<!-- </dependency> -->
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 5478fa9..2d9cca0 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -267,12 +267,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-model</artifactId>
- <!-- incubator version is not managed by app starter bundles -->
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
@@ -282,6 +276,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-modelannotation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-model</artifactId>
</dependency>
<dependency>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 5f4fcf6..56dc6fd 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.testdomain.conf;
-import java.util.function.Supplier;
-
import javax.inject.Singleton;
import org.springframework.context.annotation.Bean;
@@ -33,19 +31,16 @@ import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.applib.services.xactn.TransactionId;
-import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
@Configuration
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleIncModelMetaModel.class // @Model support
+ IsisModuleExtModelAnnotation.class // @Model support
})
@PropertySources({
@PropertySource(IsisPresets.NoTranslations),
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
index 395378b..61f1ed6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/actnsemantics/Configuration_usingActionSemantics.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
@Configuration
@Import({
- IsisModuleIncModelMetaModel.class
+ IsisModuleExtModelAnnotation.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/Configuration_usingInvalidDomain.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/Configuration_usingInvalidDomain.java
index 9c5ec5e..4df38b6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/Configuration_usingInvalidDomain.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/Configuration_usingInvalidDomain.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
@Configuration
@Import({
- IsisModuleIncModelMetaModel.class
+ IsisModuleExtModelAnnotation.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
index fed2c61..51afd58 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedActionSupport.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedActionSupport {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
index 1442be6..ce04817 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedCollectionSupport.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedCollectionSupport {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
index c504406..5754cf6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/bad/InvalidOrphanedPropertySupport.java
@@ -20,7 +20,7 @@ package org.apache.isis.testdomain.model.bad;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
@DomainObject(nature = Nature.VIEW_MODEL)
public class InvalidOrphanedPropertySupport {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/Configuration_usingValidDomain.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/Configuration_usingValidDomain.java
index a839557..3c7fb25 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/Configuration_usingValidDomain.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/Configuration_usingValidDomain.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
@Configuration
@Import({
- IsisModuleIncModelMetaModel.class
+ IsisModuleExtModelAnnotation.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
index 06c679c..d8613a4 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java
index 016ef29..8cde2f7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
index 29c43ce..10f087b 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_action2.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java
index 2820b6e..502af7a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
index b117275..5a4c733 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_collection2.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java
index 904c295..0dc67f6 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property.java
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
index e8cbb8a..b6b2e79 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberSupport_property2.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.MinLength;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.RequiredArgsConstructor;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperParameterSupport.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperParameterSupport.java
index 7668f49..3604df3 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperParameterSupport.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperParameterSupport.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.Value;
import lombok.experimental.Accessors;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
index 7fe0508..329f57f 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/good/ProperPrefixedMember.java
@@ -4,7 +4,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/layout/Configuration_usingLayout.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/layout/Configuration_usingLayout.java
index c78f4f8..b44a0b9 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/layout/Configuration_usingLayout.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/model/layout/Configuration_usingLayout.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
+import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
@Configuration
@Import({
- IsisModuleIncModelMetaModel.class
+ IsisModuleExtModelAnnotation.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/extensions/adoc/modules/ROOT/partials/component-nav.adoc b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
index ad8f4b3..1b77a8a 100644
--- a/extensions/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
@@ -5,6 +5,7 @@ include::extensions:ROOT:partial$module-nav.adoc[]
include::security:session-log:partial$module-nav.adoc[]
include::command-log:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
+include::model-annotation:partial$module-nav.adoc[]
* Security
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
diff --git a/incubator/core/model/pom.xml b/extensions/core/model-annotation/pom.xml
similarity index 80%
rename from incubator/core/model/pom.xml
rename to extensions/core/model-annotation/pom.xml
index 4bd27eb..0851f59 100644
--- a/incubator/core/model/pom.xml
+++ b/extensions/core/model-annotation/pom.xml
@@ -15,22 +15,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
<version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-incubator-model</artifactId>
- <name>Apache Isis Inc - @Model</name>
+ <artifactId>isis-extensions-modelannotation</artifactId>
+ <name>Apache Isis Ext - @Model</name>
<description>
Allows supporting methods to be annotated as @Model, to make explicit the bounds of the metamodel.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.incubator.model</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/incubator/model</git-plugin.propertiesDir>
- </properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.modelannotation</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/modelannotation</git-plugin.propertiesDir>
+ </properties>
<dependencies>
diff --git a/incubator/core/model/src/main/adoc/antora.yml b/extensions/core/model-annotation/src/main/adoc/antora.yml
similarity index 100%
rename from incubator/core/model/src/main/adoc/antora.yml
rename to extensions/core/model-annotation/src/main/adoc/antora.yml
diff --git a/incubator/core/model/src/main/adoc/modules/model/nav.adoc b/extensions/core/model-annotation/src/main/adoc/modules/model/nav.adoc
similarity index 100%
rename from incubator/core/model/src/main/adoc/modules/model/nav.adoc
rename to extensions/core/model-annotation/src/main/adoc/modules/model/nav.adoc
diff --git a/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc b/extensions/core/model-annotation/src/main/adoc/modules/model/pages/about.adoc
similarity index 100%
rename from incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
rename to extensions/core/model-annotation/src/main/adoc/modules/model/pages/about.adoc
diff --git a/incubator/core/model/src/main/adoc/modules/model/partials/module-nav.adoc b/extensions/core/model-annotation/src/main/adoc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from incubator/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
rename to extensions/core/model-annotation/src/main/adoc/modules/model/partials/module-nav.adoc
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/IsisModuleIncModelApplib.java
similarity index 94%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
rename to extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/IsisModuleIncModelApplib.java
index 119a814..1005fc0 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
+++ b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/IsisModuleIncModelApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.model.applib;
+package org.apache.isis.extensions.modelannotation.applib;
import org.springframework.context.annotation.Configuration;
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/annotation/Model.java
similarity index 95%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
rename to extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/annotation/Model.java
index e0443d4..20dce43 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
+++ b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/applib/annotation/Model.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.incubator.model.applib.annotation;
+package org.apache.isis.extensions.modelannotation.applib.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.java
similarity index 79%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
rename to extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.java
index ed85b34..f6b5f5c 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
+++ b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.model.metamodel;
+package org.apache.isis.extensions.modelannotation.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.incubator.model.applib.IsisModuleIncModelApplib;
-import org.apache.isis.incubator.model.metamodel.services.IncubatorMetaModelPlugin;
+import org.apache.isis.extensions.modelannotation.applib.IsisModuleIncModelApplib;
+import org.apache.isis.extensions.modelannotation.metamodel.services.IncubatorMetaModelPlugin;
@Configuration
@Import({
@@ -32,6 +32,6 @@ import org.apache.isis.incubator.model.metamodel.services.IncubatorMetaModelPlug
// @Component's
IncubatorMetaModelPlugin.class
})
-public class IsisModuleIncModelMetaModel {
+public class IsisModuleExtModelAnnotation {
}
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
similarity index 97%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
rename to extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
index a7d6056..1c71a95 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
+++ b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.model.metamodel.facets;
+package org.apache.isis.extensions.modelannotation.metamodel.facets;
import java.lang.reflect.Method;
import java.util.HashSet;
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.incubator.model.applib.annotation.Model;
+import org.apache.isis.extensions.modelannotation.applib.annotation.Model;
/**
*
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/services/IncubatorMetaModelPlugin.java
similarity index 88%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
rename to extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/services/IncubatorMetaModelPlugin.java
index 7a50037..21a8498 100644
--- a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
+++ b/extensions/core/model-annotation/src/main/java/org/apache/isis/extensions/modelannotation/metamodel/services/IncubatorMetaModelPlugin.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.incubator.model.metamodel.services;
+package org.apache.isis.extensions.modelannotation.metamodel.services;
import org.springframework.stereotype.Component;
-import org.apache.isis.incubator.model.metamodel.facets.SupportingMethodValidatorRefinerFactory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
+import org.apache.isis.extensions.modelannotation.metamodel.facets.SupportingMethodValidatorRefinerFactory;
@Component
public class IncubatorMetaModelPlugin implements MetaModelRefiner {
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 6f39bca..c9d68fb 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -64,6 +64,12 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-modelannotation</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-exceldownload-ui</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
@@ -164,6 +170,7 @@
<modules>
<module>core/flyway</module>
+ <module>core/modelannotation</module>
<module>security/secman</module>
<module>security/shiro-realm-ldap</module>
diff --git a/incubator/adoc/modules/ROOT/partials/component-nav.adoc b/incubator/adoc/modules/ROOT/partials/component-nav.adoc
index 46bf21a..9d4fddf 100644
--- a/incubator/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/incubator/adoc/modules/ROOT/partials/component-nav.adoc
@@ -1,4 +1,3 @@
include::incubator:ROOT:partial$module-nav.adoc[]
-include::incubator:model:partial$module-nav.adoc[]
include::incubator:microprofile:partial$module-nav.adoc[]
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 10f9238..9ea8932 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -63,12 +63,6 @@
<dependency>
<groupId>org.apache.isis.incubator</groupId>
- <artifactId>isis-incubator-model</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.incubator</groupId>
<artifactId>isis-incubator-microprofile</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
@@ -117,7 +111,6 @@
</dependencies>
<modules>
- <module>core/model</module>
<module>mappings/microprofile</module>
<module>viewers/vaadin</module>
</modules>