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 2020/01/10 15:22:19 UTC
[isis] 05/21: ISIS-2259: introduce parent for viewers/wicket and
persistence/jdo
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f659d9b2c6a6d7eff65fc76efb83bae9a99f6543
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:15:00 2020 +0000
ISIS-2259: introduce parent for viewers/wicket and persistence/jdo
---
antora/playbooks/site-refguide.yml | 10 ++++---
antora/playbooks/site.yml | 14 +++++-----
api/applib/pom.xml | 1 +
api/schema/pom.xml | 1 +
core/persistence/jdo/applib/pom.xml | 5 ++--
core/persistence/jdo/datanucleus-5/pom.xml | 5 ++--
core/persistence/jdo/pom.xml | 38 +++++++++++++++++++++++++++
core/pom.xml | 15 +++--------
core/viewers/wicket/model/pom.xml | 3 +--
core/viewers/wicket/pom.xml | 42 ++++++++++++++++++++++++++++++
core/viewers/wicket/ui/pom.xml | 3 +--
core/viewers/wicket/viewer/pom.xml | 3 +--
12 files changed, 106 insertions(+), 34 deletions(-)
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index ef1e15b..5fcad68 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -15,15 +15,17 @@ content:
start_path: antora/components/refguide # refguide
branches: HEAD
-# core
+# api
- url: .
- start_path: core/applib/src/main/doc # refguide
+ start_path: api/applib/src/main/doc # refguide
branches: HEAD
- url: .
- start_path: core/config/src/main/doc # refguide
+ start_path: api/schema/src/main/doc # refguide
branches: HEAD
+
+# core
- url: .
- start_path: core/schema/src/main/doc # refguide
+ start_path: core/config/src/main/doc # refguide
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 56328e2..4367b42 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -45,11 +45,16 @@ content:
start_path: antora/components/valuetypes # valuetypes
branches: HEAD
-# core
+# api
- url: .
- start_path: core/applib/src/main/doc # refguide
+ start_path: api/applib/src/main/doc # refguide
branches: HEAD
- url: .
+ start_path: api/schema/src/main/doc # refguide
+ branches: HEAD
+
+# core
+ - url: .
start_path: core/codegen-bytebuddy/src/main/doc # core
branches: HEAD
- url: .
@@ -74,15 +79,12 @@ content:
start_path: core/webboot-springboot/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/runtime-services/src/main/doc # core
+ start_path: core/runtimeservices/src/main/doc # core
branches: HEAD
- url: .
start_path: core/webapp/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/schema/src/main/doc # refguide
- branches: HEAD
- - url: .
start_path: core/security/api/src/main/doc # security
branches: HEAD
- url: .
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 6072156..9d1c6f4 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -24,6 +24,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-applib</artifactId>
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index db4083e..bb7ca79 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -18,6 +18,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-schema</artifactId>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index d6e5978..b529e9f 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -15,14 +15,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-persistence-jdo</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-persistence-jdo-applib</artifactId>
- <name>Apache Isis Persistence - JDO Applib</name>
+ <name>Apache Isis Persistence - JDO (applib)</name>
<description>
Supplementary applib for JDO persistence
</description>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index f1075de..1ec11b5 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -15,14 +15,13 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-persistence-jdo</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-persistence-jdo-datanucleus5</artifactId>
- <name>Apache Isis Persistence - JDO (Datanucleus 5)</name>
+ <name>Apache Isis Persistence - JDO (datanucleus 5)</name>
<description>
JDO plugin using datanucleus.
</description>
diff --git a/core/persistence/jdo/pom.xml b/core/persistence/jdo/pom.xml
new file mode 100644
index 0000000..97ea3f7
--- /dev/null
+++ b/core/persistence/jdo/pom.xml
@@ -0,0 +1,38 @@
+<?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>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-persistence-jdo</artifactId>
+
+ <name>Apache Isis Persistence - JDO</name>
+ <description>
+ Supplementary applib for JDO persistence
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ <module>datanucleus-5</module>
+ </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 87a8d30..e8a7739 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1863,18 +1863,9 @@
<module>security/keycloak</module>
<module>viewers/restfulobjects</module>
- <module>viewers/restfulobjects/applib</module>
- <module>viewers/restfulobjects/rendering</module>
- <module>viewers/restfulobjects/jaxrs-resteasy-4</module>
- <module>viewers/restfulobjects/viewer</module>
-
- <module>viewers/wicket/model</module>
- <module>viewers/wicket/ui</module>
- <module>viewers/wicket/viewer</module>
-
- <module>persistence/jdo/applib</module>
- <module>persistence/jdo/datanucleus-5</module>
-
+ <module>viewers/wicket</module>
+
+ <module>persistence/jdo</module>
<!-- to break cyclic dependencies some tests needed to be moved to their
own modules -->
diff --git a/core/viewers/wicket/model/pom.xml b/core/viewers/wicket/model/pom.xml
index 28877a5..3f6c11c 100644
--- a/core/viewers/wicket/model/pom.xml
+++ b/core/viewers/wicket/model/pom.xml
@@ -23,9 +23,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-wicket-model</artifactId>
diff --git a/core/viewers/wicket/pom.xml b/core/viewers/wicket/pom.xml
new file mode 100644
index 0000000..51e0870
--- /dev/null
+++ b/core/viewers/wicket/pom.xml
@@ -0,0 +1,42 @@
+<?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/xsd/maven-4.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>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-viewer-wicket</artifactId>
+ <name>Apache Isis Viewer - Wicket</name>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>model</module>
+ <module>viewer</module>
+ <module>ui</module>
+ </modules>
+
+</project>
diff --git a/core/viewers/wicket/ui/pom.xml b/core/viewers/wicket/ui/pom.xml
index 96f23ef..beb277f 100644
--- a/core/viewers/wicket/ui/pom.xml
+++ b/core/viewers/wicket/ui/pom.xml
@@ -24,9 +24,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>isis-viewer-wicket-ui</artifactId>
diff --git a/core/viewers/wicket/viewer/pom.xml b/core/viewers/wicket/viewer/pom.xml
index 56a1616..cd5f027 100644
--- a/core/viewers/wicket/viewer/pom.xml
+++ b/core/viewers/wicket/viewer/pom.xml
@@ -23,9 +23,8 @@
<parent>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
+ <artifactId>isis-viewer-wicket</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
<name>Apache Isis Viewer - Wicket (Viewer)</name>