[jboss-cvs] jboss-seam/trinidad/src/org/jboss/seam/trinidad ...

[Gavin King]

  User: gavin   
  Date: 07/06/20 13:46:54

  Modified:    trinidad/src/org/jboss/seam/trinidad   
                        EntityKeyManager.java
                        HibernateEntityKeyManager.java
                        TrinidadJsfProvider.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.2       +2 -3      jboss-seam/trinidad/src/org/jboss/seam/trinidad/EntityKeyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityKeyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/trinidad/src/org/jboss/seam/trinidad/EntityKeyManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EntityKeyManager.java	15 Apr 2007 17:45:44 -0000	1.1
  +++ EntityKeyManager.java	20 Jun 2007 17:46:54 -0000	1.2
  @@ -1,7 +1,6 @@
   package org.jboss.seam.trinidad;
   
   import static org.jboss.seam.ScopeType.PAGE;
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.util.ArrayList;
  @@ -11,7 +10,7 @@
   
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Transactional;
  @@ -26,7 +25,7 @@
   
   @Name("org.jboss.seam.trinidad.entityKeyManager")
   @Scope(PAGE)
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Install(precedence=BUILT_IN)
   public class EntityKeyManager extends AbstractMutable
   {
  
  
  
  1.2       +2 -3      jboss-seam/trinidad/src/org/jboss/seam/trinidad/HibernateEntityKeyManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateEntityKeyManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/trinidad/src/org/jboss/seam/trinidad/HibernateEntityKeyManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- HibernateEntityKeyManager.java	15 Apr 2007 17:45:44 -0000	1.1
  +++ HibernateEntityKeyManager.java	20 Jun 2007 17:46:54 -0000	1.2
  @@ -1,7 +1,6 @@
   package org.jboss.seam.trinidad;
   
   import static org.jboss.seam.ScopeType.PAGE;
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.util.ArrayList;
  @@ -10,7 +9,7 @@
   import org.hibernate.Session;
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Transactional;
  @@ -25,7 +24,7 @@
   
   @Name("org.jboss.seam.trinidad.hibernateEntityKeyManager")
   @Scope(PAGE)
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Install(precedence=BUILT_IN)
   public class HibernateEntityKeyManager extends AbstractMutable
   {
  
  
  
  1.2       +2 -3      jboss-seam/trinidad/src/org/jboss/seam/trinidad/TrinidadJsfProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TrinidadJsfProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/trinidad/src/org/jboss/seam/trinidad/TrinidadJsfProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TrinidadJsfProvider.java	15 Apr 2007 17:45:44 -0000	1.1
  +++ TrinidadJsfProvider.java	20 Jun 2007 17:46:54 -0000	1.2
  @@ -1,13 +1,12 @@
   package org.jboss.seam.trinidad;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.ScopeType.STATELESS;
   import static org.jboss.seam.annotations.Install.FRAMEWORK;
   
   import javax.faces.model.DataModel;
   
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.framework.EntityQuery;
  @@ -24,7 +23,7 @@
   @Name("org.jboss.seam.jsf.jsfProvider")
   @Install(precedence=FRAMEWORK, classDependencies="org.apache.myfaces.trinidad.component.UIXComponent")
   @Scope(STATELESS)
  - at Intercept(NEVER)
  + at BypassInterceptors
   public class TrinidadJsfProvider extends JsfProvider
   {