Repository: tomee Updated Branches: refs/heads/master bcda96d58 -> a8b111da7
adding validationMode and cacheMode to @AutoJPA Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a8b111da Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a8b111da Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a8b111da Branch: refs/heads/master Commit: a8b111da711024e514f7e164121a8406335b2651 Parents: bcda96d Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Wed Apr 22 20:43:54 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Wed Apr 22 20:43:54 2015 +0200 ---------------------------------------------------------------------- container/openejb-api/pom.xml | 4 ++++ .../java/org/apache/openejb/api/configuration/AutoJPA.java | 4 ++++ .../java/org/apache/openejb/config/ConfigurationDeployer.java | 2 ++ .../java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java | 7 +++++++ 4 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/a8b111da/container/openejb-api/pom.xml ---------------------------------------------------------------------- diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml index c05c44e..b81c05c 100644 --- a/container/openejb-api/pom.xml +++ b/container/openejb-api/pom.xml @@ -36,6 +36,10 @@ <artifactId>mbean-annotation-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.openejb</groupId> + <artifactId>javaee-api</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/a8b111da/container/openejb-api/src/main/java/org/apache/openejb/api/configuration/AutoJPA.java ---------------------------------------------------------------------- diff --git a/container/openejb-api/src/main/java/org/apache/openejb/api/configuration/AutoJPA.java b/container/openejb-api/src/main/java/org/apache/openejb/api/configuration/AutoJPA.java index 15eebcb..72d9fde 100644 --- a/container/openejb-api/src/main/java/org/apache/openejb/api/configuration/AutoJPA.java +++ b/container/openejb-api/src/main/java/org/apache/openejb/api/configuration/AutoJPA.java @@ -20,6 +20,8 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import javax.persistence.SharedCacheMode; +import javax.persistence.ValidationMode; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -32,4 +34,6 @@ public @interface AutoJPA { String[] properties() default {}; boolean ddlAuto() default true; boolean jta() default true; + ValidationMode validationMode() default ValidationMode.AUTO; + SharedCacheMode cacheMode() default SharedCacheMode.UNSPECIFIED; } http://git-wip-us.apache.org/repos/asf/tomee/blob/a8b111da/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationDeployer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationDeployer.java index 680c2ad..22f2e01 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationDeployer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationDeployer.java @@ -90,6 +90,8 @@ public class ConfigurationDeployer implements DynamicDeployer { if (!"auto".equals(annotation.provider())) { unit.setProvider(annotation.provider()); } + unit.setValidationMode(annotation.validationMode()); + unit.setSharedCacheMode(annotation.cacheMode()); final Persistence persistence = new Persistence(); persistence.addPersistenceUnit(unit); http://git-wip-us.apache.org/repos/asf/tomee/blob/a8b111da/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java index 37bec00..ba4fbea 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java @@ -285,4 +285,11 @@ public class PersistenceUnit { return (validationMode == null) ? ValidationMode.AUTO : validationMode; } + public void setValidationMode(final ValidationMode validationMode) { + this.validationMode = validationMode; + } + + public void setSharedCacheMode(final SharedCacheMode sharedCacheMode) { + this.sharedCacheMode = sharedCacheMode; + } }