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/01/13 18:59:53 UTC
[isis] branch master updated: ISIS-2158: reorganizes incubator
folder structure
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 be44764 ISIS-2158: reorganizes incubator folder structure
be44764 is described below
commit be447641f7ab462bb195ad27946be0bd57c7edc9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 13 19:59:45 2020 +0100
ISIS-2158: reorganizes incubator folder structure
---
incubator/core/.gitkeep | 0
incubator/{extensions => }/core/jsr303/README.adoc | 0
incubator/{extensions => }/core/jsr303/pom.xml | 2 +-
.../isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java | 0
.../examples/facets/jsr303/Jsr303PropertyValidationFacet.java | 0
.../apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java | 0
.../isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java | 0
.../apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java | 0
.../isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java | 0
.../examples/facets/jsr303/DomainObjectWithBuiltInValidation.java | 0
.../examples/facets/jsr303/DomainObjectWithCustomValidation.java | 0
.../isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java | 0
.../examples/facets/jsr303/Jsr303FacetValidatingInteraction.java | 0
incubator/{extensions => }/core/model/pom.xml | 2 +-
incubator/{extensions => }/core/model/src/main/doc/antora.yml | 0
.../{extensions => }/core/model/src/main/doc/modules/model/nav.adoc | 0
.../core/model/src/main/doc/modules/model/pages/about.adoc | 0
.../core/model/src/main/doc/modules/model/partials/module-nav.adoc | 0
.../apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java | 0
.../java/org/apache/isis/incubator/model/applib/annotation/Model.java | 0
.../isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java | 0
.../metamodel/facets/SupportingMethodValidatorRefinerFactory.java | 0
.../incubator/model/metamodel/services/IncubatorMetaModelPlugin.java | 0
incubator/extensions/.gitkeep | 0
incubator/mappings/.gitkeep | 0
incubator/{extensions/core => mappings}/microprofile/pom.xml | 2 +-
.../core => mappings}/microprofile/src/main/doc/antora.yml | 0
.../microprofile/src/main/doc/modules/microprofile/nav.adoc | 0
.../microprofile/src/main/doc/modules/microprofile/pages/about.adoc | 0
.../src/main/doc/modules/microprofile/partials/module-nav.adoc | 0
.../isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java | 0
.../resources/META-INF/services/javax.enterprise.inject.spi.Extension | 0
incubator/pom.xml | 4 ++--
39 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/incubator/core/.gitkeep b/incubator/core/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/incubator/extensions/core/jsr303/README.adoc b/incubator/core/jsr303/README.adoc
similarity index 100%
rename from incubator/extensions/core/jsr303/README.adoc
rename to incubator/core/jsr303/README.adoc
diff --git a/incubator/extensions/core/jsr303/pom.xml b/incubator/core/jsr303/pom.xml
similarity index 97%
rename from incubator/extensions/core/jsr303/pom.xml
rename to incubator/core/jsr303/pom.xml
index c96fd9a..642ace8 100644
--- a/incubator/extensions/core/jsr303/pom.xml
+++ b/incubator/core/jsr303/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/incubator/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/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/extensions/core/model/pom.xml b/incubator/core/model/pom.xml
similarity index 97%
rename from incubator/extensions/core/model/pom.xml
rename to incubator/core/model/pom.xml
index a42325f..c9220d2 100644
--- a/incubator/extensions/core/model/pom.xml
+++ b/incubator/core/model/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.incubator</groupId>
<artifactId>isis-incubator</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-incubator-model</artifactId>
diff --git a/incubator/extensions/core/model/src/main/doc/antora.yml b/incubator/core/model/src/main/doc/antora.yml
similarity index 100%
rename from incubator/extensions/core/model/src/main/doc/antora.yml
rename to incubator/core/model/src/main/doc/antora.yml
diff --git a/incubator/extensions/core/model/src/main/doc/modules/model/nav.adoc b/incubator/core/model/src/main/doc/modules/model/nav.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/doc/modules/model/nav.adoc
rename to incubator/core/model/src/main/doc/modules/model/nav.adoc
diff --git a/incubator/extensions/core/model/src/main/doc/modules/model/pages/about.adoc b/incubator/core/model/src/main/doc/modules/model/pages/about.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/doc/modules/model/pages/about.adoc
rename to incubator/core/model/src/main/doc/modules/model/pages/about.adoc
diff --git a/incubator/extensions/core/model/src/main/doc/modules/model/partials/module-nav.adoc b/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from incubator/extensions/core/model/src/main/doc/modules/model/partials/module-nav.adoc
rename to incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
diff --git a/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
similarity index 100%
rename from incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
diff --git a/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
similarity index 100%
rename from incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
diff --git a/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
similarity index 100%
rename from incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
diff --git a/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
diff --git a/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java b/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
similarity index 100%
rename from incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
rename to incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
diff --git a/incubator/extensions/.gitkeep b/incubator/extensions/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/incubator/mappings/.gitkeep b/incubator/mappings/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/incubator/extensions/core/microprofile/pom.xml b/incubator/mappings/microprofile/pom.xml
similarity index 97%
rename from incubator/extensions/core/microprofile/pom.xml
rename to incubator/mappings/microprofile/pom.xml
index a2fca77..4f736e5 100644
--- a/incubator/extensions/core/microprofile/pom.xml
+++ b/incubator/mappings/microprofile/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.apache.isis.incubator</groupId>
<artifactId>isis-incubator</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-incubator-microprofile</artifactId>
diff --git a/incubator/extensions/core/microprofile/src/main/doc/antora.yml b/incubator/mappings/microprofile/src/main/doc/antora.yml
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/doc/antora.yml
rename to incubator/mappings/microprofile/src/main/doc/antora.yml
diff --git a/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/nav.adoc b/incubator/mappings/microprofile/src/main/doc/modules/microprofile/nav.adoc
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/nav.adoc
rename to incubator/mappings/microprofile/src/main/doc/modules/microprofile/nav.adoc
diff --git a/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc b/incubator/mappings/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
rename to incubator/mappings/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
diff --git a/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc b/incubator/mappings/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
rename to incubator/mappings/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
diff --git a/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/mappings/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
rename to incubator/mappings/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
diff --git a/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/incubator/mappings/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
similarity index 100%
rename from incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to incubator/mappings/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
diff --git a/incubator/pom.xml b/incubator/pom.xml
index df0ac17..8711d33 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -90,8 +90,8 @@
</dependencies>
<modules>
- <module>extensions/core/model</module>
- <module>extensions/core/microprofile</module>
+ <module>core/model</module>
+ <module>mappings/microprofile</module>
</modules>
</project>