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:12 UTC
[isis] 01/06: ISIS-2206: moves isis-extensions/incubator to
isis-incubator/incubator
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f3b2710bba120086e84507eebfef5b9906fc2492
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 17:13:16 2019 +0000
ISIS-2206: moves isis-extensions/incubator to isis-incubator/incubator
---
.../archdesign/attachments/pom-hierarchy.pptx | Bin 50617 -> 51849 bytes
extensions/pom.xml | 1 -
{extensions => incubator}/other/incubator/pom.xml | 8 +--
.../other/incubator/src/main/doc/antora.yml | 0
.../main/doc/modules/incubator/_attributes.adoc | 0
.../doc/modules/incubator/attachments}/.gitkeep | 0
.../main/doc/modules/incubator/examples/.gitkeep | 0
.../main/doc/modules/incubator/images}/.gitkeep | 0
.../src/main/doc/modules/incubator/nav.adoc | 0
.../doc/modules/incubator/pages}/_attributes.adoc | 0
.../main/doc/modules/incubator/pages/about.adoc | 0
.../modules/incubator/partials}/_attributes.adoc | 0
.../doc/modules/incubator/partials/module-nav.adoc | 0
.../org/apache/isis/applib/annotation/Model.java | 0
.../incubator/IncubatorMetaModelPlugin.java | 0
.../extensions/incubator/IsisBootIncubator.java | 0
.../SupportingMethodValidatorRefinerFactory.java | 0
{extensions => incubator}/other/jsr303/README.adoc | 0
{extensions => incubator}/other/jsr303/pom.xml | 0
.../examples/facets/jsr303/Jsr303FacetFactory.java | 0
.../facets/jsr303/Jsr303ProgModelFacets.java | 0
.../jsr303/Jsr303PropertyValidationFacet.java | 0
.../examples/facets/jsr303/CustomPattern.java | 0
.../facets/jsr303/CustomPatternValidator.java | 0
.../examples/facets/jsr303/CustomPatterns.java | 0
.../facets/jsr303/DomainObjectVanilla.java | 0
.../jsr303/DomainObjectWithBuiltInValidation.java | 0
.../jsr303/DomainObjectWithCustomValidation.java | 0
.../facets/jsr303/Jsr303FacetFacetHolder.java | 0
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 0
.../jsr303/Jsr303FacetFactoryInstantiation.java | 0
.../jsr303/Jsr303FacetFactoryProcessObject.java | 0
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 0
.../facets/jsr303/Jsr303FacetInstantiation.java | 0
.../jsr303/Jsr303FacetValidatingInteraction.java | 0
incubator/pom.xml | 77 +++++++++++++++++++++
36 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx b/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx
index 60ea7ae..0720727 100644
Binary files a/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx and b/antora/components/core/modules/archdesign/attachments/pom-hierarchy.pptx differ
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 233dd03..b70e28e 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -185,7 +185,6 @@
</dependencyManagement>
<modules>
- <module>other/incubator</module>
<module>other/legacy</module>
<module>other/spring</module>
<module>security/secman</module>
diff --git a/extensions/other/incubator/pom.xml b/incubator/other/incubator/pom.xml
similarity index 91%
rename from extensions/other/incubator/pom.xml
rename to incubator/other/incubator/pom.xml
index cf1ac7d..6bc1823 100644
--- a/extensions/other/incubator/pom.xml
+++ b/incubator/other/incubator/pom.xml
@@ -15,14 +15,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-incubator</artifactId>
- <name>Apache Isis Ext - Incubator</name>
+ <artifactId>isis-incubator-incubator</artifactId>
+ <name>Apache Isis Inc - Incubator</name>
<description>
Provides experimental features.
</description>
diff --git a/extensions/other/incubator/src/main/doc/antora.yml b/incubator/other/incubator/src/main/doc/antora.yml
similarity index 100%
rename from extensions/other/incubator/src/main/doc/antora.yml
rename to incubator/other/incubator/src/main/doc/antora.yml
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/images/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/examples/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep b/incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/attachments/.gitkeep
rename to incubator/other/incubator/src/main/doc/modules/incubator/images/.gitkeep
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/nav.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/nav.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/nav.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/pages/about.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/pages/about.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/pages/_attributes.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/partials/_attributes.adoc
diff --git a/extensions/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc b/incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
similarity index 100%
rename from extensions/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
rename to incubator/other/incubator/src/main/doc/modules/incubator/partials/module-nav.adoc
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java b/incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/applib/annotation/Model.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java b/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IncubatorMetaModelPlugin.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java b/incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/extensions/incubator/IsisBootIncubator.java
diff --git a/extensions/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java b/incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from extensions/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
rename to incubator/other/incubator/src/main/java/org/apache/isis/metamodel/facets/actions/support/SupportingMethodValidatorRefinerFactory.java
diff --git a/extensions/other/jsr303/README.adoc b/incubator/other/jsr303/README.adoc
similarity index 100%
rename from extensions/other/jsr303/README.adoc
rename to incubator/other/jsr303/README.adoc
diff --git a/extensions/other/jsr303/pom.xml b/incubator/other/jsr303/pom.xml
similarity index 100%
rename from extensions/other/jsr303/pom.xml
rename to incubator/other/jsr303/pom.xml
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
diff --git a/extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
similarity index 100%
rename from extensions/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
rename to incubator/other/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
diff --git a/extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
similarity index 100%
rename from extensions/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
rename to incubator/other/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
diff --git a/incubator/pom.xml b/incubator/pom.xml
new file mode 100644
index 0000000..107f3bd
--- /dev/null
+++ b/incubator/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator</artifactId>
+
+ <name>Apache Isis Incubator</name>
+ <description>
+ Collection of Apache Isis extensions, currently incubating.
+ </description>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.incubator</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/incubator</git-plugin.propertiesDir>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.incubator</groupId>
+ <artifactId>isis-incubator-incubator</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>other/incubator</module>
+ </modules>
+
+</project>
+
+