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 2020/12/22 14:01:17 UTC
[isis] branch master updated: ISIS-2033: 'jdo-integration' move
exception recognizers to 'jdo-datanuclues'
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 13965a4 ISIS-2033: 'jdo-integration' move exception recognizers to 'jdo-datanuclues'
13965a4 is described below
commit 13965a4cb0f64a5b73f60fa5a80d7faba60b9014
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Dec 22 14:56:50 2020 +0100
ISIS-2033: 'jdo-integration' move exception recognizers to
'jdo-datanuclues'
---
.../jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java | 10 ++++++++++
.../ExceptionRecognizerForJDODataStoreException.java | 2 +-
.../ExceptionRecognizerForJDODataStoreExceptionAbstract.java | 0
...ntegrityConstraintViolationForeignKeyNoActionException.java | 2 +-
.../ExceptionRecognizerForJDOObjectNotFoundException.java | 2 +-
...rSQLIntegrityConstraintViolationUniqueOrIndexException.java | 2 +-
.../jdo/integration/exceprecog/JdoNestedExceptionResolver.java | 0
.../persistence/jdo/integration/IsisModuleJdoIntegration.java | 5 +----
8 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
index 14d11c1..ee2779b 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
@@ -32,6 +32,10 @@ import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleu
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionLong;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_datanucleusVersionTimestamp;
import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_downloadJdoMetadata;
+import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDODataStoreException;
+import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException;
+import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForJDOObjectNotFoundException;
+import org.apache.isis.persistence.jdo.integration.exceprecog.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException;
@Configuration
@Import({
@@ -44,6 +48,12 @@ import org.apache.isis.persistence.jdo.datanucleus.mixins.Persistable_downloadJd
Persistable_datanucleusVersionTimestamp.class,
Persistable_downloadJdoMetadata.class,
+ // @Service's
+ ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.class,
+ ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.class,
+ ExceptionRecognizerForJDOObjectNotFoundException.class,
+ ExceptionRecognizerForJDODataStoreException.class,
+
})
public class IsisModuleJdoProviderDatanucleus {
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
similarity index 96%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
index a2327e3..09984f5 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreException.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
@Service
-@Named("isisJdoDn5.ExceptionRecognizerForJDODataStoreException")
+@Named("isisJdoDn.ExceptionRecognizerForJDODataStoreException")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class ExceptionRecognizerForJDODataStoreException
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
similarity index 100%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionAbstract.java
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 94%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
index 8688177..dabcbba 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
@Service
-@Named("isisJdoDn5.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException")
+@Named("isisJdoDn.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 95%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
index 4a6c2f9..498765a 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
@Service
-@Named("isisJdoDn5.ExceptionRecognizerForJDOObjectNotFoundException")
+@Named("isisJdoDn.ExceptionRecognizerForJDOObjectNotFoundException")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class ExceptionRecognizerForJDOObjectNotFoundException
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 95%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
index 528723d..314d669 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
@Service
-@Named("isisJdoDn5.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException")
+@Named("isisJdoDn.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java
similarity index 100%
rename from persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/integration/exceprecog/JdoNestedExceptionResolver.java
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
index bdd9efe..67b9f03 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/IsisModuleJdoIntegration.java
@@ -49,10 +49,7 @@ import org.apache.isis.persistence.jdo.metamodel.IsisModuleJdoMetamodel;
// @Service's
DataNucleusSettings.class,
- ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.class,
- ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.class,
- ExceptionRecognizerForJDOObjectNotFoundException.class,
- ExceptionRecognizerForJDODataStoreException.class,
+
IsisJdoSupportDN5.class,
IsisPlatformTransactionManagerForJdo.class,