[jboss-cvs] jboss-seam/src/main/org/jboss/seam/persistence ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 13:45:57 EDT 2007
User: gavin
Date: 07/06/20 13:45:57
Modified: src/main/org/jboss/seam/persistence
EntityManagerFactory.java Filter.java
HibernatePersistenceProvider.java
HibernateSessionFactory.java
ManagedHibernateSession.java
ManagedPersistenceContext.java
PersistenceContexts.java PersistenceProvider.java
Log:
refactored interception annotations
Revision Changes Path
1.2 +3 -5 jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EntityManagerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- EntityManagerFactory.java 19 Jun 2007 19:02:36 -0000 1.1
+++ EntityManagerFactory.java 20 Jun 2007 17:45:57 -0000 1.2
@@ -1,8 +1,6 @@
-//$Id: EntityManagerFactory.java,v 1.1 2007/06/19 19:02:36 gavin Exp $
+//$Id: EntityManagerFactory.java,v 1.2 2007/06/20 17:45:57 gavin Exp $
package org.jboss.seam.persistence;
-import static org.jboss.seam.InterceptionType.NEVER;
-
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
@@ -14,10 +12,10 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.util.Naming;
/**
@@ -27,7 +25,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Startup
public class EntityManagerFactory
{
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/persistence/Filter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Filter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/Filter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Filter.java 19 Jun 2007 19:02:36 -0000 1.1
+++ Filter.java 20 Jun 2007 17:45:57 -0000 1.2
@@ -3,11 +3,10 @@
import java.util.Map;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.core.Expressions.ValueExpression;
/**
@@ -19,7 +18,7 @@
* @see ManagedPersistenceContext
* @author Gavin King
*/
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Scope(ScopeType.APPLICATION)
public class Filter
{
1.14 +2 -3 jboss-seam/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernatePersistenceProvider.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- HibernatePersistenceProvider.java 19 Jun 2007 19:02:36 -0000 1.13
+++ HibernatePersistenceProvider.java 20 Jun 2007 17:45:57 -0000 1.14
@@ -13,14 +13,13 @@
import org.hibernate.StaleStateException;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.type.VersionType;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.core.Expressions.ValueExpression;
/**
@@ -32,7 +31,7 @@
*/
@Name("org.jboss.seam.persistence.persistenceProvider")
@Scope(ScopeType.STATELESS)
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=FRAMEWORK, classDependencies="org.hibernate.Session", genericDependencies=ManagedPersistenceContext.class)
public class HibernatePersistenceProvider extends PersistenceProvider
{
1.2 +3 -5 jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernateSessionFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- HibernateSessionFactory.java 19 Jun 2007 19:02:36 -0000 1.1
+++ HibernateSessionFactory.java 20 Jun 2007 17:45:57 -0000 1.2
@@ -1,8 +1,6 @@
-//$Id: HibernateSessionFactory.java,v 1.1 2007/06/19 19:02:36 gavin Exp $
+//$Id: HibernateSessionFactory.java,v 1.2 2007/06/20 17:45:57 gavin Exp $
package org.jboss.seam.persistence;
-import static org.jboss.seam.InterceptionType.NEVER;
-
import java.io.File;
import java.util.Hashtable;
import java.util.List;
@@ -17,10 +15,10 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.security.HibernateSecurityInterceptor;
import org.jboss.seam.util.Naming;
@@ -54,7 +52,7 @@
* @author Christian Bauer
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Startup
public class HibernateSessionFactory
{
1.3 +3 -5 jboss-seam/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedHibernateSession.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ManagedHibernateSession.java 20 Jun 2007 08:36:11 -0000 1.2
+++ ManagedHibernateSession.java 20 Jun 2007 17:45:57 -0000 1.3
@@ -1,8 +1,6 @@
-//$Id: ManagedHibernateSession.java,v 1.2 2007/06/20 08:36:11 gavin Exp $
+//$Id: ManagedHibernateSession.java,v 1.3 2007/06/20 17:45:57 gavin Exp $
package org.jboss.seam.persistence;
-import static org.jboss.seam.InterceptionType.NEVER;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -22,9 +20,9 @@
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.FlushModeType;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.async.LocalTransactionListener;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
@@ -44,7 +42,7 @@
* @author Gavin King
*/
@Scope(ScopeType.CONVERSATION)
- at Intercept(NEVER)
+ at BypassInterceptors
public class ManagedHibernateSession
implements Serializable, HttpSessionActivationListener, Mutable, PersistenceContextManager, Synchronization
{
1.3 +3 -5 jboss-seam/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedPersistenceContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ManagedPersistenceContext.java 20 Jun 2007 08:36:11 -0000 1.2
+++ ManagedPersistenceContext.java 20 Jun 2007 17:45:57 -0000 1.3
@@ -1,8 +1,6 @@
-//$Id: ManagedPersistenceContext.java,v 1.2 2007/06/20 08:36:11 gavin Exp $
+//$Id: ManagedPersistenceContext.java,v 1.3 2007/06/20 17:45:57 gavin Exp $
package org.jboss.seam.persistence;
-import static org.jboss.seam.InterceptionType.NEVER;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -21,9 +19,9 @@
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.async.LocalTransactionListener;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
@@ -43,7 +41,7 @@
* @author Gavin King
*/
@Scope(ScopeType.CONVERSATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(false)
public class ManagedPersistenceContext
implements Serializable, HttpSessionActivationListener, Mutable, PersistenceContextManager, Synchronization
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/persistence/PersistenceContexts.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistenceContexts.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/PersistenceContexts.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PersistenceContexts.java 19 Jun 2007 19:02:36 -0000 1.1
+++ PersistenceContexts.java 20 Jun 2007 17:45:57 -0000 1.2
@@ -1,6 +1,5 @@
package org.jboss.seam.persistence;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -12,15 +11,15 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.AbstractMutable;
@Name("org.jboss.seam.persistence.persistenceContexts")
@Scope(ScopeType.CONVERSATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN)
public class PersistenceContexts extends AbstractMutable implements Serializable
{
1.15 +2 -3 jboss-seam/src/main/org/jboss/seam/persistence/PersistenceProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistenceProvider.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/PersistenceProvider.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PersistenceProvider.java 19 Jun 2007 19:02:36 -0000 1.14
+++ PersistenceProvider.java 20 Jun 2007 17:45:57 -0000 1.15
@@ -10,13 +10,12 @@
import org.jboss.seam.Component;
import org.jboss.seam.Entity;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* Abstraction layer for persistence providers (JPA implementations).
@@ -29,7 +28,7 @@
*/
@Name("org.jboss.seam.persistence.persistenceProvider")
@Scope(ScopeType.STATELESS)
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, genericDependencies=ManagedPersistenceContext.class)
public class PersistenceProvider
{
More information about the jboss-cvs-commits
mailing list