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 2019/08/10 04:53:24 UTC
[isis] branch v2 updated: ISIS-2158 moves the 'core/legacy/legacy'
module to 'extensions/legacy'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new fcfe2c7 ISIS-2158 moves the 'core/legacy/legacy' module to 'extensions/legacy'
fcfe2c7 is described below
commit fcfe2c721568c6fd2de99e2ce12be9d0f17e9624
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Aug 10 06:53:15 2019 +0200
ISIS-2158 moves the 'core/legacy/legacy' module to 'extensions/legacy'
- also includes the 'extension' modules with the maven core/pom.xml to
build everything (except examples) in one blow
---
core/pom.xml | 1 +
{core/legacy => extensions}/legacy/.gitignore | 0
{core/legacy => extensions}/legacy/pom.xml | 95 +++++++++-------------
.../java/org/apache/isis/applib/AppManifest.java | 0
.../apache/isis/applib/DomainObjectContainer.java | 0
.../java/org/apache/isis/applib/filter/Filter.java | 0
.../org/apache/isis/applib/filter/Filters.java | 0
.../background/BackgroundCommandService2.java | 0
.../services/background/BackgroundService2.java | 0
.../services/eventbus/ActionDomainEvent.java | 0
.../services/eventbus/CollectionDomainEvent.java | 0
.../services/eventbus/PropertyDomainEvent.java | 0
.../isis/core/runtime/snapshot/DomSerializer.java | 0
.../core/runtime/snapshot/DomSerializerJaxp.java | 0
.../isis/core/runtime/sysout/SystemPrinter.java | 0
.../apache/isis/runtime/viewer/package-info.java | 0
.../viewer/web/AbstractServletOrFilterMapping.java | 0
.../runtime/viewer/web/FilterSpecification.java | 0
.../runtime/viewer/web/ServletSpecification.java | 0
.../runtime/viewer/web/WebAppSpecification.java | 0
extensions/pom.xml | 4 +-
21 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 95e82e6..6d6d248 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2491,6 +2491,7 @@
<module>webdocker</module>
<module>../mavendeps</module>
+ <module>../extensions</module>
</modules>
</project>
diff --git a/core/legacy/legacy/.gitignore b/extensions/legacy/.gitignore
similarity index 100%
rename from core/legacy/legacy/.gitignore
rename to extensions/legacy/.gitignore
diff --git a/core/legacy/legacy/pom.xml b/extensions/legacy/pom.xml
similarity index 62%
rename from core/legacy/legacy/pom.xml
rename to extensions/legacy/pom.xml
index 335917e..f836bea 100644
--- a/core/legacy/legacy/pom.xml
+++ b/extensions/legacy/pom.xml
@@ -9,61 +9,42 @@
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"
+<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>${revision}</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions</artifactId>
+ <version>${revision}</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <artifactId>isis-legacy</artifactId>
-
- <name>Apache Isis Legacy (1.16+ to 2.0.0)</name>
+ <artifactId>isis-extensions-legacy</artifactId>
+ <name>Apache Isis Extensions - Legacy</name>
<description>
To ease migration from Apache Isis versions 1.16+ to 2.0.0.
</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.legacy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/legacy</git-plugin.propertiesDir>
- </properties>
-
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.legacy</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/legacy</git-plugin.propertiesDir>
+ </properties>
<dependencies>
-
+
<!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
+
<!-- LEGACY DEPENDENCY -->
-
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -76,28 +57,28 @@
<artifactId>isis-applib</artifactId>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime</artifactId>
<scope>compile</scope>
</dependency>
-
-
+
+
<!-- TEST DEPENDENCY -->
-
+
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- whatever unittestsupport is dependent on, it should not be transitive -->
- <exclusion>
- <groupId>com.google.guava</groupId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <!-- whatever unittestsupport is dependent on, it should not be transitive -->
+ <exclusion>
+ <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/AppManifest.java b/extensions/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/AppManifest.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java b/extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filter.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java b/extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/filter/Filters.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java b/extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundCommandService2.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java b/extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/services/background/BackgroundService2.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java b/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java b/extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
rename to extensions/legacy/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java b/extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
rename to extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializer.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java b/extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
rename to extensions/legacy/src/main/java/org/apache/isis/core/runtime/snapshot/DomSerializerJaxp.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java b/extensions/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
rename to extensions/legacy/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java b/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
rename to extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/package-info.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java b/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
rename to extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/AbstractServletOrFilterMapping.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java b/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
rename to extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/FilterSpecification.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java b/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
rename to extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/ServletSpecification.java
diff --git a/core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java b/extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
similarity index 100%
rename from core/legacy/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
rename to extensions/legacy/src/main/java/org/apache/isis/runtime/viewer/web/WebAppSpecification.java
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 945da53..155a066 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -219,9 +219,7 @@
<module>markdown</module>
<module>fixtures</module>
<module>specsupport</module>
-
-
-
+ <module>legacy</module>
<module>viewer-wicket-excel</module>
<module>secman</module>
<module>restclient</module>