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 11:17:57 UTC
[isis] 08/21: ISIS-2259: adds in parent module for restclient and
jaxrsclient (in mappings)
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 3c45d34c7eef5d1f077f5e9a45321d32e6a24de2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:05:13 2020 +0000
ISIS-2259: adds in parent module for restclient and jaxrsclient (in mappings)
---
examples/smoketests/pom.xml | 2 +-
mappings/jaxrsclient/{impl => api}/pom.xml | 14 +++++--------
.../api}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/jaxrsclient/nav.adoc | 0
.../main/doc/modules/jaxrsclient/pages/about.adoc | 0
.../modules/jaxrsclient/partials/module-nav.adoc | 0
.../api/IsisModuleExtJaxRsClientApi.java} | 4 ++--
mappings/jaxrsclient/{impl => }/pom.xml | 24 ++++++----------------
mappings/pom.xml | 10 ++++-----
mappings/restclient/{impl => api}/pom.xml | 9 +++++++-
.../api}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/restclient/nav.adoc | 0
.../main/doc/modules/restclient/pages/about.adoc | 0
.../modules/restclient/partials/module-nav.adoc | 0
.../restclient/ActionParameterListBuilder.java | 0
.../restclient/IsisModuleExtRestClient.java | 0
.../isis/extensions/restclient/ResponseDigest.java | 0
.../isis/extensions/restclient/RestfulClient.java | 0
.../extensions/restclient/RestfulClientConfig.java | 0
.../restclient/RestfulClientException.java | 0
.../isis/extensions/restclient/ScalarValueDto.java | 0
.../restclient/auth/BasicAuthFilter.java | 0
.../restclient/log/RestfulLoggingFilter.java | 0
mappings/restclient/{impl => }/pom.xml | 20 +++++-------------
24 files changed, 31 insertions(+), 52 deletions(-)
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 4b71911..62b6289 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/api/pom.xml
similarity index 82%
copy from mappings/jaxrsclient/impl/pom.xml
copy to mappings/jaxrsclient/api/pom.xml
index ff9d914..1c7ee0b 100644
--- a/mappings/jaxrsclient/impl/pom.xml
+++ b/mappings/jaxrsclient/api/pom.xml
@@ -16,23 +16,19 @@
<parent>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings</artifactId>
+ <artifactId>isis-mappings-jaxrsclient</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client</name>
-
- <description>Integrates JaxRS Client Library</description>
+ <artifactId>isis-mappings-jaxrsclient-api</artifactId>
+ <name>Apache Isis Map - JaxRS Client (api)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.api</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/api</git-plugin.propertiesDir>
</properties>
<dependencies>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/mappings/restclient/impl/src/main/doc/antora.yml b/mappings/jaxrsclient/api/src/main/doc/antora.yml
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/antora.yml
rename to mappings/jaxrsclient/api/src/main/doc/antora.yml
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java b/mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
similarity index 91%
rename from mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
rename to mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
index af8a507..57b4594 100644
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
+++ b/mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.jaxrsclient.impl;
+package org.apache.isis.extensions.jaxrsclient.api;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtJaxRsClientImpl {
+public class IsisModuleExtJaxRsClientApi {
}
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/pom.xml
similarity index 68%
rename from mappings/jaxrsclient/impl/pom.xml
rename to mappings/jaxrsclient/pom.xml
index ff9d914..22a32b9 100644
--- a/mappings/jaxrsclient/impl/pom.xml
+++ b/mappings/jaxrsclient/pom.xml
@@ -18,27 +18,15 @@
<groupId>org.apache.isis.mappings</groupId>
<artifactId>isis-mappings</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client</name>
-
+ <artifactId>isis-mappings-jaxrsclient</artifactId>
+ <name>Apache Isis Map - JaxRS Client (parent)</name>
<description>Integrates JaxRS Client Library</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>5.2.2.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <modules>
+ <module>api</module>
+ </modules>
</project>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 56a086d..32953e7 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -64,13 +64,13 @@
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
+ <artifactId>isis-mappings-jaxrsclient-api</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -86,10 +86,8 @@
</dependencyManagement>
<modules>
-<!--
- <module>jaxrsclient/impl</module>
--->
- <module>restclient/impl</module>
+ <module>jaxrsclient/api</module>
+ <module>restclient</module>
</modules>
<profiles>
diff --git a/mappings/restclient/impl/pom.xml b/mappings/restclient/api/pom.xml
similarity index 88%
copy from mappings/restclient/impl/pom.xml
copy to mappings/restclient/api/pom.xml
index ab88f0f..1866235 100644
--- a/mappings/restclient/impl/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
<name>Apache Isis Ext - REST Client</name>
<description>A client for the Restful Objects Viewer</description>
@@ -37,6 +37,13 @@
<artifactId>isis-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>5.2.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/mappings/jaxrsclient/impl/src/main/doc/antora.yml b/mappings/restclient/api/src/main/doc/antora.yml
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/antora.yml
rename to mappings/restclient/api/src/main/doc/antora.yml
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/nav.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/nav.adoc
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/pages/about.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/pages/about.adoc
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/partials/module-nav.adoc
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
diff --git a/mappings/restclient/impl/pom.xml b/mappings/restclient/pom.xml
similarity index 74%
rename from mappings/restclient/impl/pom.xml
rename to mappings/restclient/pom.xml
index ab88f0f..e5f69fc 100644
--- a/mappings/restclient/impl/pom.xml
+++ b/mappings/restclient/pom.xml
@@ -18,25 +18,15 @@
<groupId>org.apache.isis.mappings</groupId>
<artifactId>isis-mappings</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-mappings-restclient</artifactId>
- <name>Apache Isis Ext - REST Client</name>
+ <name>Apache Isis Ext - REST Client (parent)</name>
<description>A client for the Restful Objects Viewer</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.restclient</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/restclient</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>api</module>
+ </modules>
</project>