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 2019/03/07 19:36:16 UTC
[isis] branch 2033-IoC updated: ISIS-2033: removing JDO API from
'applib'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new afd73bf ISIS-2033: removing JDO API from 'applib'
afd73bf is described below
commit afd73bf9cb339c9295ae3646b259f27d5f793a91
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 7 20:36:09 2019 +0100
ISIS-2033: removing JDO API from 'applib'
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
core/applib/pom.xml | 9 ---------
.../java/org/apache/isis/applib/AppManifest.java | 2 --
.../apache/isis/applib/annotation/Collection.java | 2 --
.../apache/isis/applib/annotation/Property.java | 2 --
.../exceprecog/ExceptionRecognizerForType.java | 23 +++++++++++-----------
.../applib/services/metrics/MetricsService.java | 2 --
core/integtestsupport/pom.xml | 4 ++++
core/legacy/transition-1-2/pom.xml | 6 ++++++
.../teardown/TeardownFixtureAbstract.java | 0
.../teardown/TeardownFixtureAbstract2.java | 0
.../applib/services/jdosupport/IsisJdoSupport.java | 0
.../applib/services/jdosupport/package-info.java | 0
12 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index c6b1a3e..75e0cf3 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -70,15 +70,6 @@
<artifactId>isis-core-schema</artifactId>
</dependency>
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index 43f0107..38a4376 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -26,8 +26,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.stream.Stream;
-import javax.jdo.annotations.PersistenceCapable;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.commons.internal.collections._Lists;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
index 42ad362..d3a39d9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Collection.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.jdo.annotations.NotPersistent;
-
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 51591a7..918d3ac 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -25,8 +25,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.jdo.annotations.NotPersistent;
-
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandDto;
import org.apache.isis.applib.conmap.ContentMappingServiceForCommandsDto;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
index a36317c..515bc77 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
@@ -22,8 +22,6 @@ import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
-import javax.jdo.JDODataStoreException;
-
import org.apache.isis.commons.internal.exceptions._Exceptions;
/**
@@ -67,16 +65,17 @@ public class ExceptionRecognizerForType extends ExceptionRecognizerAbstract {
if(throwableMessage != null && throwableMessage.contains(message)) {
return false;
}
- if(throwable instanceof JDODataStoreException) {
- final JDODataStoreException jdoDataStoreException = (JDODataStoreException) throwable;
- final Throwable[] nestedExceptions = jdoDataStoreException.getNestedExceptions();
- for (Throwable nestedException : nestedExceptions) {
- final String nestedThrowableMessage = nestedException.getMessage();
- if(nestedThrowableMessage != null && nestedThrowableMessage.contains(message)) {
- return false;
- }
- }
- }
+//FIXME [2033] removed here, should be in 'jdo-common'
+// if(throwable instanceof JDODataStoreException) {
+// final JDODataStoreException jdoDataStoreException = (JDODataStoreException) throwable;
+// final Throwable[] nestedExceptions = jdoDataStoreException.getNestedExceptions();
+// for (Throwable nestedException : nestedExceptions) {
+// final String nestedThrowableMessage = nestedException.getMessage();
+// if(nestedThrowableMessage != null && nestedThrowableMessage.contains(message)) {
+// return false;
+// }
+// }
+// }
}
}
return true;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java b/core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
index 1297445..7a3ac57 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metrics/MetricsService.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.applib.services.metrics;
-import javax.jdo.listener.InstanceLifecycleEvent;
-
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 5f69f46..6637e43 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -53,6 +53,10 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
+ </dependency>
<!-- JUPITER -->
<dependency>
diff --git a/core/legacy/transition-1-2/pom.xml b/core/legacy/transition-1-2/pom.xml
index 57c987b..be4373d 100644
--- a/core/legacy/transition-1-2/pom.xml
+++ b/core/legacy/transition-1-2/pom.xml
@@ -83,6 +83,12 @@
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-common</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!-- TEST DEPENDENCY -->
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
rename to core/plugins/jdo-common/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
rename to core/plugins/jdo-common/src/main/java/org/apache/isis/applib/fixturescripts/teardown/TeardownFixtureAbstract2.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
rename to core/plugins/jdo-common/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/package-info.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/applib/services/jdosupport/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/package-info.java
rename to core/plugins/jdo-common/src/main/java/org/apache/isis/applib/services/jdosupport/package-info.java