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 2017/10/16 10:44:29 UTC
[isis] 05/38: ISIS-1742: moves applib.events.system to
applib.fixturescripts.events
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ab0cd26cf9bd580f416135d1fc59212be6387b77
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 12 07:48:26 2017 +0100
ISIS-1742: moves applib.events.system to applib.fixturescripts.events
---
.../system => fixturescripts/events}/FixturesInstalledEvent.java | 2 +-
.../system => fixturescripts/events}/FixturesInstallingEvent.java | 2 +-
.../isis/applib/services/fixturespec/FixtureScriptsDefault.java | 4 ++--
.../isis/applib/services/queryresultscache/QueryResultsCache.java | 4 ++--
.../isis/applib/services/queryresultscache/QueryResultsCacheTest.java | 2 +-
.../apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java | 4 ++--
todo-deprecation-list.txt | 3 ++-
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstalledEvent.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstalledEvent.java
index 83060c3..5d3aa83 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstalledEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstalledEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events.system;
+package org.apache.isis.applib.fixturescripts.events;
import java.util.EventObject;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstallingEvent.java
similarity index 95%
rename from core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java
rename to core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstallingEvent.java
index 812c4e6..00f6de2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/system/FixturesInstallingEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/events/FixturesInstallingEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.events.system;
+package org.apache.isis.applib.fixturescripts.events;
import java.util.EventObject;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index 9137b62..007bdc9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
-import org.apache.isis.applib.events.system.FixturesInstalledEvent;
-import org.apache.isis.applib.events.system.FixturesInstallingEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.fixturescripts.FixtureResult;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index c339b54..7c3f7ea 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.AbstractSubscriber;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.events.system.FixturesInstalledEvent;
-import org.apache.isis.applib.events.system.FixturesInstallingEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.services.WithTransactionScope;
/**
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
index d0e99cf..0076c3b 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Callable;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.events.system.FixturesInstallingEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 8ef8aba..62c724a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -27,8 +27,8 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.events.system.FixturesInstalledEvent;
-import org.apache.isis.applib.events.system.FixturesInstallingEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
+import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.fixtures.CompositeFixture;
import org.apache.isis.applib.fixtures.FixtureType;
import org.apache.isis.applib.fixtures.InstallableFixture;
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 3df71ec..54f3fbf 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -260,7 +260,8 @@ DONE (ADDED)
DONE (MOVED)
- org.apache.isis.applib.events - move to services.wrapper.events. (Still useful as provide context for exceptions).
+ org.apache.isis.applib.events - moved to services.wrapper.events. (Still useful as provide context for exceptions, for a "transcript" framework).
+ org.apache.isis.applib.events.system - move to fixturescripts.events.
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.