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 2018/03/01 11:09:51 UTC
[isis] branch master updated: ISIS-1841 move QueryResultCache from
applib to eventbus-guava
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 5630291 ISIS-1841 move QueryResultCache from applib to eventbus-guava
5630291 is described below
commit 5630291472134623224c5939ac5228dba4272b8c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 1 12:09:47 2018 +0100
ISIS-1841 move QueryResultCache from applib to eventbus-guava
should be ported back into applib, once we know how
applib now has no more dependency on guava!
---
core/applib-legacy/pom.xml | 9 +++++----
core/applib/pom.xml | 15 ---------------
core/plugins/discovery-reflections/pom.xml | 2 +-
.../{discovery-reflections => eventbus-axon}/pom.xml | 14 +++++++++-----
.../{discovery-reflections => eventbus-guava}/pom.xml | 10 +++++-----
.../queryresultscache/QueryResultsCacheUsingGuava.java} | 0
.../services/queryresultscache/QueryResultsCacheTest.java | 0
7 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/core/applib-legacy/pom.xml b/core/applib-legacy/pom.xml
index bec8544..5a779bd 100644
--- a/core/applib-legacy/pom.xml
+++ b/core/applib-legacy/pom.xml
@@ -21,9 +21,10 @@
<artifactId>isis-core-applib-legacy</artifactId>
- <name>Apache Applib Legacy 1.x</name>
- <description>
- Isis legacy module, to easy transition from v 1.x to 2.x.
+ <name>Apache Isis AppLib (Legacy)</name>
+ <description>
+ Isis application library, defining annotations and utilities for the
+ default (Java) programming model. (Legacy of Apache 1.x)
</description>
<properties>
@@ -52,7 +53,7 @@
</build>
<dependencies>
- <!-- compile dependencies -->
+ <!-- compile dependencies (applib-legacy only) -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index ea3f9da..0e530a9 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -95,16 +95,6 @@
<dependencies>
- <!--
- removal in progress
- last remaining compile dependency is for guava's event bus
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-schema</artifactId>
@@ -131,11 +121,6 @@
</dependency>
<dependency>
- <groupId>org.axonframework</groupId>
- <artifactId>axon-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<optional>true</optional>
diff --git a/core/plugins/discovery-reflections/pom.xml b/core/plugins/discovery-reflections/pom.xml
index 760e67d..4d12c77 100644
--- a/core/plugins/discovery-reflections/pom.xml
+++ b/core/plugins/discovery-reflections/pom.xml
@@ -21,7 +21,7 @@
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <name>Apache Isis Discovery Plugin</name>
+ <name>Apache Isis Discovery Plugin (Reflections)</name>
<description>
Class discovery plugin using reflections.org.
</description>
diff --git a/core/plugins/discovery-reflections/pom.xml b/core/plugins/eventbus-axon/pom.xml
similarity index 85%
copy from core/plugins/discovery-reflections/pom.xml
copy to core/plugins/eventbus-axon/pom.xml
index 760e67d..9a1703c 100644
--- a/core/plugins/discovery-reflections/pom.xml
+++ b/core/plugins/eventbus-axon/pom.xml
@@ -19,16 +19,16 @@
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
- <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <artifactId>isis-core-plugins-eventbus-axon</artifactId>
- <name>Apache Isis Discovery Plugin</name>
+ <name>Apache Isis Eventbus Plugin (Axon)</name>
<description>
- Class discovery plugin using reflections.org.
+ Eventbus plugin using the axon framework.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.plugins.discovery-reflections</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/plugins/discovery-reflections</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.plugins.eventbus-axon</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/plugins/eventbus-axon</git-plugin.propertiesDir>
</properties>
<build>
@@ -53,6 +53,10 @@
<dependencies>
<!-- compile dependencies -->
<dependency>
+ <groupId>org.axonframework</groupId>
+ <artifactId>axon-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
diff --git a/core/plugins/discovery-reflections/pom.xml b/core/plugins/eventbus-guava/pom.xml
similarity index 88%
copy from core/plugins/discovery-reflections/pom.xml
copy to core/plugins/eventbus-guava/pom.xml
index 760e67d..abc7ff5 100644
--- a/core/plugins/discovery-reflections/pom.xml
+++ b/core/plugins/eventbus-guava/pom.xml
@@ -19,16 +19,16 @@
<version>2.0.0-M1-SNAPSHOT</version>
</parent>
- <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <name>Apache Isis Discovery Plugin</name>
+ <name>Apache Isis Eventbus Plugin (Guava)</name>
<description>
- Class discovery plugin using reflections.org.
+ Eventbus plugin using google guava.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.plugins.discovery-reflections</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/plugins/discovery-reflections</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.plugins.eventbus-guava</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/plugins/eventbus-guava</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
rename to core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java b/core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
rename to core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.