[jboss-cvs] jboss-seam/src/main/org/jboss/seam/navigation ...

[Gavin King]

  User: gavin   
  Date: 07/06/19 16:08:13

  Modified:    src/main/org/jboss/seam/navigation     Pageflow.java
                        Pages.java Param.java SafeActions.java
  Log:
  more repackaging
  
  Revision  Changes    Path
  1.2       +4 -4      jboss-seam/src/main/org/jboss/seam/navigation/Pageflow.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pageflow.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Pageflow.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Pageflow.java	19 Jun 2007 19:13:55 -0000	1.1
  +++ Pageflow.java	19 Jun 2007 20:08:13 -0000	1.2
  @@ -25,7 +25,7 @@
   import org.jboss.seam.core.Events;
   import org.jboss.seam.faces.FacesMessages;
   import org.jboss.seam.faces.FacesPage;
  -import org.jboss.seam.faces.JsfManager;
  +import org.jboss.seam.faces.FacesManager;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.pageflow.Page;
  @@ -45,9 +45,9 @@
    */
   @Scope(ScopeType.CONVERSATION)
   @PerNestedConversation
  - at Name("org.jboss.seam.core.pageflow")
  + at Name("org.jboss.seam.navigation.pageflow")
   @Intercept(NEVER)
  - at Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN)
  + at Install(dependencies="org.jboss.seam.core.jbpm", precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
   public class Pageflow extends AbstractMutable implements Serializable
   {
      private static final long serialVersionUID = -2337682140346213333L;
  @@ -243,7 +243,7 @@
       */
      protected void redirect(Page page)
      {
  -      JsfManager.instance().redirect( getViewId(page) );
  +      FacesManager.instance().redirect( getViewId(page) );
      }
   
      /**
  
  
  
  1.2       +2 -2      jboss-seam/src/main/org/jboss/seam/navigation/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Pages.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Pages.java	19 Jun 2007 19:13:55 -0000	1.1
  +++ Pages.java	19 Jun 2007 20:08:13 -0000	1.2
  @@ -63,8 +63,8 @@
    */
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
  - at Name("org.jboss.seam.core.pages")
  - at Install(precedence=BUILT_IN)
  + at Name("org.jboss.seam.navigation.pages")
  + at Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
   public class Pages
   {   
      private static final LogProvider log = Logging.getLogProvider(Pages.class);
  
  
  
  1.3       +2 -2      jboss-seam/src/main/org/jboss/seam/navigation/Param.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Param.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Param.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Param.java	19 Jun 2007 19:41:44 -0000	1.2
  +++ Param.java	19 Jun 2007 20:08:13 -0000	1.3
  @@ -10,7 +10,7 @@
   import javax.faces.validator.ValidatorException;
   
   import org.jboss.seam.core.Expressions.ValueExpression;
  -import org.jboss.seam.faces.JsfExpressions;
  +import org.jboss.seam.faces.FacesExpressions;
   
   public final class Param
   {
  @@ -195,7 +195,7 @@
         
         if (valueExpression!=null)
         {
  -         JsfExpressions.instance().validate( valueExpression.getExpressionString(), value );
  +         FacesExpressions.instance().validate( valueExpression.getExpressionString(), value );
         }
         
         return value;
  
  
  
  1.2       +2 -2      jboss-seam/src/main/org/jboss/seam/navigation/SafeActions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SafeActions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/SafeActions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SafeActions.java	19 Jun 2007 19:13:55 -0000	1.1
  +++ SafeActions.java	19 Jun 2007 20:08:13 -0000	1.2
  @@ -23,8 +23,8 @@
   
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
  - at Name("org.jboss.seam.core.safeActions")
  - at Install(precedence=BUILT_IN)
  + at Name("org.jboss.seam.navigation.safeActions")
  + at Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
   public class SafeActions
   {