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 2022/04/12 19:57:04 UTC
[isis] branch master updated: ISIS-2999: purge isis-mappings
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 e4de76e55c ISIS-2999: purge isis-mappings
e4de76e55c is described below
commit e4de76e55ce6b5592a3ac90b4e0a9915dc4c299e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 12 21:56:58 2022 +0200
ISIS-2999: purge isis-mappings
---
bom/pom.xml | 2 --
core/jdk-supplemental/pom.xml | 2 +-
incubator/pom.xml | 2 +-
mappings/adoc/antora.yml | 23 ------------
mappings/adoc/modules/ROOT/nav.adoc | 4 ---
mappings/adoc/modules/ROOT/pages/about.adoc | 5 ---
.../adoc/modules/ROOT/partials/component-nav.adoc | 9 -----
.../adoc/modules/ROOT/partials/module-nav.adoc | 3 --
mappings/outbox-publisher/adoc/antora.yml | 19 ----------
.../adoc/modules/outbox-publisher/nav.adoc | 4 ---
.../adoc/modules/outbox-publisher/pages/about.adoc | 6 ----
.../outbox-publisher/partials/module-nav.adoc | 6 ----
mappings/pom.xml | 42 ----------------------
pom.xml | 2 --
regressiontests/incubating/pom.xml | 6 ----
.../restfulobjects/client/RestfulClient.java | 2 +-
16 files changed, 3 insertions(+), 134 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index a80aecd8d5..033438bb95 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1006,7 +1006,6 @@ under the License.
<modules>
<module>../core</module>
<module>../extensions</module>
- <module>../mappings</module>
<module>../mavendeps</module>
<module>../starters</module>
<module>../subdomains</module>
@@ -1097,7 +1096,6 @@ under the License.
<modules>
<module>../core</module>
<module>../extensions</module>
- <module>../mappings</module>
<module>../mavendeps</module>
<module>../starters</module>
<module>../subdomains</module>
diff --git a/core/jdk-supplemental/pom.xml b/core/jdk-supplemental/pom.xml
index 7d951d023c..f7f1a35f3c 100644
--- a/core/jdk-supplemental/pom.xml
+++ b/core/jdk-supplemental/pom.xml
@@ -52,7 +52,7 @@
<dependencyManagement>
<dependencies>
<!-- dependency convergence clash with org.apache.cxf:cxf-core:3.4.0 (used
- by isis-mappings-jaxrsclient-impl) -->
+ by isis-mappings-jaxrsclient-impl) TODO ... jaxrsclient was removed -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 787285b74a..bd58237e37 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -26,7 +26,7 @@
<name>Apache Isis Incubator</name>
<description>
- Collection of Apache Isis extensions, subdomains or BC mappings, currently incubating.
+ Collection of Apache Isis artifacts, currently incubating.
</description>
<packaging>pom</packaging>
diff --git a/mappings/adoc/antora.yml b/mappings/adoc/antora.yml
deleted file mode 100644
index 521babfd0a..0000000000
--- a/mappings/adoc/antora.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-name: mappings
-title: "BC Mapping Libraries"
-version: latest
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/mappings/adoc/modules/ROOT/nav.adoc b/mappings/adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index b5dc7fdcc9..0000000000
--- a/mappings/adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::mappings:ROOT:partial$component-nav.adoc[]
diff --git a/mappings/adoc/modules/ROOT/pages/about.adoc b/mappings/adoc/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 0ae4b19708..0000000000
--- a/mappings/adoc/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Bounded Context Mapping Libraries
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/mappings/adoc/modules/ROOT/partials/component-nav.adoc b/mappings/adoc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index db50a89385..0000000000
--- a/mappings/adoc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-include::mappings:ROOT:partial$module-nav.adoc[]
-
-// commented out the libraries that have not yet been brought over from incode-platform
-
-//include::outbox-publisher:partial$module-nav.adoc[]
-include::mappings:jaxrsclient:partial$module-nav.adoc[]
-//include::mappings:minio:partial$module-nav.adoc[]
-//include::mappings:restclient:partial$module-nav.adoc[]
-//include::mappings:slack:partial$module-nav.adoc[]
diff --git a/mappings/adoc/modules/ROOT/partials/module-nav.adoc b/mappings/adoc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index b28b04f643..0000000000
--- a/mappings/adoc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/mappings/outbox-publisher/adoc/antora.yml b/mappings/outbox-publisher/adoc/antora.yml
deleted file mode 100644
index ed780ecb0b..0000000000
--- a/mappings/outbox-publisher/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-name: mappings
-version: latest
diff --git a/mappings/outbox-publisher/adoc/modules/outbox-publisher/nav.adoc b/mappings/outbox-publisher/adoc/modules/outbox-publisher/nav.adoc
deleted file mode 100644
index b5dc7fdcc9..0000000000
--- a/mappings/outbox-publisher/adoc/modules/outbox-publisher/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::mappings:ROOT:partial$component-nav.adoc[]
diff --git a/mappings/outbox-publisher/adoc/modules/outbox-publisher/pages/about.adoc b/mappings/outbox-publisher/adoc/modules/outbox-publisher/pages/about.adoc
deleted file mode 100644
index bb56b96fe1..0000000000
--- a/mappings/outbox-publisher/adoc/modules/outbox-publisher/pages/about.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-[[outbox-publisher]]
-= Outbox Publisher
-
-:Notice: 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 ag [...]
-
-WARNING: TODO
diff --git a/mappings/outbox-publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc b/mappings/outbox-publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc
deleted file mode 100644
index 78f7e379eb..0000000000
--- a/mappings/outbox-publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:outbox-publisher:about.adoc[Outbox Publisher]
-
-
diff --git a/mappings/pom.xml b/mappings/pom.xml
deleted file mode 100644
index dc4ed51978..0000000000
--- a/mappings/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings</artifactId>
-
- <name>Apache Isis Mappings</name>
- <description>
- Libraries and tools to map one bounded context (usually an Apache Isis application) to some other BC (usually
- _not_ an Apache Isis application).
- </description>
-
- <packaging>pom</packaging>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings</git-plugin.propertiesDir>
- </properties>
-
-</project>
-
-
diff --git a/pom.xml b/pom.xml
index 5789b16fb7..7995d2d0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
<module>bom</module>
<module>core</module>
<module>extensions</module>
- <module>mappings</module>
<module>mavendeps</module>
<module>starters</module>
<module>subdomains</module>
@@ -87,7 +86,6 @@
<module>bom</module>
<module>core</module>
<module>extensions</module>
- <module>mappings</module>
<module>mavendeps</module>
<module>starters</module>
<module>subdomains</module>
diff --git a/regressiontests/incubating/pom.xml b/regressiontests/incubating/pom.xml
index 6d24bbbcf3..95beebf793 100644
--- a/regressiontests/incubating/pom.xml
+++ b/regressiontests/incubating/pom.xml
@@ -82,12 +82,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient-applib</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-viewer-restfulobjects-client</artifactId>
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/isis/viewer/restfulobjects/client/RestfulClient.java b/viewers/restfulobjects/client/src/main/java/org/apache/isis/viewer/restfulobjects/client/RestfulClient.java
index 1115ed2581..ebe9a4f96b 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/isis/viewer/restfulobjects/client/RestfulClient.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/isis/viewer/restfulobjects/client/RestfulClient.java
@@ -60,7 +60,7 @@ clientConfig.setUseRequestDebugLogging(true); // default = false
RestfulClient client = RestfulClient.ofConfig(clientConfig);
* </pre></blockquote>
*
- * Example:
+ * Make a Request and then digest the Response:
* <blockquote><pre>{@code
Builder request = client.request(