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:14 UTC
[isis] 03/06: ISIS-2206 renames incubator/other/incubator to
incubator/core/model
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2525ddb11596ade1f52ee325c1e68608d3da0908
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:22:03 2019 +0000
ISIS-2206 renames incubator/other/incubator to incubator/core/model
also moves jsr303 (unused code)
---
core-parent/pom.xml | 13 +------------
incubator/{other => core}/jsr303/README.adoc | 0
incubator/{other => core}/jsr303/pom.xml | 0
.../examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../examples/facets/jsr303/Jsr303ProgModelFacets.java | 0
.../facets/jsr303/Jsr303PropertyValidationFacet.java | 0
.../metamodel/examples/facets/jsr303/CustomPattern.java | 0
.../examples/facets/jsr303/CustomPatternValidator.java | 0
.../metamodel/examples/facets/jsr303/CustomPatterns.java | 0
.../examples/facets/jsr303/DomainObjectVanilla.java | 0
.../facets/jsr303/DomainObjectWithBuiltInValidation.java | 0
.../facets/jsr303/DomainObjectWithCustomValidation.java | 0
.../examples/facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../facets/jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../facets/jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../facets/jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../facets/jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../examples/facets/jsr303/Jsr303FacetInstantiation.java | 0
.../facets/jsr303/Jsr303FacetValidatingInteraction.java | 0
incubator/{other/incubator => core/model}/pom.xml | 10 +++++-----
.../{other/incubator => core/model}/src/main/doc/antora.yml | 0
.../model}/src/main/doc/modules/incubator/_attributes.adoc | 0
.../src/main/doc/modules/incubator/attachments}/.gitkeep | 0
.../model}/src/main/doc/modules/incubator/examples/.gitkeep | 0
.../model/src/main/doc/modules/incubator/images}/.gitkeep | 0
.../model}/src/main/doc/modules/incubator/nav.adoc | 0
.../src/main/doc/modules/incubator/pages}/_attributes.adoc | 0
.../model}/src/main/doc/modules/incubator/pages/about.adoc | 0
.../main/doc/modules/incubator/partials}/_attributes.adoc | 0
.../src/main/doc/modules/incubator/partials/module-nav.adoc | 0
.../main/java/org/apache/isis/applib/annotation/Model.java | 0
.../isis/extensions/incubator/IncubatorMetaModelPlugin.java | 0
.../apache/isis/extensions/incubator/IsisBootIncubator.java | 0
.../support/SupportingMethodValidatorRefinerFactory.java | 0
incubator/pom.xml | 2 +-
35 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index df8696d..1c92b25 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -788,6 +788,7 @@ under the License.
<module>../core</module>
<module>../mavendeps</module>
<module>../extensions</module>
+ <module>../incubator</module>
<module>../starters</module>
</modules>
</profile>
@@ -816,18 +817,6 @@ under the License.
</modules>
</profile>
- <profile>
- <id>starter-apps-module</id>
- <activation>
- <property>
- <name>starter-apps-modules</name>
- </property>
- </activation>
- <modules>
- <module>../starters/helloworld</module>
- <module>../starters/simpleapp</module>
- </modules>
- </profile>
<!-- APACHE ISIS customisation 5/5: end -->
</profiles>
diff --git a/incubator/other/jsr303/README.adoc b/incubator/core/jsr303/README.adoc
similarity index 100%
rename from incubator/other/jsr303/README.adoc
rename to incubator/core/jsr303/README.adoc
diff --git a/incubator/other/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
similarity index 100%
rename from incubator/other/jsr303/pom.xml
rename to incubator/core/jsr303/pom.xml
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
diff --git a/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
similarity index 100%
rename from incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
rename to incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
diff --git a/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
similarity index 100%
rename from incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
rename to incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
diff --git a/incubator/other/incubator/pom.xml b/incubator/core/model/pom.xml
similarity index 82%
rename from incubator/other/incubator/pom.xml
rename to incubator/core/model/pom.xml
index 6bc1823..47827d1 100644
--- a/incubator/other/incubator/pom.xml
+++ b/incubator/core/model/pom.xml
@@ -21,15 +21,15 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-incubator-incubator</artifactId>
- <name>Apache Isis Inc - Incubator</name>
+ <artifactId>isis-incubator-model</artifactId>
+ <name>Apache Isis Inc - @Model</name>
<description>
- Provides experimental features.
+ Allows supporting methods to be annotated as @Model, to make explicit the bounds of the metamodel.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.incubator</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/incubator</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.incubator.model</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/incubator/model</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/incubator/other/incubator/src/main/doc/antora.yml b/incubator/core/model/src/main/doc/antora.yml
similarity index 100%
rename from incubator/other/incubator/src/main/doc/antora.yml
rename to incubator/core/model/src/main/doc/antora.yml
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/attachments/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/examples/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep b/incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
rename to incubator/core/model/src/main/doc/modules/incubator/images/.gitkeep
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc b/incubator/core/model/src/main/doc/modules/incubator/nav.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/nav.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/pages/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc b/incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/pages/about.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc b/incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/partials/_attributes.adoc
diff --git a/incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
similarity index 100%
rename from incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
rename to incubator/core/model/src/main/doc/modules/incubator/partials/module-nav.adoc
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java b/incubator/core/model/src/main/java/org/apache/isis/applib/annotation/Model.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
rename to incubator/core/model/src/main/java/org/apache/isis/applib/annotation/Model.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java b/incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
rename to incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java b/incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
rename to incubator/core/model/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
diff --git a/incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java b/incubator/core/model/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
rename to incubator/core/model/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 107f3bd..0d06593 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -69,7 +69,7 @@
</dependencyManagement>
<modules>
- <module>other/incubator</module>
+ <module>core/model</module>
</modules>
</project>