JBoss Community

User: sebersole
  Date: 05/08/26 13:33:44

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  added jbpm ids
  
  Revision  Changes    Path
  1.3       +265 -235  jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Manager.java	26 Aug 2005 09:05:56 -0000	1.2
  +++ Manager.java	26 Aug 2005 17:33:44 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: Manager.java,v 1.2 2005/08/26 09:05:56 gavin Exp $
  +//$Id: Manager.java,v 1.3 2005/08/26 17:33:44 sebersole Exp $
   package org.jboss.seam.core;
   
   import java.util.HashMap;
  @@ -29,6 +29,8 @@
      public static final String CONVERSATION_ID_MAP = NAME + ".conversationIdActivityMap";
      public static final String CONVERSATION_OWNER_NAME = NAME + ".conversationOwnerName";
      public static final String CONVERSATION_ID = NAME + ".conversationId";
  +   public static final String TASK_ID = NAME + ".jbpmTaskId";
  +   public static final String PROCESS_ID = NAME + ".jbpmProcessId";
         
      //A map of all conversations for the session,
      //to the last activity time, which is flushed
  @@ -48,6 +50,29 @@
      
      private int conversationTimeout = 600000; //10 minutes
   
  +   private Long taskId;
  +   private Long processId;
  +
  +   public Long getTaskId()
  +   {
  +      return taskId;
  +   }
  +
  +   public void setTaskId(Long taskId)
  +   {
  +      this.taskId = taskId;
  +   }
  +
  +   public Long getProcessId()
  +   {
  +      return processId;
  +   }
  +
  +   public void setProcessId(Long processId)
  +   {
  +      this.processId = processId;
  +   }
  +
      public int getConversationTimeout()
      {
         return conversationTimeout;
  @@ -202,6 +227,9 @@
            //even if the session is invalid, still put the id in the map,
            //so it can be cleaned up along with all the other conversations
            addConversationId(conversationId);
  +
  +         attributes.put( TASK_ID, taskId );
  +         attributes.put( PROCESS_ID, processId );
         }
         else 
         {
  @@ -222,6 +250,8 @@
            log.info("Restoring conversation with id: " + storedConversationId);
            setLongRunningConversation(true);
            currentConversationId = storedConversationId;
  +         taskId = ( Long ) attributes.get( TASK_ID );
  +         processId = ( Long ) attributes.get( PROCESS_ID );
         }
         else
         {

User: sebersole
  Date: 05/08/26 17:41:49

  Modified:    src/main/org/jboss/seam/core  JbpmProcess.java
  Log:
  jBPM tasks and processes as components
  
  Revision  Changes    Path
  1.3       +2 -2      jboss-seam/src/main/org/jboss/seam/core/JbpmProcess.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JbpmProcess.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/JbpmProcess.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- JbpmProcess.java	26 Aug 2005 21:38:41 -0000	1.2
  +++ JbpmProcess.java	26 Aug 2005 21:41:49 -0000	1.3
  @@ -24,9 +24,9 @@
    * Implementation of JbpmProcess.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
  -@...( ScopeType.EVENT )
  +@Scope( ScopeType.APPLICATION )
   @Name( "org.jbpm.graph.exe.ProcessInstance" )
   public class JbpmProcess
   {

User: gavin   
  Date: 05/08/28 16:57:50

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  improvements to conversation handling, esp fixed bug in timeout
  
  Revision  Changes    Path
  1.4       +28 -14    jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Manager.java	26 Aug 2005 17:33:44 -0000	1.3
  +++ Manager.java	28 Aug 2005 20:57:50 -0000	1.4
  @@ -1,4 +1,4 @@
  -//$Id: Manager.java,v 1.3 2005/08/26 17:33:44 sebersole Exp $
  +//$Id: Manager.java,v 1.4 2005/08/28 20:57:50 gavin Exp $
   package org.jboss.seam.core;
   
   import java.util.HashMap;
  @@ -150,7 +150,9 @@
            {
               String conversationId = entry.getKey();
               log.info("conversation timeout for conversation: " + conversationId);
  -            Contexts.destroy( new ConversationContext( session, conversationId ) );
  +            ConversationContext conversationContext = new ConversationContext( session, conversationId );
  +            conversationContext.clear();
  +            Contexts.destroy( conversationContext );
               iter.remove();
               dirty();
            }
  @@ -215,28 +217,40 @@
      {
         if ( isLongRunningConversation() ) 
         {
  -         String conversationId = currentConversationId;
  -         log.info("Storing conversation state: " + conversationId);
  +         log.info("Storing conversation state: " + currentConversationId);
            if ( !Seam.isSessionInvalid() ) 
            {
               //if the session is invalid, don't put the conversation id
               //in the view, 'cos we are expecting the conversation to
               //be destroyed by the servlet session listener
  -            attributes.put(CONVERSATION_ID, conversationId);
  +            attributes.put(CONVERSATION_ID, currentConversationId);
  +            if (taskId==null)
  +            {
  +               attributes.remove(TASK_ID);
            }
  -         //even if the session is invalid, still put the id in the map,
  -         //so it can be cleaned up along with all the other conversations
  -         addConversationId(conversationId);
  -
  +            else
  +            {
            attributes.put( TASK_ID, taskId );
  +            }
  +            if (processId==null)
  +            {
  +               attributes.remove(PROCESS_ID);
  +            }
  +            else
  +            {
            attributes.put( PROCESS_ID, processId );
         }
  +         }
  +         //even if the session is invalid, still put the id in the map,
  +         //so it can be cleaned up along with all the other conversations
  +         addConversationId(currentConversationId);
  +      }
         else 
         {
  -         String conversationId = currentConversationId;
  -         log.info("Discarding conversation state: " + conversationId);
  +         log.info("Discarding conversation state: " + currentConversationId);
            attributes.remove(CONVERSATION_ID);
  -         removeConversationId(conversationId);
  +         //TODO: should we also remove task and process ids here?
  +         removeConversationId(currentConversationId);
         }
      }
      
  @@ -250,8 +264,8 @@
            log.info("Restoring conversation with id: " + storedConversationId);
            setLongRunningConversation(true);
            currentConversationId = storedConversationId;
  -         taskId = ( Long ) attributes.get( TASK_ID );
  -         processId = ( Long ) attributes.get( PROCESS_ID );
  +         taskId = (Long) attributes.get( TASK_ID );
  +         processId = (Long) attributes.get( PROCESS_ID );
         }
         else
         {

User: gavin   
  Date: 05/09/06 15:02:39

  Modified:    src/main/org/jboss/seam/core  JbpmTask.java
  Log:
  import
  
  Revision  Changes    Path
  1.6       +1 -2      jboss-seam/src/main/org/jboss/seam/core/JbpmTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JbpmTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/JbpmTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- JbpmTask.java	29 Aug 2005 12:49:58 -0000	1.5
  +++ JbpmTask.java	6 Sep 2005 19:02:39 -0000	1.6
  @@ -10,7 +10,6 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  -import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  @@ -23,7 +22,7 @@
    * Implementation of JbpmTask.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "org.jbpm.taskmgmt.exe.TaskInstance" )

User: gavin   
  Date: 05/09/08 19:58:09

  Modified:    src/main/org/jboss/seam/core  ManagedDataSource.java
  Log:
  added needed classes from jboss.jar
  
  Revision  Changes    Path
  1.2       +2 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedDataSource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedDataSource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedDataSource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ManagedDataSource.java	8 Sep 2005 22:27:35 -0000	1.1
  +++ ManagedDataSource.java	8 Sep 2005 23:58:09 -0000	1.2
  @@ -1,12 +1,12 @@
  -//$Id: ManagedDataSource.java,v 1.1 2005/09/08 22:27:35 gavin Exp $
  +//$Id: ManagedDataSource.java,v 1.2 2005/09/08 23:58:09 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import javax.naming.InitialContext;
   
  -import org.jboss.naming.NonSerializableFactory;
   import org.jboss.naming.Util;
  +import org.jboss.naming.NonSerializableFactory;
   import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource;
   import org.jboss.resource.connectionmanager.TransactionSynchronizer;
   import org.jboss.seam.Component;

User: gavin   
  Date: 05/09/08 21:28:00

  Modified:    src/main/org/jboss/seam/core  ManagedDataSource.java
  Log:
  introduced @Startup components
  
  Revision  Changes    Path
  1.3       +4 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedDataSource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedDataSource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedDataSource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ManagedDataSource.java	8 Sep 2005 23:58:09 -0000	1.2
  +++ ManagedDataSource.java	9 Sep 2005 01:28:00 -0000	1.3
  @@ -1,12 +1,12 @@
  -//$Id: ManagedDataSource.java,v 1.2 2005/09/08 23:58:09 gavin Exp $
  +//$Id: ManagedDataSource.java,v 1.3 2005/09/09 01:28:00 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import javax.naming.InitialContext;
   
  -import org.jboss.naming.Util;
   import org.jboss.naming.NonSerializableFactory;
  +import org.jboss.naming.Util;
   import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource;
   import org.jboss.resource.connectionmanager.TransactionSynchronizer;
   import org.jboss.seam.Component;
  @@ -15,12 +15,14 @@
   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.tm.TxManager;
   import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
   import org.jnp.server.SingletonNamingServer;
   
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
  +@Startup
   public class ManagedDataSource
   {
      //private static final Logger log = Logger.getLogger(JTADatasource.class);

User: gavin   
  Date: 05/09/08 23:00:20

  Added:       src/main/org/jboss/seam/core  Ejb.java
  Log:
  fixed a bug calling create methods
  made embedded ejb run as a seam component
  
  Revision  Changes    Path
  1.1      date: 2005/09/09 03:00:20;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  Index: Ejb.java
  ===================================================================
  //$Id: Ejb.java,v 1.1 2005/09/09 03:00:20 gavin Exp $
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
  import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
  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.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Startup;
  
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Startup
  @Name("org.jboss.seam.core.ejb")
  public class Ejb
  {
     private static EJB3StandaloneDeployer deployer;
     
     @Create
     public void startup() throws Exception
     {
        EJB3StandaloneBootstrap.boot(null);
  
        deployer = new EJB3StandaloneDeployer();
        deployer.getArchivesByResource().add("META-INF/persistence.xml");
  
        // need to set the InitialContext properties that deployer will use
        // to initial EJB containers
        //deployer.setJndiProperties(getInitialContextProperties());
  
        deployer.create();
        deployer.start();
     }
     
     @Destroy
     public void shutdown() throws Exception
     {
        deployer.stop();
        deployer.destroy();
        deployer = null;
     }
  }

User: gavin   
  Date: 05/09/09 03:05:49

  Modified:    src/main/org/jboss/seam/core  Hibernate.java
  Log:
  use .cfg.xml
  
  Revision  Changes    Path
  1.2       +2 -18     jboss-seam/src/main/org/jboss/seam/core/Hibernate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hibernate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Hibernate.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Hibernate.java	9 Sep 2005 05:50:21 -0000	1.1
  +++ Hibernate.java	9 Sep 2005 07:05:49 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: Hibernate.java,v 1.1 2005/09/09 05:50:21 gavin Exp $
  +//$Id: Hibernate.java,v 1.2 2005/09/09 07:05:49 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -28,9 +28,6 @@
   @Name("org.jboss.seam.core.hibernate")
   public class Hibernate
   {
  -   public static final String CLASS_NAMES = Seam.getComponentName(Hibernate.class) + ".classNames";
  -   
  -   private String[] classNames;
      private SessionFactory sf;
      
      @Unwrap
  @@ -47,15 +44,12 @@
         Component.getInstance( Seam.getComponentName(Tm.class), true );
         
         AnnotationConfiguration acfg = new AnnotationConfiguration();
  +      acfg.configure();
         
         //force datasource startup
         String datasourceName = acfg.getProperty(Environment.DATASOURCE);
         Component.getInstance( datasourceName, true );
         
  -      for (String clazz: classNames)
  -      {
  -         acfg.addAnnotatedClass( Class.forName(clazz) );
  -      }
         sf = acfg.buildSessionFactory();
         
      }
  @@ -66,14 +60,4 @@
         sf.close();
      }
   
  -   public String[] getClassNames()
  -   {
  -      return classNames;
  -   }
  -
  -   public void setClassNames(String[] classNames)
  -   {
  -      this.classNames = classNames;
  -   }
  -
   }

User: gavin   
  Date: 05/09/09 04:02:47

  Modified:    src/main/org/jboss/seam/core  Hibernate.java
  Log:
  minor
  
  Revision  Changes    Path
  1.3       +5 -1      jboss-seam/src/main/org/jboss/seam/core/Hibernate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hibernate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Hibernate.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Hibernate.java	9 Sep 2005 07:05:49 -0000	1.2
  +++ Hibernate.java	9 Sep 2005 08:02:47 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: Hibernate.java,v 1.2 2005/09/09 07:05:49 gavin Exp $
  +//$Id: Hibernate.java,v 1.3 2005/09/09 08:02:47 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -6,6 +6,7 @@
   import org.hibernate.SessionFactory;
   import org.hibernate.cfg.AnnotationConfiguration;
   import org.hibernate.cfg.Environment;
  +import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  @@ -28,6 +29,8 @@
   @Name("org.jboss.seam.core.hibernate")
   public class Hibernate
   {
  +   private static final Logger log = Logger.getLogger(Hibernate.class);
  +
      private SessionFactory sf;
      
      @Unwrap
  @@ -48,6 +51,7 @@
         
         //force datasource startup
         String datasourceName = acfg.getProperty(Environment.DATASOURCE);
  +      log.info("using datasource: " + datasourceName);
         Component.getInstance( datasourceName, true );
         
         sf = acfg.buildSessionFactory();

User: gavin   
  Date: 05/09/09 14:56:03

  Modified:    src/main/org/jboss/seam/core  Tm.java
  Log:
  put TM in JNDI for Hibernate to find it
  
  Revision  Changes    Path
  1.2       +4 -3      jboss-seam/src/main/org/jboss/seam/core/Tm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Tm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Tm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Tm.java	9 Sep 2005 05:50:21 -0000	1.1
  +++ Tm.java	9 Sep 2005 18:56:03 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: Tm.java,v 1.1 2005/09/09 05:50:21 gavin Exp $
  +//$Id: Tm.java,v 1.2 2005/09/09 18:56:03 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -41,13 +41,14 @@
         //force JNDI startup
         Component.getInstance( Seam.getComponentName(Jndi.class), true );
         
  -      //create a TransactionManager
  +      //create a TransactionManager and bind to JNDI
         tm = TxManager.getInstance();
         TransactionSynchronizer.setTransactionManager(tm);
  +      NonSerializableFactory.rebind( new InitialContext(), "java:/TransactionManager", tm );
         
         //create a UserTransaction and bind to JNDI
         ServerVMClientUserTransaction ut = new ServerVMClientUserTransaction(tm);
  -      NonSerializableFactory.rebind( new InitialContext(), "java:comp/UserTransaction", ut);
  +      NonSerializableFactory.rebind( new InitialContext(), "java:comp/UserTransaction", ut );
   
      }

User: gavin   
  Date: 05/09/09 15:22:26

  Modified:    src/main/org/jboss/seam/core  Hibernate.java
  Log:
  more flexible hibernate component
  
  Revision  Changes    Path
  1.4       +38 -5     jboss-seam/src/main/org/jboss/seam/core/Hibernate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hibernate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Hibernate.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Hibernate.java	9 Sep 2005 08:02:47 -0000	1.3
  +++ Hibernate.java	9 Sep 2005 19:22:26 -0000	1.4
  @@ -1,4 +1,4 @@
  -//$Id: Hibernate.java,v 1.3 2005/09/09 08:02:47 gavin Exp $
  +//$Id: Hibernate.java,v 1.4 2005/09/09 19:22:26 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -33,6 +33,9 @@
   
      private SessionFactory sf;
      
  +   private String cfgResourceName;
  +   private String dataSourceName;
  +   
      @Unwrap
      public SessionFactory getSessionFactory()
      {
  @@ -47,12 +50,22 @@
         Component.getInstance( Seam.getComponentName(Tm.class), true );
         
         AnnotationConfiguration acfg = new AnnotationConfiguration();
  +      if (cfgResourceName==null) 
  +      {
         acfg.configure();
  +      }
  +      else
  +      {
  +         acfg.configure(cfgResourceName);
  +      }
         
         //force datasource startup
  -      String datasourceName = acfg.getProperty(Environment.DATASOURCE);
  -      log.info("using datasource: " + datasourceName);
  -      Component.getInstance( datasourceName, true );
  +      if (dataSourceName==null)
  +      {
  +         dataSourceName = acfg.getProperty(Environment.DATASOURCE);
  +      }
  +      log.info("using datasource: " + dataSourceName);
  +      Component.getInstance( dataSourceName, true );
         
         sf = acfg.buildSessionFactory();
         
  @@ -64,4 +77,24 @@
         sf.close();
      }
   
  +   public String getCfgResourceName()
  +   {
  +      return cfgResourceName;
  +   }
  +
  +   public void setCfgResourceName(String cfgFileName)
  +   {
  +      this.cfgResourceName = cfgFileName;
  +   }
  +
  +   public String getDataSourceName()
  +   {
  +      return dataSourceName;
  +   }
  +
  +   public void setDataSourceName(String dataSourceName)
  +   {
  +      this.dataSourceName = dataSourceName;
  +   }
  +
   }

User: gavin   
  Date: 05/09/09 22:22:12

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  use seam.properties for ejb scanning
  
  Revision  Changes    Path
  1.4       +2 -2      jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Ejb.java	9 Sep 2005 05:50:21 -0000	1.3
  +++ Ejb.java	10 Sep 2005 02:22:12 -0000	1.4
  @@ -1,4 +1,4 @@
  -//$Id: Ejb.java,v 1.3 2005/09/09 05:50:21 gavin Exp $
  +//$Id: Ejb.java,v 1.4 2005/09/10 02:22:12 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -40,7 +40,7 @@
         EJB3StandaloneBootstrap.boot(null);
   
         deployer = new EJB3StandaloneDeployer();
  -      deployer.getArchivesByResource().add("META-INF/persistence.xml");
  +      deployer.getArchivesByResource().add("seam.properties");
   
         // need to set the InitialContext properties that deployer will use
         // to initial EJB containers

User: gavin   
  Date: 05/09/10 23:20:51

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  more renaming, made tests work
  
  Revision  Changes    Path
  1.6       +5 -5      jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Init.java	11 Sep 2005 03:02:27 -0000	1.5
  +++ Init.java	11 Sep 2005 03:20:51 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.5 2005/09/11 03:02:27 gavin Exp $
  +//$Id: Init.java,v 1.6 2005/09/11 03:20:51 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -22,10 +22,10 @@
   public class Init
   {
      private static final String NAME = Seam.getComponentName(Init.class);
  -   public static final String COMPONENT_CLASS_NAMES = NAME + ".componentClasses";
  -   public static final String PERSISTENCE_UNIT_NAMES = NAME + ".managedPersistenceContexts";
  -   public static final String SESSION_FACTORY_NAMES = NAME + ".managedSessions";
  -   public static final String DATA_SOURCE_NAMES = NAME + ".managedDatasources";
  +   public static final String COMPONENT_CLASSES = NAME + ".componentClasses";
  +   public static final String MANAGED_PERSISTENCE_CONTEXTS = NAME + ".managedPersistenceContexts";
  +   public static final String MANAGED_SESSIONS = NAME + ".managedSessions";
  +   public static final String MANAGED_DATA_SOURCES = NAME + ".managedDataSources";
      public static final String JBPM_SESSION_FACTORY_NAME = NAME + ".jbpmSessionFactoryName";
      
      private String[] managedPersistenceContexts = {};

User: gavin   
  Date: 05/09/12 19:33:05

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  added support for meta-inf/jboss-beans.xml
  
  Revision  Changes    Path
  1.5       +11 -2     jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Ejb.java	10 Sep 2005 02:22:12 -0000	1.4
  +++ Ejb.java	12 Sep 2005 23:33:05 -0000	1.5
  @@ -1,4 +1,4 @@
  -//$Id: Ejb.java,v 1.4 2005/09/10 02:22:12 gavin Exp $
  +//$Id: Ejb.java,v 1.5 2005/09/12 23:33:05 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -38,6 +38,15 @@
         
         log.info("starting the embedded EJB container");
         EJB3StandaloneBootstrap.boot(null);
  +      try
  +      {
  +         EJB3StandaloneBootstrap.deployXmlResource("META-INF/jboss-beans.xml");
  +      }
  +      catch (RuntimeException re)
  +      {
  +         log.warn("could not start components in jboss-beans.xml: " + re.getMessage());
  +         log.debug("could not start components in jboss-beans.xml", re);
  +      }
   
         deployer = new EJB3StandaloneDeployer();
         deployer.getArchivesByResource().add("seam.properties");

User: gavin   
  Date: 05/09/13 03:42:15

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  hush
  
  Revision  Changes    Path
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Manager.java	12 Sep 2005 17:03:10 -0000	1.7
  +++ Manager.java	13 Sep 2005 07:42:15 -0000	1.8
  @@ -1,4 +1,4 @@
  -//$Id: Manager.java,v 1.7 2005/09/12 17:03:10 gavin Exp $
  +//$Id: Manager.java,v 1.8 2005/09/13 07:42:15 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -241,7 +241,7 @@
      {
         if ( isLongRunningConversation() ) 
         {
  -         log.info("Storing conversation state: " + currentConversationId);
  +         log.debug("Storing conversation state: " + currentConversationId);
            if ( !Seam.isSessionInvalid() ) 
            {
               //if the session is invalid, don't put the conversation id

User: gavin   
  Date: 05/09/13 03:43:11

  Added:       src/main/org/jboss/seam/core  Hibernate.java
  Log:
  still need to be able to bootstrap hb
  
  Revision  Changes    Path
  1.9       +6 -29     jboss-seam/src/main/org/jboss/seam/core/Hibernate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hibernate.java
  ===================================================================
  RCS file: Hibernate.java
  diff -N Hibernate.java
  --- /dev/null	1 Jan 1970 00:00:00 -0000
  +++ Hibernate.java	13 Sep 2005 07:43:11 -0000	1.9
  @@ -0,0 +1,73 @@
  +//$Id: Hibernate.java,v 1.9 2005/09/13 07:43:11 gavin Exp $
  +package org.jboss.seam.core;
  +
  +import static org.jboss.seam.InterceptionType.NEVER;
  +
  +import org.hibernate.SessionFactory;
  +import org.hibernate.cfg.AnnotationConfiguration;
  +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.Name;
  +import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.annotations.Startup;
  +import org.jboss.seam.annotations.Unwrap;
  +
  +/**
  + * A seam component that boostraps a Hiberate SessionFactory
  + * 
  + * @author Gavin King
  + */
  +@Scope(ScopeType.APPLICATION)
  +@Intercept(NEVER)
  +@Startup(depends="org.jboss.seam.core.microcontainer")
  +@Name("org.jboss.seam.core.hibernate")
  +public class Hibernate
  +{
  +
  +   private SessionFactory sessionFactory;
  +   
  +   private String cfgResourceName;
  +   
  +   @Unwrap
  +   public SessionFactory getSessionFactory()
  +   {
  +      return sessionFactory;
  +   }
  +   
  +   @Create
  +   public void startup() throws Exception
  +   {
  +      
  +      AnnotationConfiguration acfg = new AnnotationConfiguration();
  +      if (cfgResourceName==null) 
  +      {
  +         acfg.configure();
  +      }
  +      else
  +      {
  +         acfg.configure(cfgResourceName);
  +      }
  +      
  +      sessionFactory = acfg.buildSessionFactory();
  +      
  +   }
  +   
  +   @Destroy
  +   public void shutdown()
  +   {
  +      sessionFactory.close();
  +   }
  +
  +   public String getCfgResourceName()
  +   {
  +      return cfgResourceName;
  +   }
  +
  +   public void setCfgResourceName(String cfgFileName)
  +   {
  +      this.cfgResourceName = cfgFileName;
  +   }
  +
  +}

User: gavin   
  Date: 05/09/13 11:59:58

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  don't force meta-inf
  
  Revision  Changes    Path
  1.6       +11 -10    jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Ejb.java	12 Sep 2005 23:33:05 -0000	1.5
  +++ Ejb.java	13 Sep 2005 15:59:58 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: Ejb.java,v 1.5 2005/09/12 23:33:05 gavin Exp $
  +//$Id: Ejb.java,v 1.6 2005/09/13 15:59:58 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -38,15 +38,8 @@
         
         log.info("starting the embedded EJB container");
         EJB3StandaloneBootstrap.boot(null);
  -      try
  -      {
  -         EJB3StandaloneBootstrap.deployXmlResource("META-INF/jboss-beans.xml");
  -      }
  -      catch (RuntimeException re)
  -      {
  -         log.warn("could not start components in jboss-beans.xml: " + re.getMessage());
  -         log.debug("could not start components in jboss-beans.xml", re);
  -      }
  +      deploy("META-INF/jboss-beans.xml");
  +      deploy("jboss-beans.xml");
         
         deployer = new EJB3StandaloneDeployer();
         deployer.getArchivesByResource().add("seam.properties");
  @@ -59,6 +52,14 @@
         deployer.start();
      }
      
  +   private void deploy(String name)
  +   {
  +      if ( Thread.currentThread().getContextClassLoader().getResource(name)!=null )
  +      {
  +         EJB3StandaloneBootstrap.deployXmlResource(name);
  +      }
  +   }
  +   
      @Destroy
      public void shutdown() throws Exception
      {

User: sebersole
  Date: 05/09/14 17:02:39

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmSession.java
  Log:
  new seam component name;
  added convenience methods
  
  Revision  Changes    Path
  1.6       +21 -2     jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmSession.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ManagedJbpmSession.java	12 Sep 2005 17:03:10 -0000	1.5
  +++ ManagedJbpmSession.java	14 Sep 2005 21:02:39 -0000	1.6
  @@ -22,15 +22,19 @@
   import org.jboss.seam.annotations.Unwrap;
   import org.jbpm.db.JbpmSession;
   import org.jbpm.db.JbpmSessionFactory;
  +import org.jbpm.taskmgmt.exe.TaskInstance;
  +import org.jbpm.graph.exe.ProcessInstance;
  +
  +import java.util.List;
   
   /**
    * Manages a reference to a JbpmSession
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   @Scope( ScopeType.EVENT )
  -@...( "org.jboss.seam.core.managedJbpmSession" )
  +@Name( "jbpmSession" )
   @Intercept(NEVER)
   public class ManagedJbpmSession
   {
  @@ -68,6 +72,21 @@
         }
      }
   
  +   public List getTaskInstanceList(String username)
  +   {
  +      return getJbpmSession().getTaskMgmtSession().findTaskInstances( username );
  +   }
  +
  +   public Object getTaskContextVariable(TaskInstance task, String variableName)
  +   {
  +      return getProcessContextVariable( task.getTaskMgmtInstance().getProcessInstance(), variableName );
  +   }
  +
  +   public Object getProcessContextVariable(ProcessInstance process, String variableName)
  +   {
  +      return process.getContextInstance().getVariable( variableName );
  +   }
  +
      private JbpmSessionFactory getSessionFactory()
      {
         InitialContext ctx = null;

User: sebersole
  Date: 05/09/14 23:00:28

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmSession.java
  Log:
  task list as sorta map for jsf el
  
  Revision  Changes    Path
  1.7       +80 -1     jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmSession.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ManagedJbpmSession.java	14 Sep 2005 21:02:39 -0000	1.6
  +++ ManagedJbpmSession.java	15 Sep 2005 03:00:28 -0000	1.7
  @@ -26,12 +26,15 @@
   import org.jbpm.graph.exe.ProcessInstance;
   
   import java.util.List;
  +import java.util.Map;
  +import java.util.Set;
  +import java.util.Collection;
   
   /**
    * Manages a reference to a JbpmSession
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmSession" )
  @@ -72,6 +75,82 @@
         }
      }
   
  +   /**
  +    * Exposes a users task list as a map to be more easily usable within
  +    * JSF EL.  Only the {@link Map#get} method is supported, where the
  +    * given key is expected to be the actorId for which to retreive
  +    * the task list: jbpmSession.taskLists['admin']
  +    *
  +    * @return the sorta map :)
  +    */
  +   public Map<String, List> getTaskLists()
  +   {
  +      return new Map<String, List>()
  +      {
  +
  +         public List get(Object key)
  +         {
  +            return getTaskInstanceList( ( String ) key );
  +         }
  +
  +         public int size()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public boolean isEmpty()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public boolean containsKey(Object key)
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public boolean containsValue(Object value)
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public List put(String key, List value)
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public List remove(Object key)
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public void putAll(Map<? extends String, ? extends List> t)
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public void clear()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public Set<String> keySet()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public Collection<List> values()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +
  +         public Set<Entry<String, List>> entrySet()
  +         {
  +            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         }
  +      };
  +
  +   }
  +
      public List getTaskInstanceList(String username)
      {
         return getJbpmSession().getTaskMgmtSession().findTaskInstances( username );

User: sebersole
  Date: 05/09/16 13:33:46

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmSession.java
  Log:
  removed explicit hibernate transaction calls as it caused issues plus seam is inherently jta
  
  Revision  Changes    Path
  1.8       +6 -103    jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmSession.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmSession.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ManagedJbpmSession.java	15 Sep 2005 03:00:28 -0000	1.7
  +++ ManagedJbpmSession.java	16 Sep 2005 17:33:46 -0000	1.8
  @@ -20,25 +20,19 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
  +
   import org.jbpm.db.JbpmSession;
   import org.jbpm.db.JbpmSessionFactory;
  -import org.jbpm.taskmgmt.exe.TaskInstance;
  -import org.jbpm.graph.exe.ProcessInstance;
  -
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Set;
  -import java.util.Collection;
   
   /**
  - * Manages a reference to a JbpmSession
  + * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmSession" )
  -@...)
  +@Intercept( NEVER )
   public class ManagedJbpmSession
   {
      private static final Logger log = Logger.getLogger( ManagedJbpmSession.class );
  @@ -60,7 +54,7 @@
      {
         if ( jbpmSession == null )
         {
  -         jbpmSession = getSessionFactory().openJbpmSessionAndBeginTransaction();
  +         jbpmSession = getSessionFactory().openJbpmSession();
         }
         return jbpmSession;
      }
  @@ -71,99 +65,8 @@
         log.debug( "destroying seam managed jbpm-session [" + jbpmSessionFactoryName + "]" );
         if ( jbpmSession != null )
         {
  -         jbpmSession.commitTransactionAndClose();
  -      }
  -   }
  -
  -   /**
  -    * Exposes a users task list as a map to be more easily usable within
  -    * JSF EL.  Only the {@link Map#get} method is supported, where the
  -    * given key is expected to be the actorId for which to retreive
  -    * the task list: jbpmSession.taskLists['admin']
  -    *
  -    * @return the sorta map :)
  -    */
  -   public Map<String, List> getTaskLists()
  -   {
  -      return new Map<String, List>()
  -      {
  -
  -         public List get(Object key)
  -         {
  -            return getTaskInstanceList( ( String ) key );
  -         }
  -
  -         public int size()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public boolean isEmpty()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public boolean containsKey(Object key)
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public boolean containsValue(Object value)
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public List put(String key, List value)
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public List remove(Object key)
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public void putAll(Map<? extends String, ? extends List> t)
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public void clear()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public Set<String> keySet()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -
  -         public Collection<List> values()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  +         jbpmSession.close();
            }
  -
  -         public Set<Entry<String, List>> entrySet()
  -         {
  -            throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
  -         }
  -      };
  -
  -   }
  -
  -   public List getTaskInstanceList(String username)
  -   {
  -      return getJbpmSession().getTaskMgmtSession().findTaskInstances( username );
  -   }
  -
  -   public Object getTaskContextVariable(TaskInstance task, String variableName)
  -   {
  -      return getProcessContextVariable( task.getTaskMgmtInstance().getProcessInstance(), variableName );
  -   }
  -
  -   public Object getProcessContextVariable(ProcessInstance process, String variableName)
  -   {
  -      return process.getContextInstance().getVariable( variableName );
      }
   
      private JbpmSessionFactory getSessionFactory()

User: gavin   
  Date: 05/09/17 05:10:09

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix bug in conversation timeout
  
  Revision  Changes    Path
  1.9       +2 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Manager.java	13 Sep 2005 07:42:15 -0000	1.8
  +++ Manager.java	17 Sep 2005 09:10:09 -0000	1.9
  @@ -1,4 +1,4 @@
  -//$Id: Manager.java,v 1.8 2005/09/13 07:42:15 gavin Exp $
  +//$Id: Manager.java,v 1.9 2005/09/17 09:10:09 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -180,8 +180,8 @@
               String conversationId = entry.getKey();
               log.debug("conversation timeout for conversation: " + conversationId);
               ConversationContext conversationContext = new ConversationContext( session, conversationId );
  -            conversationContext.clear();
               Contexts.destroy( conversationContext );
  +            conversationContext.clear();
               iter.remove();
               dirty();
            }

User: theute  
  Date: 05/10/03 10:59:16

  Modified:    src/main/org/jboss/seam/core  ManagedHibernateSession.java
  Log:
  "Fixed" broken JNDI issue
  
  Revision  Changes    Path
  1.7       +6 -9      jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedHibernateSession.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ManagedHibernateSession.java	30 Sep 2005 13:01:01 -0000	1.6
  +++ ManagedHibernateSession.java	3 Oct 2005 14:59:16 -0000	1.7
  @@ -1,4 +1,4 @@
  -//$Id: ManagedHibernateSession.java,v 1.6 2005/09/30 13:01:01 theute Exp $
  +//$Id: ManagedHibernateSession.java,v 1.7 2005/10/03 14:59:16 theute Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -7,7 +7,6 @@
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.io.Serializable;
  -import java.util.Hashtable;
   
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
  @@ -22,6 +21,7 @@
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.util.NamingHelper;
   
   /**
    * A Seam component that manages a conversation-scoped extended
  @@ -34,11 +34,13 @@
   @Intercept(NEVER)
   public class ManagedHibernateSession implements Serializable
   {
  +   /** The serialVersionUID */
  +   private static final long serialVersionUID = 3130309555079841107L;
  +
      private static final Logger log = Logger.getLogger(ManagedHibernateSession.class);
      
      private Session session;
      private String sessionFactoryName;
  -   private Hashtable initialContextProperties;
      
      @Create
      public void create(Component component)
  @@ -75,7 +77,7 @@
      private SessionFactory getSessionFactory(String persistenceUnit)
            throws NamingException
      {
  -      InitialContext initialContext = (initialContextProperties != null) ? new InitialContext(initialContextProperties) : new InitialContext();
  +      InitialContext initialContext = NamingHelper.getInitialContext();
         return (SessionFactory) initialContext.lookup(sessionFactoryName);
      }
      
  @@ -107,9 +109,4 @@
         if (session!=null && session.isConnected() ) session.disconnect();
         oos.defaultWriteObject();
      }
  -
  -   public void setInitialContextProperties(Hashtable initialContextProperties)
  -   {
  -      this.initialContextProperties = initialContextProperties;
  -   }
   }

User: gavin   
  Date: 05/10/04 07:37:14

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  changed default interception type
  
  Revision  Changes    Path
  1.10      +1 -14     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Manager.java	17 Sep 2005 09:10:09 -0000	1.9
  +++ Manager.java	4 Oct 2005 11:37:14 -0000	1.10
  @@ -1,4 +1,4 @@
  -//$Id: Manager.java,v 1.9 2005/09/17 09:10:09 gavin Exp $
  +//$Id: Manager.java,v 1.10 2005/10/04 11:37:14 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -52,9 +52,6 @@
      //Is the current conversation "long-running"?
      private boolean isLongRunningConversation;
      
  -   //Are we processing interceptors?
  -   private boolean processInterceptors = false;
  -   
      private int conversationTimeout = 600000; //10 minutes
   
      private Long taskId;
  @@ -227,16 +224,6 @@
         return instance;
      }
   
  -   public boolean isProcessInterceptors()
  -   {
  -      return processInterceptors;
  -   }
  -
  -   public void setProcessInterceptors(boolean processInterceptors)
  -   {
  -      this.processInterceptors = processInterceptors;
  -   }
  -   
      public void store(Map attributes)
      {
         if ( isLongRunningConversation() )

User: gavin   
  Date: 05/11/09 17:40:47

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  added @Factory
  allow @Unwrap on a session bean
  change scope of a DataModel created from a STATELESS component to be EVENT
  
  Revision  Changes    Path
  1.10      +28 -1     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Init.java	3 Oct 2005 14:24:29 -0000	1.9
  +++ Init.java	9 Nov 2005 22:40:47 -0000	1.10
  @@ -1,9 +1,14 @@
  -//$Id: Init.java,v 1.9 2005/10/03 14:24:29 theute Exp $
  +//$Id: Init.java,v 1.10 2005/11/09 22:40:47 gavin Exp $
   package org.jboss.seam.core;
   
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  +import java.lang.reflect.Method;
  +import java.util.HashMap;
  +import java.util.Map;
  +
  +import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Intercept;
  @@ -35,6 +40,8 @@
      private String[] managedDataSources = {};
      private boolean isClientSideConversations = false;
   
  +   private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
  +
      public String[] getManagedPersistenceContexts()
      {
         return managedPersistenceContexts;
  @@ -99,4 +106,24 @@
         this.isClientSideConversations = isClientSideConversations;
      }
   
  +   public FactoryMethod getFactory(String variable)
  +   {
  +	   return factories.get(variable);
  +   }
  +   
  +   public static class FactoryMethod {
  +	   public Method method;
  +	   public Component component;
  +	   FactoryMethod(Method method, Component component)
  +	   {
  +		   this.method = method;
  +		   this.component = component;
  +	   }
  +   }
  +   
  +   public void addFactoryMethod(String variable, Method method, Component component)
  +   {
  +	   factories.put( variable, new FactoryMethod(method, component) );
  +   }
  +
   }

User: gavin   
  Date: 05/11/10 02:12:31

  Added:       src/main/org/jboss/seam/core  Jbpm.java
  Log:
  moved jbpm component to core
  
  Revision  Changes    Path
  1.1      date: 2005/11/10 07:12:31;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  Index: Jbpm.java
  ===================================================================
  package org.jboss.seam.core;
  
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Intercept;
  import static org.jboss.seam.ScopeType.EVENT;
  import static org.jboss.seam.InterceptionType.NEVER;
  import org.jboss.seam.Component;
  import org.jboss.seam.core.ManagedJbpmSession;
  import org.jbpm.db.JbpmSession;
  
  import java.util.List;
  import java.util.Map;
  import java.util.Set;
  import java.util.Collection;
  
  /**
   * @author <a href="mailto:steve@... Ebersole </a>
   */
  @Name( "jbpm" )
  @Scope( EVENT )
  @Intercept( NEVER )
  public class Jbpm
  {
     /**
      * Exposes a users task list as a map to be more easily usable within
      * JSF EL.  Only the {@link java.util.Map#get} method is supported, where the
      * given key is expected to be the actorId for which to retreive
      * the task list: jbpmSession.taskLists['admin']
      *
      * @return the sorta map :)
      */
     public Map<String, List> getTaskLists()
     {
        return new Map<String, List>()
        {
  
           public List get(Object key)
           {
              return getTaskInstanceList( ( String ) key );
           }
  
           public int size()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public boolean isEmpty()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public boolean containsKey(Object key)
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public boolean containsValue(Object value)
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public List put(String key, List value)
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public List remove(Object key)
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public void putAll(Map<? extends String, ? extends List> t)
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public void clear()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public Set<String> keySet()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public Collection<List> values()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
  
           public Set<Entry<String, List>> entrySet()
           {
              throw new UnsupportedOperationException( "only a map to workaround jsf el limitation..." );
           }
        };
  
     }
  
     public List getTaskInstanceList(String username)
     {
        if ( username == null )
        {
           return null;
        }
        // TODO: in a real ootb component we'd also need to consider any pooled tasks
        // associated with the user...
        JbpmSession jbpmSession = ( JbpmSession ) Component.getInstance( ManagedJbpmSession.class, true );
        return jbpmSession.getTaskMgmtSession().findTaskInstances( username );
     }
  }

User: theute  
  Date: 05/11/28 09:09:14

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  Seam should now be Servlet/Portlet agnostic.
  By doing that we lost the Filter that closes request on exceptions. We should find another way of doing this. (The main problem is that there is 1 session per portlet, at the filter level we don't know which portlet's session to deal with)
  
  Revision  Changes    Path
  1.11      +14 -4     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Manager.java	4 Oct 2005 11:37:14 -0000	1.10
  +++ Manager.java	28 Nov 2005 14:09:14 -0000	1.11
  @@ -1,4 +1,9 @@
  -//$Id: Manager.java,v 1.10 2005/10/04 11:37:14 gavin Exp $
  +/*
  + * JBoss, Home of Professional Open Source
  + *
  + * Distributable under LGPL license.
  + * See terms of license at gnu.org.
  + */
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -8,7 +13,7 @@
   import java.util.Map;
   import java.util.Set;
   
  -import javax.servlet.http.HttpSession;
  +import javax.faces.context.ExternalContext;
   
   import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
  @@ -22,6 +27,11 @@
   import org.jboss.seam.contexts.ConversationContext;
   import org.jboss.seam.util.Id;
   
  +/**
  + * @author Gavin King
  + * @author <a href="mailto:theute@... Heute</a>
  + * @version $Revision: 1.11 $
  + */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
   @Intercept(NEVER)
  @@ -163,7 +173,7 @@
      /**
       * Clean up timed-out conversations
       */
  -   public void conversationTimeout(HttpSession session)
  +   public void conversationTimeout(ExternalContext externalContext)
      {
         long currentTime = System.currentTimeMillis();
         Map<String, Long> ids = getConversationIdMap();
  @@ -176,7 +186,7 @@
            {
               String conversationId = entry.getKey();
               log.debug("conversation timeout for conversation: " + conversationId);
  -            ConversationContext conversationContext = new ConversationContext( session, conversationId );
  +            ConversationContext conversationContext = new ConversationContext( externalContext, conversationId );
               Contexts.destroy( conversationContext );
               conversationContext.clear();
               iter.remove();

User: theute  
  Date: 05/11/28 11:09:40

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  Fixed bug introduced by latest commit (not checked by the TestSuite)
  
  Revision  Changes    Path
  1.12      +3 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Manager.java	28 Nov 2005 14:09:14 -0000	1.11
  +++ Manager.java	28 Nov 2005 16:09:40 -0000	1.12
  @@ -19,6 +19,7 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  +import org.jboss.seam.Session;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
  @@ -30,7 +31,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -186,7 +187,7 @@
            {
               String conversationId = entry.getKey();
               log.debug("conversation timeout for conversation: " + conversationId);
  -            ConversationContext conversationContext = new ConversationContext( externalContext, conversationId );
  +            ConversationContext conversationContext = new ConversationContext( Session.getSession(externalContext, true), conversationId );
               Contexts.destroy( conversationContext );
               conversationContext.clear();
               iter.remove();

User: gavin   
  Date: 05/12/08 20:27:05

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fixed bug where exception in one request broke subsequent requests
  properly set up all contexts at the start of a non-faces request
  allow conversational state that is set during the render response phase to be saved
  fixed a bug in pagination with components that use a DataModel
  
  Revision  Changes    Path
  1.13      +2 -1      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Manager.java	28 Nov 2005 16:09:40 -0000	1.12
  +++ Manager.java	9 Dec 2005 01:27:05 -0000	1.13
  @@ -14,6 +14,7 @@
   import java.util.Set;
   
   import javax.faces.context.ExternalContext;
  +import javax.faces.context.FacesContext;
   
   import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
  @@ -31,7 +32,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")

User: gavin   
  Date: 05/12/17 06:02:40

  Added:       src/main/org/jboss/seam/core  ResourceBundle.java
  Log:
  try to use the main resource bundle in Validator
  
  Revision  Changes    Path
  1.1      date: 2005/12/17 11:02:40;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
  
  Index: ResourceBundle.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import java.util.Locale;
  import java.util.MissingResourceException;
  
  import org.jboss.logging.Logger;
  import org.jboss.seam.Component;
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.Seam;
  import org.jboss.seam.annotations.Create;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Startup;
  import org.jboss.seam.annotations.Unwrap;
  
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Name("resourceBundle")
  @Startup
  public class ResourceBundle {
     private static final Logger log = Logger.getLogger(ResourceBundle.class);
  
     private String bundleName = "messages";
     private String language;
     private java.util.ResourceBundle bundle;
  
     public String getBundleName() 
     {
        return bundleName;
     }
  
     public void setBundleName(String bundleName) 
     {
        this.bundleName = bundleName;
     }
     
     @Create
     public void loadBundle() 
     {
        try
        {
           if (language==null) 
           {
              bundle = java.util.ResourceBundle.getBundle( bundleName, Locale.getDefault(), Thread.currentThread().getContextClassLoader() );
           }
           else
           {
              bundle = java.util.ResourceBundle.getBundle( bundleName, new Locale(language), Thread.currentThread().getContextClassLoader() );
           }
           log.info("loaded resource bundle: " + bundleName);
        }
        catch (MissingResourceException mre)
        {
           log.info("resource bundle missing: " + bundleName);
        }
     }
     
     @Unwrap
     public java.util.ResourceBundle getBundle()
     {
        return bundle;
     }
  
     public String getLanguage() 
     {
        return language;
     }
  
     public void setLanguage(String language) 
     {
        this.language = language;
     }
     
     public static java.util.ResourceBundle instance()
     {
        return (java.util.ResourceBundle) Component.getInstance( Seam.getComponentName(ResourceBundle.class), true );
     }
  }

User: gavin   
  Date: 05/12/17 08:02:57

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  removed dependencies to MyFaces internal implementation
  
  Revision  Changes    Path
  1.15      +2 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Manager.java	16 Dec 2005 07:12:01 -0000	1.14
  +++ Manager.java	17 Dec 2005 13:02:57 -0000	1.15
  @@ -19,19 +19,19 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  -import org.jboss.seam.Session;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.ConversationContext;
  +import org.jboss.seam.contexts.Session;
   import org.jboss.seam.util.Id;
   
   /**
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")

User: gavin   
  Date: 05/12/21 08:34:02

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  minor improvs for tests
  
  Revision  Changes    Path
  1.4       +2 -0      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Jbpm.java	20 Dec 2005 14:57:34 -0000	1.3
  +++ Jbpm.java	21 Dec 2005 13:34:02 -0000	1.4
  @@ -3,6 +3,7 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import org.jboss.seam.ScopeType;
  +import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Intercept;
  @@ -23,6 +24,7 @@
   @Name("org.jboss.seam.core.jbpm")
   public class Jbpm 
   {
  +   public static final String PROCESS_DEFINITIONS = Seam.getComponentName(Jbpm.class) + ".processDefinitions";
   
      private JbpmFactory jbpmFactory;
      private String[] processDefinitions;

User: gavin   
  Date: 05/12/22 11:46:32

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  allow 'new' as a special conversation id to trigger creation of a new conv
  
  Revision  Changes    Path
  1.20      +7 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- Manager.java	22 Dec 2005 13:29:23 -0000	1.19
  +++ Manager.java	22 Dec 2005 16:46:32 -0000	1.20
  @@ -32,7 +32,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.19 $
  + * @version $Revision: 1.20 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -269,11 +269,16 @@
            storedConversationId = (String) attributes.get(CONVERSATION_ID);
         }
         
  -      if (storedConversationId!=null) 
  +      else if (storedConversationId!=null) 
         {
            log.debug("Found conversation id in request parameter: " + storedConversationId);
         }
         
  +      if ( "new".equals(storedConversationId) )
  +      {
  +         storedConversationId = null;
  +      }
  +      
         boolean isStoredConversation = storedConversationId!=null && 
               getSessionConversationIds().contains(storedConversationId);
         if ( isStoredConversation )

User: gavin   
  Date: 05/12/26 19:42:54

  Added:       src/main/org/jboss/seam/core  TaskInstanceListForType.java
  Log:
  nested conversation model
  improvements to jBPM integration
  
  Revision  Changes    Path
  1.1      date: 2005/12/27 00:42:54;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/TaskInstanceListForType.java
  
  Index: TaskInstanceListForType.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  import static org.jboss.seam.ScopeType.EVENT;
  
  import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
  import org.jboss.seam.Component;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Unwrap;
  import org.jbpm.db.JbpmSession;
  import org.jbpm.taskmgmt.exe.TaskInstance;
  
  /**
   * @author <a href="mailto:steve@... Ebersole </a>
   * @author Gavin King
   */
  @Name( "taskInstanceListForType" )
  @Scope( EVENT )
  @Intercept( NEVER )
  public class TaskInstanceListForType
  {
     
     private Map cachedMap;
     
     @Unwrap
     public Map<String,List<TaskInstance>> getTaskInstanceList()
     {
        return getTaskInstanceList( Actor.instance().getId() );
     }
  
     private Map<String,List<TaskInstance>> getTaskInstanceList(String actorId)
     {
        if ( actorId == null ) return null;
        if (cachedMap==null) 
        {      
           Map<String, List<TaskInstance>> map = new HashMap<String, List<TaskInstance>>();
           JbpmSession jbpmSession = (JbpmSession) Component.getInstance(ManagedJbpmSession.class, true);
           List<TaskInstance> taskInstances = (List<TaskInstance>) jbpmSession.getTaskMgmtSession().findTaskInstances(actorId);
           for ( TaskInstance task: taskInstances )
           {
              String name = task.getName();
              List<TaskInstance> list = map.get(name);
              if (list==null)
              {
                 list = new ArrayList<TaskInstance>();
                 map.put(name, list);
              }
              list.add(task);
           }
           //TODO: jbpmSession.getTaskMgmtSession().findPooledTaskInstances(actorId);
           cachedMap = map;
        }
        return cachedMap;
     }
     
  }

User: gavin   
  Date: 05/12/29 01:08:55

  Modified:    src/main/org/jboss/seam/core  ConversationEntry.java
  Log:
  ability to destroy workspaces from conversation list
  
  Revision  Changes    Path
  1.5       +5 -0      jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ConversationEntry.java	29 Dec 2005 03:57:15 -0000	1.4
  +++ ConversationEntry.java	29 Dec 2005 06:08:55 -0000	1.5
  @@ -74,6 +74,11 @@
         this.startDatetime = created;
      }
   
  +   public String destroy() {
  +      Manager.instance().endConversation();
  +      return null;
  +   }
  +
      public String outcome() {
         return outcome;
      }

User: gavin   
  Date: 05/12/30 18:48:20

  Added:       src/main/org/jboss/seam/core  PageContext.java
  Log:
  added Seam PAGE context
  
  Revision  Changes    Path
  1.1      date: 2005/12/30 23:48:20;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/PageContext.java
  
  Index: PageContext.java
  ===================================================================
  //$Id: PageContext.java,v 1.1 2005/12/30 23:48:20 gavin Exp $
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Startup;
  import org.jboss.seam.annotations.Unwrap;
  import org.jboss.seam.contexts.Context;
  import org.jboss.seam.contexts.Contexts;
  
  /**
   * Support for injecting the page context
   * 
   * @author Gavin King
   */
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Startup
  @Name("pageContext")
  public class PageContext
  {
     @Unwrap
     public Context getContext()
     {
        return Contexts.isPageContextActive() ? 
              Contexts.getPageContext() : null;
     }
  }

User: gavin   
  Date: 06/01/02 08:50:14

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  more refinements to jBPM integration
  
  Revision  Changes    Path
  1.3       +4 -6      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ManagedJbpmContext.java	2 Jan 2006 08:01:38 -0000	1.2
  +++ ManagedJbpmContext.java	2 Jan 2006 13:50:14 -0000	1.3
  @@ -26,7 +26,7 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -41,7 +41,7 @@
      public void create(Component component) throws NamingException
      {
         jbpmContext = Jbpm.instance().getJbpmConfiguration().createJbpmContext();
  -      log.debug( "created seam managed jBPM session" );
  +      log.debug( "created seam managed jBPM context");
      }
   
      @Unwrap
  @@ -53,14 +53,12 @@
      @Destroy
      public void destroy()
      {
  -      /*log.debug( "flushing seam managed jBPM session" );
  -      jbpmContext.getSession().flush();*/
         org.jbpm.graph.exe.ProcessInstance processInstance = ProcessInstance.instance();
         if (processInstance!=null) 
         {
  -         ManagedJbpmContext.instance().save( processInstance );
  +         jbpmContext.save( processInstance );
         }
  -      log.debug( "destroying seam managed jBPM session" );
  +      log.debug( "destroying seam managed jBPM context" );
         jbpmContext.close();
      }

User: gavin   
  Date: 06/01/02 11:01:57

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  minor
  
  Revision  Changes    Path
  1.4       +5 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ManagedJbpmContext.java	2 Jan 2006 13:50:14 -0000	1.3
  +++ ManagedJbpmContext.java	2 Jan 2006 16:01:57 -0000	1.4
  @@ -26,7 +26,7 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -36,11 +36,13 @@
      private static final Logger log = Logger.getLogger(ManagedJbpmContext.class);
   
      private JbpmContext jbpmContext;
  +   //private int counter;
   
      @Create
  -   public void create(Component component) throws NamingException
  +   public void create() throws NamingException
      {
         jbpmContext = Jbpm.instance().getJbpmConfiguration().createJbpmContext();
  +      //counter++;
         log.debug( "created seam managed jBPM context");
      }
   
  @@ -59,6 +61,7 @@
            jbpmContext.save( processInstance );
         }
         log.debug( "destroying seam managed jBPM context" );
  +      //counter--;
         jbpmContext.close();
      }

User: gavin   
  Date: 06/01/02 21:05:39

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  simplify
  
  Revision  Changes    Path
  1.9       +19 -43    jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Jbpm.java	2 Jan 2006 07:44:34 -0000	1.8
  +++ Jbpm.java	3 Jan 2006 02:05:39 -0000	1.9
  @@ -63,48 +63,12 @@
         return jbpmConfiguration;
      }
   
  -   public String[] getProcessDefinitions() {
  -      return processDefinitions;
  -   }
  -
  -   public void setProcessDefinitions(String[] processDefinitions) {
  -      this.processDefinitions = processDefinitions;
  -   }
  -   
  -   /**
  -    * Dynamically load a new jBPM process definition from a resource at runtime.
  -    * 
  -    * @param resourceName the name of a resource containing the process definition
  -    * @param makeLatestVersion the loaded definition should be considered the latest version
  -    */
  -   public void deployProcessDefinition(String resourceName) {
  -      JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
  -      try
  -      {
  -         ProcessDefinition processDefinition = getProcessDefinitionFromResource(resourceName);
  -         jbpmContext.deployProcessDefinition(processDefinition);
  -         jbpmContext.getSession().flush(); //need to flush so the managed session can see the effect immediately
  -      }
  -      catch (RuntimeException e)
  -      {
  -         throw new RuntimeException("could not deploy process definition: " + resourceName, e);
  -      }
  -      finally
  -      {
  -         jbpmContext.close();
  -      }
  -   }
  -
  -   private void installPageflowDefinitions() {
  -      pageflowProcessDefinitions = new HashMap<String, ProcessDefinition>(pageflowDefinitions.length);
  -      for (String pageflow: pageflowDefinitions)
  +   public ProcessDefinition getPageflowProcessDefinition(String pageflowName)
         {
  -         ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
  -         pageflowProcessDefinitions.put( pd.getName(), pd );
  -      }
  +      return pageflowProcessDefinitions.get(pageflowName);
      }
      
  -   private ProcessDefinition getProcessDefinitionFromResource(String resourceName) {
  +   public ProcessDefinition getProcessDefinitionFromResource(String resourceName) {
         InputStream resource = Thread.currentThread().getContextClassLoader()
               .getResourceAsStream(resourceName);
         if (resource==null)
  @@ -122,9 +86,21 @@
         this.pageflowDefinitions = pageflowDefinitions;
      }
      
  -   public ProcessDefinition getPageflowDefinition(String pageflowName)
  +   public String[] getProcessDefinitions() {
  +      return processDefinitions;
  +   }
  +
  +   public void setProcessDefinitions(String[] processDefinitions) {
  +      this.processDefinitions = processDefinitions;
  +   }
  +   
  +   private void installPageflowDefinitions() {
  +      pageflowProcessDefinitions = new HashMap<String, ProcessDefinition>(pageflowDefinitions.length);
  +      for (String pageflow: pageflowDefinitions)
      {
  -      return pageflowProcessDefinitions.get(pageflowName);
  +         ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
  +         pageflowProcessDefinitions.put( pd.getName(), pd );
  +      }
      }
      
      private void installProcessDefinitions()

User: gavin   
  Date: 06/01/03 02:32:15

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  rollback jbpm where necessary
  
  Revision  Changes    Path
  1.5       +12 -4     jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ManagedJbpmContext.java	2 Jan 2006 16:01:57 -0000	1.4
  +++ ManagedJbpmContext.java	3 Jan 2006 07:32:15 -0000	1.5
  @@ -20,13 +20,14 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.contexts.Lifecycle;
   import org.jbpm.JbpmContext;
   
   /**
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -55,11 +56,18 @@
      @Destroy
      public void destroy()
      {
  +      if ( Lifecycle.isException() )
  +      {
  +         jbpmContext.setRollbackOnly();
  +      }
  +      else 
  +      {
         org.jbpm.graph.exe.ProcessInstance processInstance = ProcessInstance.instance();
         if (processInstance!=null) 
         {
            jbpmContext.save( processInstance );
         }
  +      }
         log.debug( "destroying seam managed jBPM context" );
         //counter--;
         jbpmContext.close();

User: gavin   
  Date: 06/01/04 00:51:06

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  added initiator to @Conversational
  method-level @Conversational
  fixed a bug when no jbpm installed
  
  Revision  Changes    Path
  1.31      +7 -4      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- Manager.java	4 Jan 2006 05:22:13 -0000	1.30
  +++ Manager.java	4 Jan 2006 05:51:06 -0000	1.31
  @@ -35,7 +35,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.30 $
  + * @version $Revision: 1.31 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -291,12 +291,15 @@
               //be destroyed by the servlet session listener
               attributes.put(CONVERSATION_ID, currentConversationId);
               
  +            if ( Init.instance().isJbpmInstalled() )
  +            {
               Pageflow pageflow = Pageflow.instance();
               if ( pageflow.isInProcess() )
               {
                  attributes.put( PAGEFLOW_COUNTER, pageflow.getPageflowCounter() );
               }
            }
  +         }
            //even if the session is invalid, still put the id in the map,
            //so it can be cleaned up along with all the other conversations
         }

User: gavin   
  Date: 06/01/04 22:54:29

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  make tests work
  
  Revision  Changes    Path
  1.35      +8 -5      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- Manager.java	5 Jan 2006 03:17:24 -0000	1.34
  +++ Manager.java	5 Jan 2006 03:54:28 -0000	1.35
  @@ -39,7 +39,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.34 $
  + * @version $Revision: 1.35 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -550,6 +550,8 @@
               //handle stuff defined in pages.xml
               String viewId = event.getFacesContext().getViewRoot().getViewId();
               Pages pages = Pages.instance();
  +            if (pages!=null) //for tests
  +            {
               if ( pages.hasDescription(viewId) )
               {
                  conversation.setDescription( pages.getDescription(viewId) );
  @@ -557,6 +559,7 @@
               }
               conversation.setTimeout( pages.getTimeout(viewId) );
            }
  +         }
            
         }
      }

User: gavin   
  Date: 06/01/06 05:15:49

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  fixed npe when conversations end and backbuttons pressed
  
  Revision  Changes    Path
  1.7       +8 -5      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Pageflow.java	6 Jan 2006 10:00:42 -0000	1.6
  +++ Pageflow.java	6 Jan 2006 10:15:49 -0000	1.7
  @@ -62,6 +62,8 @@
      
      public void validatePageflow(Map attributes) 
      {
  +      if ( processInstance!=null )
  +      {
         Integer counter = (Integer) attributes.get(Manager.PAGEFLOW_COUNTER);
         if ( counter!=null && getPageflowCounter()!=counter )
         {
  @@ -70,6 +72,7 @@
            context.renderResponse();
         }
      }
  +   }
      
      public Page getPage() 
      {

User: gavin   
  Date: 06/01/06 23:01:36

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  fix minor bugs in process mgmt stuff
  
  Revision  Changes    Path
  1.13      +7 -5      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Jbpm.java	6 Jan 2006 10:00:42 -0000	1.12
  +++ Jbpm.java	7 Jan 2006 04:01:36 -0000	1.13
  @@ -42,7 +42,7 @@
      private JbpmConfiguration jbpmConfiguration;
      private String[] processDefinitions;
      private String[] pageflowDefinitions;
  -   private Map<String, ProcessDefinition> pageflowProcessDefinitions;
  +   private Map<String, ProcessDefinition> pageflowProcessDefinitions = new HashMap<String, ProcessDefinition>();
      
      @Create
      public void startup() throws Exception
  @@ -95,13 +95,15 @@
      }
      
      private void installPageflowDefinitions() {
  -      pageflowProcessDefinitions = new HashMap<String, ProcessDefinition>(pageflowDefinitions.length);
  +      if ( pageflowDefinitions!=null )
  +      {
         for (String pageflow: pageflowDefinitions)
         {
            ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
            pageflowProcessDefinitions.put( pd.getName(), pd );
         }
      }
  +   }
      
      private void installProcessDefinitions()
      {

User: gavin   
  Date: 06/01/08 18:43:54

  Modified:    src/main/org/jboss/seam/core  Switcher.java
  Log:
  fixed npe in switcher
  
  Revision  Changes    Path
  1.8       +12 -5     jboss-seam/src/main/org/jboss/seam/core/Switcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Switcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Switcher.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Switcher.java	5 Jan 2006 02:43:07 -0000	1.7
  +++ Switcher.java	8 Jan 2006 23:43:54 -0000	1.8
  @@ -23,7 +23,7 @@
    * Support for the conversation switcher drop-down menu.
    * 
    * @author Gavin King
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   @Scope(ScopeType.PAGE)
   @Name("switcher")
  @@ -92,11 +92,18 @@
         }
         else
         {
  -         manager.swapConversation(conversationIdOrOutcome);
  +         boolean success = manager.swapConversation(conversationIdOrOutcome);
  +         if (success)
  +         {
            resultingConversationIdOrOutcome = manager.getCurrentConversationId();
            Manager.instance().redirect( manager.getCurrentConversationViewId() );
            actualOutcome = "org.jboss.seam.switch";
         }
  +         else
  +         {
  +            actualOutcome = null;
  +         }
  +      }
         Lifecycle.resumeConversation( FacesContext.getCurrentInstance().getExternalContext() ); //TODO: remove, unnecessary
         return actualOutcome;
      }

User: theute  
  Date: 06/01/11 03:33:02

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  - Make it work with JBoss Head (Branch_4_0)
  - Updated libraries
  - Updated persistence.xml
  
  Tomcat build is probably broken
  
  Revision  Changes    Path
  1.9       +60 -77    jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Ejb.java	20 Dec 2005 14:57:34 -0000	1.8
  +++ Ejb.java	11 Jan 2006 08:33:02 -0000	1.9
  @@ -1,12 +1,9 @@
  -//$Id: Ejb.java,v 1.8 2005/12/20 14:57:34 gavin Exp $
  +//$Id: Ejb.java,v 1.9 2006/01/11 08:33:02 theute Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  -import javax.naming.InitialContext;
  -
   import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
  -import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
   import org.jboss.logging.Logger;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
  @@ -15,8 +12,6 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  -import org.jboss.seam.util.NamingHelper;
  -import org.jboss.tm.TransactionManagerInitializer;
   
   /**
    * A seam component that bootstraps the embedded EJB container
  @@ -31,26 +26,16 @@
   {
      private static final Logger log = Logger.getLogger(Ejb.class);
      
  -   private EJB3StandaloneDeployer deployer;
  +   //private EJB3StandaloneDeployer deployer;
      
      @Create
      public void startup() throws Exception
      {
  -      
         log.info("starting the embedded EJB container");
         EJB3StandaloneBootstrap.boot(null);
         deploy("META-INF/jboss-beans.xml");
         deploy("jboss-beans.xml");
  -      
  -      deployer = new EJB3StandaloneDeployer();
  -      deployer.getArchivesByResource().add("seam.properties");
  -
  -      // need to set the InitialContext properties that deployer will use
  -      // to initial EJB containers
  -      deployer.setJndiProperties(NamingHelper.initialContextProperties);
  -      
  -      deployer.create();
  -      deployer.start();
  +      EJB3StandaloneBootstrap.scanClasspath();
      }
   
      private void deploy(String name)
  @@ -65,13 +50,11 @@
      public void shutdown() throws Exception
      {
         log.info("stopping the embedded EJB container");
  -      deployer.stop();
  -      InitialContext ctx = NamingHelper.getInitialContext();
  -      ctx.unbind(TransactionManagerInitializer.JNDI_NAME);
  -      ctx.unbind(TransactionManagerInitializer.JNDI_IMPORTER);
  -      ctx.unbind(TransactionManagerInitializer.JNDI_EXPORTER);
  -      deployer.destroy();
  -      deployer = null;
  +      try
  +      {
  +         EJB3StandaloneBootstrap.shutdown();
  +      }
  +      catch (Exception e) {}
      }
      
   }

User: gavin   
  Date: 06/01/11 23:54:37

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  rolled back changes to Ejb
  
  Revision  Changes    Path
  1.10      +26 -8     jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Ejb.java	11 Jan 2006 08:33:02 -0000	1.9
  +++ Ejb.java	12 Jan 2006 04:54:37 -0000	1.10
  @@ -1,9 +1,12 @@
  -//$Id: Ejb.java,v 1.9 2006/01/11 08:33:02 theute Exp $
  +//$Id: Ejb.java,v 1.10 2006/01/12 04:54:37 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  +import javax.naming.InitialContext;
  +
   import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
  +import org.jboss.ejb3.embedded.EJB3StandaloneDeployer;
   import org.jboss.logging.Logger;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
  @@ -12,6 +15,8 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  +import org.jboss.seam.util.NamingHelper;
  +import org.jboss.tm.TransactionManagerInitializer;
   
   /**
    * A seam component that bootstraps the embedded EJB container
  @@ -26,7 +31,7 @@
   {
      private static final Logger log = Logger.getLogger(Ejb.class);
      
  -   //private EJB3StandaloneDeployer deployer;
  +   private EJB3StandaloneDeployer deployer;
      
      @Create
      public void startup() throws Exception
  @@ -35,7 +40,17 @@
         EJB3StandaloneBootstrap.boot(null);
         deploy("META-INF/jboss-beans.xml");
         deploy("jboss-beans.xml");
  -      EJB3StandaloneBootstrap.scanClasspath();
  +      
  +      deployer = EJB3StandaloneBootstrap.createDeployer();
  +      deployer.getArchivesByResource().add("seam.properties");
  +      
  +      // need to set the InitialContext properties that deployer will use
  +      // to initial EJB containers
  +      deployer.setJndiProperties(NamingHelper.initialContextProperties);
  +      
  +      deployer.create();
  +      deployer.start();
  +      //EJB3StandaloneBootstrap.scanClasspath();
      }
   
      private void deploy(String name)
  @@ -50,11 +65,14 @@
      public void shutdown() throws Exception
      {
         log.info("stopping the embedded EJB container");
  -      try
  -      {
  -         EJB3StandaloneBootstrap.shutdown();
  -      }
  -      catch (Exception e) {}
  +      deployer.stop();
  +      InitialContext ctx = NamingHelper.getInitialContext();
  +      ctx.unbind(TransactionManagerInitializer.JNDI_NAME);
  +      ctx.unbind(TransactionManagerInitializer.JNDI_IMPORTER);
  +      ctx.unbind(TransactionManagerInitializer.JNDI_EXPORTER);
  +      deployer.destroy();
  +      deployer = null;
  +      //EJB3StandaloneBootstrap.shutdown();
      }
      
   }

User: gavin   
  Date: 06/01/12 00:57:57

  Modified:    src/main/org/jboss/seam/core  ManagedPersistenceContext.java
  Log:
  add jndi name config
  
  Revision  Changes    Path
  1.7       +21 -3     jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedPersistenceContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ManagedPersistenceContext.java	9 Dec 2005 04:55:39 -0000	1.6
  +++ ManagedPersistenceContext.java	12 Jan 2006 05:57:57 -0000	1.7
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.6 2005/12/09 04:55:39 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.7 2006/01/12 05:57:57 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -35,6 +35,7 @@
      
      private EntityManager entityManager;
      private String persistenceUnitName;
  +   private String jndiName;
      
      @Create
      public void create(Component component)
  @@ -74,9 +75,16 @@
      private EntityManagerFactory getEntityManagerFactory(String persistenceUnit)
            throws NamingException
      {
  +      if (jndiName==null)
  +      {
         return (EntityManagerFactory) NamingHelper.getInitialContext()
               .lookup("java:/EntityManagerFactories/" + persistenceUnit);
      }
  +      else
  +      {
  +          return (EntityManagerFactory) NamingHelper.getInitialContext().lookup(jndiName);
  +      }
  +   }
      
      public String toString()
      {
  @@ -92,4 +100,14 @@
      {
         this.persistenceUnitName = persistenceUnitName;
      }
  +
  +   public String getJndiName() 
  +   {
  +       return jndiName;
  +   }
  +    
  +   public void setJndiName(String jndiName) 
  +   {
  +       this.jndiName = jndiName;
  +   }
   }

User: gavin   
  Date: 06/01/12 06:44:11

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  use resolver
  
  Revision  Changes    Path
  1.14      +3 -0      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Jbpm.java	7 Jan 2006 04:01:36 -0000	1.13
  +++ Jbpm.java	12 Jan 2006 11:44:11 -0000	1.14
  @@ -16,10 +16,12 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Resources;
   import org.jbpm.JbpmConfiguration;
   import org.jbpm.JbpmContext;
   import org.jbpm.graph.def.ProcessDefinition;
  +import org.jbpm.jpdl.el.JbpmExpressionEvaluator;
   
   /**
    * A seam component that boostraps a JBPM SessionFactory
  @@ -50,6 +52,7 @@
         log.trace( "Starting jBPM" );
         installProcessDefinitions();
         installPageflowDefinitions();
  +      JbpmExpressionEvaluator.setVariableResolver( new SeamVariableResolver() );
      }
   
      @Destroy

User: gavin   
  Date: 06/01/13 02:38:45

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  added jndiPattern
  
  Revision  Changes    Path
  1.14      +12 -1     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Init.java	2 Jan 2006 07:44:34 -0000	1.13
  +++ Init.java	13 Jan 2006 07:38:45 -0000	1.14
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.13 2006/01/02 07:44:34 gavin Exp $
  +//$Id: Init.java,v 1.14 2006/01/13 07:38:45 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -37,6 +37,7 @@
      private String[] componentClasses = {};
      private boolean isClientSideConversations = false;
      private boolean jbpmInstalled;
  +   private String jndiPattern;
      
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
   
  @@ -127,4 +128,14 @@
         return jbpmInstalled;
      }
   
  +   public String getJndiPattern() 
  +   {
  +      return jndiPattern;
  +   }
  +    
  +   public void setJndiPattern(String jndiPattern) 
  +   {
  +	   this.jndiPattern = jndiPattern;
  +   }
  +
   }

User: gavin   
  Date: 06/01/13 02:43:51

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  added jndiPattern
  
  Revision  Changes    Path
  1.15      +2 -1      jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Init.java	13 Jan 2006 07:38:45 -0000	1.14
  +++ Init.java	13 Jan 2006 07:43:51 -0000	1.15
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.14 2006/01/13 07:38:45 gavin Exp $
  +//$Id: Init.java,v 1.15 2006/01/13 07:43:51 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -31,6 +31,7 @@
      public static final String MANAGED_PERSISTENCE_CONTEXTS = NAME + ".managedPersistenceContexts";
      public static final String MANAGED_SESSIONS = NAME + ".managedSessions";
      public static final String MANAGED_DATA_SOURCES = NAME + ".managedDataSources";
  +   public static final String JNDI_PATTERN = NAME + ".jndiPattern";
      
      private String[] managedPersistenceContexts = {};
      private String[] managedSessions = {};

User: gavin   
  Date: 06/01/13 20:29:29

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  add leaveConversation()
  
  Revision  Changes    Path
  1.37      +6 -1      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- Manager.java	8 Jan 2006 23:26:50 -0000	1.36
  +++ Manager.java	14 Jan 2006 01:29:29 -0000	1.37
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.36 $
  + * @version $Revision: 1.37 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -476,6 +476,11 @@
         return getConversationEntry( getCurrentConversationId() );
      }
   
  +   public void leaveConversation()
  +   {
  +      initializeTemporaryConversation();
  +   }
  +
      public boolean swapConversation(String id)
      {
         ConversationEntry ce = getConversationEntry(id);

User: tbaeyens
  Date: 06/01/14 07:14:56

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  replaced snapshot of jbpm jar with the 3.1 beta 2 release version
  
  Revision  Changes    Path
  1.15      +1 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Jbpm.java	12 Jan 2006 11:44:11 -0000	1.14
  +++ Jbpm.java	14 Jan 2006 12:14:56 -0000	1.15
  @@ -21,7 +21,7 @@
   import org.jbpm.JbpmConfiguration;
   import org.jbpm.JbpmContext;
   import org.jbpm.graph.def.ProcessDefinition;
  -import org.jbpm.jpdl.el.JbpmExpressionEvaluator;
  +import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
   
   /**
    * A seam component that boostraps a JBPM SessionFactory

User: gavin   
  Date: 06/01/17 05:36:23

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  move conversation timeout to post-seam-txn-commit
  
  Revision  Changes    Path
  1.38      +5 -3      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- Manager.java	14 Jan 2006 01:29:29 -0000	1.37
  +++ Manager.java	17 Jan 2006 10:36:23 -0000	1.38
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.37 $
  + * @version $Revision: 1.38 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -253,8 +253,6 @@
       */
      public void conversationTimeout(ExternalContext externalContext)
      {
  -      touchConversationStack();
  -
         long currentTime = System.currentTimeMillis();
         Iterator<Map.Entry<String, ConversationEntry>> entries = getConversationIdEntryMap().entrySet().iterator();
         while ( entries.hasNext() )
  @@ -286,6 +284,8 @@
      {
         if ( isLongRunningConversation() )
         {
  +         touchConversationStack();
  +
            if ( !Seam.isSessionInvalid() )
            {
               log.debug("Storing conversation state: " + currentConversationId);
  @@ -332,6 +332,8 @@
      {
         if ( isLongRunningConversation() )
         {
  +         touchConversationStack();
  +
            log.debug("Storing conversation state: " + currentConversationId);
            Conversation.instance().flush();
            if ( !Seam.isSessionInvalid() )

User: gavin   
  Date: 06/01/18 05:01:33

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  don't roll back jbpm contexts if jbpm is not doing tx management
  cope with system exceptions from SFSBs
  
  Revision  Changes    Path
  1.6       +9 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ManagedJbpmContext.java	3 Jan 2006 07:32:15 -0000	1.5
  +++ ManagedJbpmContext.java	18 Jan 2006 10:01:33 -0000	1.6
  @@ -22,12 +22,14 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jbpm.JbpmContext;
  +import org.jbpm.persistence.db.DbPersistenceServiceFactory;
  +import org.jbpm.svc.Services;
   
   /**
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -58,8 +60,13 @@
      {
         if ( Lifecycle.isException() )
         {
  +         DbPersistenceServiceFactory dpsf = (DbPersistenceServiceFactory) jbpmContext.getJbpmConfiguration()
  +               .getServiceFactory(Services.SERVICENAME_PERSISTENCE);
  +         if ( dpsf.isTransactionEnabled() )
  +         {
            jbpmContext.setRollbackOnly();
         }
  +      }
         else 
         {
            org.jbpm.graph.exe.ProcessInstance processInstance = ProcessInstance.instance();

User: gavin   
  Date: 06/01/27 11:57:43

  Modified:    src/main/org/jboss/seam/core  Ejb.java
  Log:
  fixed test suite failure due to UT not getting unbound
  
  Revision  Changes    Path
  1.11      +3 -1      jboss-seam/src/main/org/jboss/seam/core/Ejb.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Ejb.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Ejb.java	12 Jan 2006 04:54:37 -0000	1.10
  +++ Ejb.java	27 Jan 2006 16:57:43 -0000	1.11
  @@ -1,4 +1,4 @@
  -//$Id: Ejb.java,v 1.10 2006/01/12 04:54:37 gavin Exp $
  +//$Id: Ejb.java,v 1.11 2006/01/27 16:57:43 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -16,6 +16,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.util.NamingHelper;
  +import org.jboss.seam.util.Transactions;
   import org.jboss.tm.TransactionManagerInitializer;
   
   /**
  @@ -70,6 +71,7 @@
         ctx.unbind(TransactionManagerInitializer.JNDI_NAME);
         ctx.unbind(TransactionManagerInitializer.JNDI_IMPORTER);
         ctx.unbind(TransactionManagerInitializer.JNDI_EXPORTER);
  +      ctx.unbind(Transactions.USER_TRANSACTION_NAME);
         deployer.destroy();
         deployer = null;
         //EJB3StandaloneBootstrap.shutdown();

User: gavin   
  Date: 06/01/27 22:51:05

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  allow ad hoc nav to combine with pageflow nav
  
  Revision  Changes    Path
  1.8       +7 -0      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Pageflow.java	6 Jan 2006 10:15:49 -0000	1.7
  +++ Pageflow.java	28 Jan 2006 03:51:05 -0000	1.8
  @@ -103,6 +103,13 @@
         return getPage().getDefaultLeavingTransition()!=null;
      }
   
  +   public boolean hasTransition(String outcome)
  +   {
  +      return outcome==null ? 
  +            hasDefaultTransition() : 
  +            getPage().getLeavingTransition(outcome)!=null;
  +   }
  +
      public void navigate(FacesContext context, String outcome) {
         if ( outcome==null || "".equals(outcome) )
         {

User: gavin   
  Date: 06/01/28 00:43:13

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  minor
  
  Revision  Changes    Path
  1.16      +1 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Jbpm.java	14 Jan 2006 12:14:56 -0000	1.15
  +++ Jbpm.java	28 Jan 2006 05:43:13 -0000	1.16
  @@ -32,7 +32,7 @@
    */
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
  -@...")
  +@Startup(depends={"org.jboss.seam.core.microcontainer", "org.jboss.seam.core.ejb"})
   @Name("org.jboss.seam.core.jbpm")
   public class Jbpm 
   {

User: gavin   
  Date: 06/02/06 13:06:15

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix bug with seam servlet filter
  
  Revision  Changes    Path
  1.41      +29 -2     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- Manager.java	23 Jan 2006 00:50:00 -0000	1.40
  +++ Manager.java	6 Feb 2006 18:06:15 -0000	1.41
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.40 $
  + * @version $Revision: 1.41 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -385,7 +385,8 @@
      {
   
         //First, try to get the conversation id from a request parameter
  -      String storedConversationId = (String) parameters.get("conversationId");
  +      String storedConversationId = getConversationIdFromRequestParameter(parameters);
  +      
         if ( isMissing(storedConversationId) && attributes!=null )
         {
            //if it is not passed as a request parameter, try to get it from
  @@ -431,6 +432,32 @@
   
      }
   
  +   private String getConversationIdFromRequestParameter(Map parameters) {
  +      Object object = parameters.get("conversationId");
  +      if (object==null)
  +      {
  +         return null;
  +      }
  +      else
  +      {
  +         if ( object instanceof String )
  +         {
  +            //when it comes from JSF it is (usually?) a plain string
  +            return (String) object;
  +         }
  +         else
  +         {
  +            //in a servlet it is a string array
  +            String[] values = (String[]) object;
  +            if (values.length!=1)
  +            {
  +               throw new IllegalArgumentException("expected exactly one value for conversationId request parameter");
  +            }
  +            return values[0];
  +         }
  +      }
  +   }
  +
      private boolean isMissing(String storedConversationId) {
         return storedConversationId==null || "".equals(storedConversationId);
      }

User: gavin   
  Date: 06/03/05 22:38:55

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  fixed JBSEAM-147
  
  Revision  Changes    Path
  1.9       +6 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Pageflow.java	28 Jan 2006 03:51:05 -0000	1.8
  +++ Pageflow.java	6 Mar 2006 03:38:55 -0000	1.9
  @@ -103,15 +103,19 @@
         return getPage().getDefaultLeavingTransition()!=null;
      }
      
  +   private boolean isNullOutcome(String outcome) {
  +      return outcome==null || "".equals(outcome);
  +   }
  +
      public boolean hasTransition(String outcome)
      {
  -      return outcome==null ? 
  +      return isNullOutcome(outcome) ? 
               hasDefaultTransition() : 
               getPage().getLeavingTransition(outcome)!=null;
      }
   
      public void navigate(FacesContext context, String outcome) {
  -      if ( outcome==null || "".equals(outcome) )
  +      if ( isNullOutcome(outcome) )
         {
            //if it has a default transition defined, trigger it,
            //otherwise just redisplay the page

User: gavin   
  Date: 06/03/07 08:52:08

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  added a helper method
  
  Revision  Changes    Path
  1.3       +14 -0     jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FacesMessages.java	7 Mar 2006 09:12:39 -0000	1.2
  +++ FacesMessages.java	7 Mar 2006 13:52:00 -0000	1.3
  @@ -85,6 +85,16 @@
       * Add a templated FacesMessage by looking for the message
       * template in the resource bundle. 
       */
  +   public void addFromResourceBundle(String key)
  +   {
  +      addFromResourceBundle(key, null);
  +   }
  +   
  +   /**
  +    * Add a templated FacesMessage by looking for the message
  +    * template in the resource bundle. If it is missing, use
  +    * the given message template.
  +    */
      public void addFromResourceBundle(String key, String defaultMessageTemplate)
      {
         String messageTemplate = defaultMessageTemplate;
  @@ -94,6 +104,10 @@
            String bundleMessage = resourceBundle.getString(key);
            if (bundleMessage!=null) messageTemplate = bundleMessage;
         }
  +      if (messageTemplate==null) 
  +      {
  +         throw new IllegalArgumentException("Missing message: " + key);
  +      }
         add(messageTemplate);
      }

User: gavin   
  Date: 06/03/07 08:54:05

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  added a helper method
  
  Revision  Changes    Path
  1.4       +1 -5      jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- FacesMessages.java	7 Mar 2006 13:52:00 -0000	1.3
  +++ FacesMessages.java	7 Mar 2006 13:54:05 -0000	1.4
  @@ -87,7 +87,7 @@
       */
      public void addFromResourceBundle(String key)
      {
  -      addFromResourceBundle(key, null);
  +      addFromResourceBundle(key, "missing message: " + key);
      }
      
      /**
  @@ -104,10 +104,6 @@
            String bundleMessage = resourceBundle.getString(key);
            if (bundleMessage!=null) messageTemplate = bundleMessage;
         }
  -      if (messageTemplate==null) 
  -      {
  -         throw new IllegalArgumentException("Missing message: " + key);
  -      }
         add(messageTemplate);
      }

User: gavin   
  Date: 06/03/07 21:08:32

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  minor
  
  Revision  Changes    Path
  1.42      +8 -4      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- Manager.java	6 Feb 2006 18:06:15 -0000	1.41
  +++ Manager.java	8 Mar 2006 02:08:32 -0000	1.42
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.41 $
  + * @version $Revision: 1.42 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -311,7 +311,7 @@
         {
            log.debug("Discarding conversation state: " + currentConversationId);
   
  -         LinkedList<String> stack = Manager.instance().getCurrentConversationIdStack();
  +         LinkedList<String> stack = getCurrentConversationIdStack();
            if ( stack.size()>1 )
            {
               String outerConversationId = stack.get(1);
  @@ -350,7 +350,7 @@
         {
            log.debug("Discarding conversation state: " + currentConversationId);
   
  -         LinkedList<String> stack = Manager.instance().getCurrentConversationIdStack();
  +         LinkedList<String> stack = getCurrentConversationIdStack();
            if ( stack.size()>1 )
            {
               String outerConversationId = stack.get(1);
  @@ -404,6 +404,11 @@
            storedConversationId = null;
         }
   
  +      restoreConversation(storedConversationId);
  +
  +   }
  +
  +   public void restoreConversation(String storedConversationId) {
         boolean isStoredConversation = storedConversationId!=null &&
               getSessionConversationIds().contains(storedConversationId);
         if ( isStoredConversation )
  @@ -429,7 +434,6 @@
            log.debug("No stored conversation");
            initializeTemporaryConversation();
         }
  -
      }
   
      private String getConversationIdFromRequestParameter(Map parameters) {

User: gavin   
  Date: 06/03/08 20:57:19

  Modified:    src/main/org/jboss/seam/core  ResourceBundle.java
  Log:
  JBSEAM-162 make the resource bundle a session-scoped thing, using the client locale
  
  Revision  Changes    Path
  1.4       +21 -20    jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceBundle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ResourceBundle.java	30 Dec 2005 00:49:38 -0000	1.3
  +++ ResourceBundle.java	9 Mar 2006 01:57:19 -0000	1.4
  @@ -5,6 +5,8 @@
   import java.util.Locale;
   import java.util.MissingResourceException;
   
  +import javax.faces.context.FacesContext;
  +
   import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -21,7 +23,7 @@
    * 
    * @author Gavin King
    */
  -@...)
  +@Scope(ScopeType.SESSION)
   @Intercept(NEVER)
   @Name("resourceBundle")
   @Startup
  @@ -29,7 +31,6 @@
      private static final Logger log = Logger.getLogger(ResourceBundle.class);
   
      private String bundleName = "messages";
  -   private String language;
      private java.util.ResourceBundle bundle;
   
      public String getBundleName() 
  @@ -47,14 +48,7 @@
      {
         try
         {
  -         if (language==null) 
  -         {
  -            bundle = java.util.ResourceBundle.getBundle( bundleName, Locale.getDefault(), Thread.currentThread().getContextClassLoader() );
  -         }
  -         else
  -         {
  -            bundle = java.util.ResourceBundle.getBundle( bundleName, new Locale(language), Thread.currentThread().getContextClassLoader() );
  -         }
  +         bundle = searchForBundle();
            log.info("loaded resource bundle: " + bundleName);
         }
         catch (MissingResourceException mre)
  @@ -63,20 +57,27 @@
         }
      }
      
  -   @Unwrap
  -   public java.util.ResourceBundle getBundle()
  -   {
  -      return bundle;
  +   private java.util.ResourceBundle getBundle(Locale locale) {
  +      return java.util.ResourceBundle.getBundle( bundleName, locale, Thread.currentThread().getContextClassLoader() );
      }
   
  -   public String getLanguage() 
  +   private java.util.ResourceBundle searchForBundle()
      {
  -      return language;
  +      FacesContext facesContext = FacesContext.getCurrentInstance();
  +      if (facesContext!=null)
  +      {
  +         Locale requestLocale = facesContext.getExternalContext().getRequestLocale();
  +         if (requestLocale!=null) return getBundle( requestLocale );
  +         Locale defaultLocale = facesContext.getApplication().getDefaultLocale();
  +         if (defaultLocale!=null) return getBundle( defaultLocale );
  +      }
  +      return getBundle( Locale.getDefault() );
      }
   
  -   public void setLanguage(String language) 
  +   @Unwrap
  +   public java.util.ResourceBundle getBundle()
      {
  -      this.language = language;
  +      return bundle;
      }
      
      public static java.util.ResourceBundle instance()

User: gavin   
  Date: 06/03/10 02:07:38

  Modified:    src/main/org/jboss/seam/core  LocaleSelector.java
  Log:
  fixed bug
  
  Revision  Changes    Path
  1.2       +5 -5      jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LocaleSelector.java	10 Mar 2006 06:44:46 -0000	1.1
  +++ LocaleSelector.java	10 Mar 2006 07:07:37 -0000	1.2
  @@ -52,15 +52,15 @@
      private void setLocale() {
         if (variant!=null)
         {
  -         locale = new java.util.Locale(country, language, variant);
  +         locale = new java.util.Locale(language, country, variant);
         }
  -      else if (language!=null)
  +      else if (country!=null)
         {
  -         locale = new java.util.Locale(country, language);
  +         locale = new java.util.Locale(language, country);
         }
  -      else if (country!=null)
  +      else if (language!=null)
         {
  -         locale = new java.util.Locale(country);
  +         locale = new java.util.Locale(language);
         }
         else
         {

User: gavin   
  Date: 06/03/11 04:41:07

  Modified:    src/main/org/jboss/seam/core  LocaleSelector.java
  Log:
  set props after setting locale
  
  Revision  Changes    Path
  1.3       +4 -1      jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- LocaleSelector.java	10 Mar 2006 07:07:37 -0000	1.2
  +++ LocaleSelector.java	11 Mar 2006 09:41:07 -0000	1.3
  @@ -49,7 +49,7 @@
         Contexts.removeFromAllContexts( Seam.getComponentName(Messages.class) );
      }
   
  -   private void setLocale() {
  +   protected void setLocale() {
         if (variant!=null)
         {
            locale = new java.util.Locale(language, country, variant);
  @@ -74,6 +74,9 @@
               if (requestLocale!=null) locale = requestLocale;
            }
         }
  +      language = locale.getLanguage();
  +      country = locale.getCountry();
  +      variant = locale.getVariant();
      }
      
      public static LocaleSelector instance()

User: gavin   
  Date: 06/03/11 22:42:24

  Modified:    src/main/org/jboss/seam/core  LocaleSelector.java
  Log:
  better integration with JSF's native i18n support
  
  Revision  Changes    Path
  1.4       +34 -41    jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- LocaleSelector.java	11 Mar 2006 09:41:07 -0000	1.3
  +++ LocaleSelector.java	12 Mar 2006 03:42:23 -0000	1.4
  @@ -6,15 +6,14 @@
   
   import javax.faces.context.FacesContext;
   
  -import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  -import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.util.Strings;
   
   /**
    * Selects the current user's locale
  @@ -25,58 +24,52 @@
   @Name("localeSelector")
   @Intercept(NEVER)
   public class LocaleSelector {
  -   private static final Logger log = Logger.getLogger(LocaleSelector.class);
   
      private String language;
      private String country;
      private String variant;
      
  -   private Locale locale;
  -   
  -   @Create
  -   public void init()
  -   {
  -      setLocale();
  -      log.debug( "initial locale: " + locale );
  -   }
  -   
  +   /**
  +    * Force the resource bundle to reload, using the current locale
  +    */
      public void select()
      {
  -      setLocale();
  -      log.debug( "selected locale: " + locale );
  -      //force the resource bundle to reload
  +      FacesContext.getCurrentInstance().getViewRoot().setLocale( getLocale() );
         Contexts.removeFromAllContexts( Seam.getComponentName(ResourceBundle.class) );
         Contexts.removeFromAllContexts( Seam.getComponentName(Messages.class) );
      }
   
  -   protected void setLocale() {
  -      if (variant!=null)
  +   public Locale calculateLocale(Locale jsfLocale)
  +   {
  +      if ( !Strings.isEmpty(variant) )
         {
  -         locale = new java.util.Locale(language, country, variant);
  +         return new java.util.Locale(language, country, variant );
         }
  -      else if (country!=null)
  +      else if ( !Strings.isEmpty(country) )
         {
  -         locale = new java.util.Locale(language, country);
  +         return new java.util.Locale(language, country);
         }
  -      else if (language!=null)
  +      else if ( !Strings.isEmpty(language) )
         {
  -         locale = new java.util.Locale(language);
  +         return new java.util.Locale(language);
         }
         else
         {
  -         locale = java.util.Locale.getDefault();
  +         return jsfLocale;
  +      }
  +   }
  +
  +   public Locale getLocale() 
  +   {
            FacesContext facesContext = FacesContext.getCurrentInstance();
  -         if (facesContext!=null)
  +      if (facesContext==null)
            {
  -            java.util.Locale defaultLocale = facesContext.getApplication().getDefaultLocale();
  -            if (defaultLocale!=null) locale = defaultLocale;
  -            java.util.Locale requestLocale = facesContext.getExternalContext().getRequestLocale();
  -            if (requestLocale!=null) locale = requestLocale;
  +         return calculateLocale( Locale.getDefault() );
            }
  +      else
  +      {
  +         return facesContext.getApplication().getViewHandler().calculateLocale( facesContext );
         }
  -      language = locale.getLanguage();
  -      country = locale.getCountry();
  -      variant = locale.getVariant();
      }
      
      public static LocaleSelector instance()
  @@ -89,6 +82,7 @@
      }
   
      public String getCountry() {
  +      if (country==null) return getLocale().getCountry();
         return country;
      }
   
  @@ -97,6 +91,7 @@
      }
   
      public String getLanguage() {
  +      if (language==null) return getLocale().getLanguage();
         return language;
      }
   
  @@ -105,6 +100,7 @@
      }
   
      public String getVariant() {
  +      if (variant==null) return getLocale().getVariant();
         return variant;
      }
   
  @@ -112,7 +108,4 @@
         this.variant = variant;
      }
   
  -   public Locale getLocale() {
  -      return locale;
  -   }
   }

User: gavin   
  Date: 06/03/13 06:35:05

  Modified:    src/main/org/jboss/seam/core  LocaleSelector.java
  Log:
  add supportedlocales to LocaleSelector
  
  Revision  Changes    Path
  1.5       +40 -0     jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- LocaleSelector.java	12 Mar 2006 03:42:23 -0000	1.4
  +++ LocaleSelector.java	13 Mar 2006 11:35:05 -0000	1.5
  @@ -2,9 +2,14 @@
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  +import java.util.ArrayList;
  +import java.util.Iterator;
  +import java.util.List;
   import java.util.Locale;
  +import java.util.StringTokenizer;
   
   import javax.faces.context.FacesContext;
  +import javax.faces.model.SelectItem;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -59,6 +64,41 @@
         }
      }
   
  +   public void setLocale(Locale locale)
  +   {
  +      language = Strings.nullIfEmpty( locale.getLanguage() );
  +      country = Strings.nullIfEmpty( locale.getCountry() );
  +      variant = Strings.nullIfEmpty( locale.getVariant() );
  +   }
  +   
  +   public String getLocaleString()
  +   {
  +      return getLocale().toString();
  +   }
  +   
  +   public void setLocaleString(String localeString)
  +   {
  +      StringTokenizer tokens = new StringTokenizer(localeString, "-_");
  +      language = tokens.hasMoreTokens() ? tokens.nextToken() : null;
  +      country =  tokens.hasMoreTokens() ? tokens.nextToken() : null;
  +      variant =  tokens.hasMoreTokens() ? tokens.nextToken() : null;
  +   }
  +   
  +   public List<SelectItem> getSupportedLocales()
  +   {
  +      List<SelectItem> selectItems = new ArrayList<SelectItem>();
  +      Iterator<Locale> locales = FacesContext.getCurrentInstance().getApplication().getSupportedLocales();
  +      while ( locales.hasNext() )
  +      {
  +         Locale locale = locales.next();
  +         if ( !Strings.isEmpty( locale.getLanguage() ) )
  +         {
  +            selectItems.add( new SelectItem( locale.toString(), locale.getDisplayName(locale) ) );
  +         }
  +      }
  +      return selectItems;
  +   }
  +
      public Locale getLocale() 
      {
         FacesContext facesContext = FacesContext.getCurrentInstance();

User: gavin   
  Date: 06/03/17 21:29:48

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  fixed bug in pageflows
  
  Revision  Changes    Path
  1.13      +10 -5     jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Pageflow.java	10 Mar 2006 06:44:46 -0000	1.12
  +++ Pageflow.java	18 Mar 2006 02:29:48 -0000	1.13
  @@ -15,6 +15,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.jbpm.Page;
  +import org.jbpm.graph.def.Node;
   import org.jbpm.graph.exe.ProcessInstance;
   import org.jbpm.graph.exe.Token;
   
  @@ -76,12 +77,16 @@
         }
      }
      
  -   public Page getPage() 
  +   public Node getNode() 
      {
         if (processInstance==null) return null;
         Token pageFlowToken = processInstance.getRootToken();
  -      Page page = (Page) pageFlowToken.getNode();
  -      return page;
  +      return pageFlowToken.getNode();
  +   }
  +   
  +   public Page getPage() 
  +   {
  +      return (Page) getNode();
      }
      
      private void navigate(FacesContext context) 
  @@ -103,7 +108,7 @@
   
      public boolean hasDefaultTransition()
      {
  -      return getPage().getDefaultLeavingTransition()!=null;
  +      return getNode().getDefaultLeavingTransition()!=null;
      }
      
      private boolean isNullOutcome(String outcome) {
  @@ -114,7 +119,7 @@
      {
         return isNullOutcome(outcome) ? 
               hasDefaultTransition() : 
  -            getPage().getLeavingTransition(outcome)!=null;
  +            getNode().getLeavingTransition(outcome)!=null;
      }
   
      public void navigate(FacesContext context, String outcome) {

User: gavin   
  Date: 06/03/19 22:24:07

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  allow the page action to have an outcome
  
  Revision  Changes    Path
  1.7       +11 -3     jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Pages.java	19 Mar 2006 05:53:54 -0000	1.6
  +++ Pages.java	20 Mar 2006 03:24:07 -0000	1.7
  @@ -95,10 +95,18 @@
      
      public void callAction()
      {
  -      FacesContext currentInstance = FacesContext.getCurrentInstance();
  -      String viewId = currentInstance.getViewRoot().getViewId();
  +      FacesContext facesContext = FacesContext.getCurrentInstance();
  +      String viewId = facesContext.getViewRoot().getViewId();
         MethodBinding methodBinding = actionsByViewId.get(viewId);
  -      if (methodBinding!=null) methodBinding.invoke(currentInstance, null);
  +      if (methodBinding!=null) 
  +      {
  +         String outcome = (String) methodBinding.invoke(facesContext, null);
  +         if (outcome!=null)
  +         {
  +            facesContext.getApplication().getNavigationHandler()
  +                  .handleNavigation(facesContext, methodBinding.getExpressionString(), outcome);
  +         }
  +      }
      }
      
      public static Pages instance()

User: gavin   
  Date: 06/03/25 15:08:57

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  handle redirection with parameaters
  
  Revision  Changes    Path
  1.43      +3 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -b -r1.42 -r1.43
  --- Manager.java	8 Mar 2006 02:08:32 -0000	1.42
  +++ Manager.java	25 Mar 2006 20:08:57 -0000	1.43
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.42 $
  + * @version $Revision: 1.43 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -555,7 +555,8 @@
       */
      public String encodeConversationId(String url) {
         beforeRedirect();
  -      return url + "?conversationId=" + getCurrentConversationId();
  +      char sep = url.contains("?") ? '&' : '?';
  +      return url + sep + "conversationId=" + getCurrentConversationId();
      }
   
      public void redirect(String viewId)

User: gavin   
  Date: 06/03/26 20:08:43

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  support wildcards in pages.xml
  
  Revision  Changes    Path
  1.8       +34 -5     jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Pages.java	20 Mar 2006 03:24:07 -0000	1.7
  +++ Pages.java	27 Mar 2006 01:08:43 -0000	1.8
  @@ -3,14 +3,16 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.io.InputStream;
  +import java.util.Comparator;
   import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
  +import java.util.SortedSet;
  +import java.util.TreeSet;
   
   import javax.faces.context.FacesContext;
   import javax.faces.el.MethodBinding;
   
  -
   import org.dom4j.Document;
   import org.dom4j.DocumentException;
   import org.dom4j.Element;
  @@ -40,6 +42,17 @@
      private Map<String, Integer> timeoutsByViewId = new HashMap<String, Integer>();
      private Map<String, MethodBinding> actionsByViewId = new HashMap<String, MethodBinding>();
      
  +   private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
  +         new Comparator<String>() {
  +            public int compare(String x, String y)
  +            {
  +               if ( x.length()<y.length() ) return -1;
  +               if ( x.length()> y.length() ) return 1;
  +               return x.compareTo(y);
  +            }
  +         } 
  +      );
  +   
      @Create
      public void initialize() throws DocumentException
      {
  @@ -58,6 +71,10 @@
            for (Element page: elements)
            {
               String viewId = page.attributeValue("view-id");
  +            if ( viewId.endsWith("*") )
  +            {
  +               wildcardViewIds.add(viewId);
  +            }
               String description = page.getTextTrim();
   			if (description!=null && description.length()>0)
   			{
  @@ -97,6 +114,18 @@
      {
         FacesContext facesContext = FacesContext.getCurrentInstance();
         String viewId = facesContext.getViewRoot().getViewId();
  +      for (String wildcard: wildcardViewIds)
  +      {
  +         if ( viewId.startsWith( wildcard.substring(0, wildcard.length()-1) ) )
  +         {
  +            callAction(facesContext, wildcard);
  +         }
  +      }
  +      callAction(facesContext, viewId);
  +   }
  +
  +   private void callAction(FacesContext facesContext, String viewId)
  +   {
         MethodBinding methodBinding = actionsByViewId.get(viewId);
         if (methodBinding!=null) 
         {

User: gavin   
  Date: 06/03/26 21:39:02

  Added:       src/main/org/jboss/seam/core  UiComponent.java
  Log:
  added uiComponent
  
  Revision  Changes    Path
  1.1      date: 2006/03/27 02:39:02;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/UiComponent.java
  
  Index: UiComponent.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  import static org.jboss.seam.ScopeType.STATELESS;
  
  import java.util.AbstractMap;
  import java.util.Map;
  import java.util.Set;
  
  import javax.faces.component.UIComponent;
  import javax.faces.context.FacesContext;
  
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Unwrap;
  import org.jboss.util.NotImplementedException;
  
  @Name("uiComponent")
  @Intercept(NEVER)
  @Scope(STATELESS)
  public class UiComponent
  {
     
     @Unwrap
     public Map<String, UIComponent> getViewComponents()
     {
        return new AbstractMap<String, UIComponent>() {
  
           @Override
           public Set<Map.Entry<String, UIComponent>> entrySet()
           {
              throw new NotImplementedException();
           }
  
           @Override
           public UIComponent get(Object key)
           {
              if ( !(key instanceof String) ) return null;
              return FacesContext.getCurrentInstance().getViewRoot().findComponent( (String) key );
           }
           
        };
     }
     
  }

User: gavin   
  Date: 06/03/28 05:25:34

  Modified:    src/main/org/jboss/seam/core  Messages.java
  Log:
  swallow excep
  
  Revision  Changes    Path
  1.2       +10 -1     jboss-seam/src/main/org/jboss/seam/core/Messages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Messages.java	10 Mar 2006 03:40:06 -0000	1.1
  +++ Messages.java	28 Mar 2006 10:25:34 -0000	1.2
  @@ -6,6 +6,7 @@
   import java.util.Enumeration;
   import java.util.HashMap;
   import java.util.Map;
  +import java.util.MissingResourceException;
   import java.util.Set;
   
   import org.jboss.seam.Component;
  @@ -46,7 +47,15 @@
                  String cachedValue = cache.get(key);
                  if (cachedValue==null)
                  {
  -                  String resource = bundle.getString(resourceKey);
  +                  String resource;
  +                  try
  +                  {
  +                     resource = bundle.getString(resourceKey);
  +                  }
  +                  catch (MissingResourceException mre)
  +                  {
  +                     return null;
  +                  }
                     if (resource==null)
                     {
                        return resourceKey;

User: gavin   
  Date: 06/03/28 05:25:59

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  swallow excep
  
  Revision  Changes    Path
  1.7       +7 -4      jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FacesMessages.java	10 Mar 2006 06:44:46 -0000	1.6
  +++ FacesMessages.java	28 Mar 2006 10:25:59 -0000	1.7
  @@ -4,6 +4,7 @@
   
   import java.util.ArrayList;
   import java.util.List;
  +import java.util.MissingResourceException;
   
   import javax.faces.application.FacesMessage;
   import javax.faces.application.FacesMessage.Severity;
  @@ -14,7 +15,6 @@
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  -import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.util.Template;
   
  @@ -26,7 +26,6 @@
   @Scope(ScopeType.CONVERSATION)
   @Name("facesMessages")
   @Intercept(NEVER)
  -@...
   public class FacesMessages 
   {
      
  @@ -111,9 +110,13 @@
         java.util.ResourceBundle resourceBundle = ResourceBundle.instance();
         if (resourceBundle!=null) 
         {
  +         try
  +         {
            String bundleMessage = resourceBundle.getString(key);
            if (bundleMessage!=null) messageTemplate = bundleMessage;
         }
  +         catch (MissingResourceException mre) {} //swallow
  +      }
         add(severity, messageTemplate);
      }

User: gavin   
  Date: 06/03/28 05:29:52

  Added:       src/main/org/jboss/seam/core  HttpError.java
  Log:
  added httpError component
  
  Revision  Changes    Path
  1.1      date: 2006/03/28 10:29:52;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/HttpError.java
  
  Index: HttpError.java
  ===================================================================
  //$Id: HttpError.java,v 1.1 2006/03/28 10:29:52 gavin Exp $
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import java.io.IOException;
  
  import javax.faces.context.FacesContext;
  import javax.servlet.http.HttpServletResponse;
  
  import org.jboss.seam.Component;
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.contexts.Contexts;
  
  /**
   * Convenient HTTP errors
   * 
   * @author Gavin King
   */
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Name("httpError")
  public class HttpError
  {
     /**
      * Send a HTTP error as the response
      */
     public void send(int code)
     {
        try
        {
           getResponse().sendError(code);
        }
        catch (IOException ioe)
        {
           throw new IllegalStateException(ioe);
        }
        FacesContext.getCurrentInstance().responseComplete();
     }
  
     /**
      * Send a HTTP error as the response
      */
     public void send(int code, String message)
     {
        try
        {
           getResponse().sendError(code, message);
        }
        catch (IOException ioe)
        {
           throw new IllegalStateException(ioe);
        }
        FacesContext.getCurrentInstance().responseComplete();
     }
  
     private static HttpServletResponse getResponse()
     {
        return (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse();
     }
  
     public static HttpError instance()
     {
        if ( !Contexts.isApplicationContextActive() )
        {
           throw new IllegalStateException("No active application scope");
        }
        return (HttpError) Component.getInstance(HttpError.class, true);
     }
     
  }

User: gavin   
  Date: 06/03/30 07:07:35

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  support s:action
  fix a bug when redirecting
  
  Revision  Changes    Path
  1.9       +25 -8     jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Pages.java	27 Mar 2006 01:08:43 -0000	1.8
  +++ Pages.java	30 Mar 2006 12:07:34 -0000	1.9
  @@ -41,6 +41,7 @@
      private Map<String, String> descriptionByViewId = new HashMap<String, String>();
      private Map<String, Integer> timeoutsByViewId = new HashMap<String, Integer>();
      private Map<String, MethodBinding> actionsByViewId = new HashMap<String, MethodBinding>();
  +   private Map<String, String> outcomesByViewId = new HashMap<String, String>();
      
      private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
            new Comparator<String>() {
  @@ -88,9 +89,16 @@
               String action = page.attributeValue("action");
               if (action!=null)
               {
  +               if ( action.startsWith("#{") )
  +               {
               	MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(action, null);
               	actionsByViewId.put(viewId, methodBinding);
               }
  +               else
  +               {
  +                  outcomesByViewId.put(viewId, action);
  +               }
  +            }
            }
         }
      }
  @@ -126,16 +134,25 @@
   
      private void callAction(FacesContext facesContext, String viewId)
      {
  +      String outcome = outcomesByViewId.get(viewId);
  +      String fromAction = outcome;
  +      
  +      if (outcome==null)
  +      {
         MethodBinding methodBinding = actionsByViewId.get(viewId);
         if (methodBinding!=null) 
         {
  -         String outcome = (String) methodBinding.invoke(facesContext, null);
  +            fromAction = methodBinding.getExpressionString();
  +            outcome = (String) methodBinding.invoke(facesContext, null);
  +         }
  +      }
  +      
            if (outcome!=null)
            {
               facesContext.getApplication().getNavigationHandler()
  -                  .handleNavigation(facesContext, methodBinding.getExpressionString(), outcome);
  -         }
  +               .handleNavigation(facesContext, fromAction, outcome);
         }
  +
      }
      
      public static Pages instance()

User: gavin   
  Date: 06/04/02 19:50:18

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  s:actionLink renamed to s:link
  enhanced s:link
  added s:taskId
  
  Revision  Changes    Path
  1.47      +6 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -b -r1.46 -r1.47
  --- Manager.java	31 Mar 2006 15:14:28 -0000	1.46
  +++ Manager.java	2 Apr 2006 23:50:18 -0000	1.47
  @@ -39,7 +39,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.46 $
  + * @version $Revision: 1.47 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -456,7 +456,7 @@
               Pageflow.instance().begin( propagation.substring(6) );
            }
         }
  -      if ( propagation!=null && propagation.startsWith("join") )
  +      else if ( propagation!=null && propagation.startsWith("join") )
         {
            if ( !isLongRunningConversation )
            {
  @@ -475,6 +475,10 @@
               Pageflow.instance().begin( propagation.substring(5) );
            }
         }
  +      else if ( "end".equals(propagation) )
  +      {
  +         endConversation();
  +      }
   
      }

User: gavin   
  Date: 06/04/03 09:30:45

  Added:       src/main/org/jboss/seam/core  IsUserInRole.java
  Log:
  added isUserInRole
  
  Revision  Changes    Path
  1.1      date: 2006/04/03 13:30:45;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/IsUserInRole.java
  
  Index: IsUserInRole.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import java.util.AbstractMap;
  import java.util.Map;
  import java.util.Set;
  
  import javax.faces.context.FacesContext;
  
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Startup;
  import org.jboss.seam.annotations.Unwrap;
  
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Startup
  @Name("isUserInRole")
  public class IsUserInRole
  {
     @Unwrap
     public Map<String, Boolean> getMap()
     {
        return new AbstractMap<String, Boolean>()
        {
           @Override
           public Set<Map.Entry<String, Boolean>> entrySet() {
              throw new UnsupportedOperationException();
           }
  
           @Override
           public Boolean get(Object key)
           {
              if ( !(key instanceof String ) ) return false;
              return FacesContext.getCurrentInstance().getExternalContext().isUserInRole( (String) key );
           }
           
        };
     }
  }

User: gavin   
  Date: 06/04/04 15:50:59

  Modified:    src/main/org/jboss/seam/core  Actor.java
  Log:
  bugfixes
  
  Revision  Changes    Path
  1.4       +4 -2      jboss-seam/src/main/org/jboss/seam/core/Actor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Actor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Actor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Actor.java	31 Dec 2005 07:29:15 -0000	1.3
  +++ Actor.java	4 Apr 2006 19:50:59 -0000	1.4
  @@ -26,11 +26,13 @@
      private String id;
      private Set<String> groupActorIds = new HashSet<String>();
   
  -   public String getId() {
  +   public String getId() 
  +   {
         return id;
      }
   
  -   public void setId(String id) {
  +   public void setId(String id) 
  +   {
         this.id = id;
      }

User: gavin   
  Date: 06/04/07 15:24:11

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  experimental portal support
  
  Revision  Changes    Path
  1.49      +12 -31    jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -b -r1.48 -r1.49
  --- Manager.java	5 Apr 2006 01:15:18 -0000	1.48
  +++ Manager.java	7 Apr 2006 19:24:11 -0000	1.49
  @@ -18,6 +18,7 @@
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  +import javax.portlet.PortletResponse;
   import javax.servlet.http.HttpServletResponse;
   
   import org.jboss.logging.Logger;
  @@ -39,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.48 $
  + * @version $Revision: 1.49 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -280,7 +281,7 @@
         dirty();
      }
   
  -   public void storeConversation(Session session)
  +   public void storeConversation(Session session, Object response)
      {
         if ( isLongRunningConversation() )
         {
  @@ -296,6 +297,7 @@
               //Map attributes = FacesContext.getCurrentInstance().getViewRoot().getAttributes();
               //attributes.put(CONVERSATION_ID, currentConversationId);
               Contexts.getPageContext().set(CONVERSATION_ID, currentConversationId);
  +            writeConversationIdToResponse(response, currentConversationId);
   
               if ( Init.instance().isJbpmInstalled() )
               {
  @@ -322,6 +324,7 @@
               String outerConversationId = stack.get(1);
               //attributes.put(CONVERSATION_ID, outerConversationId);
               Contexts.getPageContext().set(CONVERSATION_ID, outerConversationId);
  +            writeConversationIdToResponse(response, outerConversationId);
            }
            else
            {
  @@ -335,37 +338,15 @@
         }
      }
   
  -   public void storeConversation(HttpServletResponse response, Session session)
  +   private void writeConversationIdToResponse(Object response, String conversationId)
      {
  -      if ( isLongRunningConversation() )
  -      {
  -         touchConversationStack();
  -
  -         log.debug("Storing conversation state: " + currentConversationId);
  -         Conversation.instance().flush();
  -         if ( !Seam.isSessionInvalid() )
  +      if (response instanceof PortletResponse)
            {
  -            //if the session is invalid, don't put the conversation id
  -            //in the view, 'cos we are expecting the conversation to
  -            //be destroyed by the servlet session listener
  -            response.setHeader("conversationId", currentConversationId);
  -         }
  -         //even if the session is invalid, still put the id in the map,
  -         //so it can be cleaned up along with all the other conversations
  +         ( (PortletResponse) response ).setProperty("conversationId", conversationId);
         }
  -      else
  -      {
  -         log.debug("Discarding conversation state: " + currentConversationId);
  -
  -         LinkedList<String> stack = getCurrentConversationIdStack();
  -         if ( stack.size()>1 )
  +      else if (response instanceof HttpServletResponse)
            {
  -            String outerConversationId = stack.get(1);
  -            response.setHeader("conversationId", outerConversationId);
  -         }
  -
  -         //now safe to remove the entry
  -         removeCurrentConversationAndDestroyNestedContexts(session);
  +         ( (HttpServletResponse) response ).setHeader("conversationId", conversationId);
         }
      }

User: gavin   
  Date: 06/04/07 15:48:13

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix
  
  Revision  Changes    Path
  1.50      +5 -3      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- Manager.java	7 Apr 2006 19:24:11 -0000	1.49
  +++ Manager.java	7 Apr 2006 19:48:13 -0000	1.50
  @@ -18,7 +18,9 @@
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  +import javax.portlet.ActionResponse;
   import javax.portlet.PortletResponse;
  +import javax.portlet.RenderResponse;
   import javax.servlet.http.HttpServletResponse;
   
   import org.jboss.logging.Logger;
  @@ -40,7 +42,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.49 $
  + * @version $Revision: 1.50 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -340,9 +342,9 @@
      
      private void writeConversationIdToResponse(Object response, String conversationId)
      {
  -      if (response instanceof PortletResponse)
  +      if (response instanceof ActionResponse)
         {
  -         ( (PortletResponse) response ).setProperty("conversationId", conversationId);
  +         ( (ActionResponse) response ).setRenderParameter("conversationId", conversationId);
         }
         else if (response instanceof HttpServletResponse)
         {

User: gavin   
  Date: 06/04/09 13:53:43

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fixed bug
  
  Revision  Changes    Path
  1.51      +13 -9     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- Manager.java	7 Apr 2006 19:48:13 -0000	1.50
  +++ Manager.java	9 Apr 2006 17:53:43 -0000	1.51
  @@ -19,8 +19,6 @@
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
   import javax.portlet.ActionResponse;
  -import javax.portlet.PortletResponse;
  -import javax.portlet.RenderResponse;
   import javax.servlet.http.HttpServletResponse;
   
   import org.jboss.logging.Logger;
  @@ -42,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.50 $
  + * @version $Revision: 1.51 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -325,14 +323,20 @@
            {
               String outerConversationId = stack.get(1);
               //attributes.put(CONVERSATION_ID, outerConversationId);
  +            if ( Contexts.isPageContextActive() )
  +            {
               Contexts.getPageContext().set(CONVERSATION_ID, outerConversationId);
  +            }
               writeConversationIdToResponse(response, outerConversationId);
            }
            else
            {
               //attributes.remove(CONVERSATION_ID);
  +            if ( Contexts.isPageContextActive() )
  +            {
               Contexts.getPageContext().remove(CONVERSATION_ID);
            }
  +         }
   
            //now safe to remove the entry
            removeCurrentConversationAndDestroyNestedContexts(session);
  @@ -342,13 +346,13 @@
      
      private void writeConversationIdToResponse(Object response, String conversationId)
      {
  -      if (response instanceof ActionResponse)
  +      if (response instanceof HttpServletResponse)
         {
  -         ( (ActionResponse) response ).setRenderParameter("conversationId", conversationId);
  +         ( (HttpServletResponse) response ).setHeader("conversationId", conversationId);
         }
  -      else if (response instanceof HttpServletResponse)
  +      else if (response instanceof ActionResponse)
         {
  -         ( (HttpServletResponse) response ).setHeader("conversationId", conversationId);
  +         ( (ActionResponse) response ).setRenderParameter("conversationId", conversationId);
         }
      }

User: gavin   
  Date: 06/04/09 18:31:34

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  added portlet phase listeners
  
  Revision  Changes    Path
  1.52      +2 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- Manager.java	9 Apr 2006 17:53:43 -0000	1.51
  +++ Manager.java	9 Apr 2006 22:31:34 -0000	1.52
  @@ -40,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.51 $
  + * @version $Revision: 1.52 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -601,7 +601,7 @@
         this.conversationTimeout = conversationTimeout;
      }
   
  -   private void beforeRedirect()
  +   public void beforeRedirect()
      {
         ConversationEntry ce = getConversationEntry(currentConversationId);
         if (ce==null)

User: gavin   
  Date: 06/04/11 16:02:37

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  support component ids in FacesMessages
  
  Revision  Changes    Path
  1.8       +80 -1     jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- FacesMessages.java	28 Mar 2006 10:25:59 -0000	1.7
  +++ FacesMessages.java	11 Apr 2006 20:02:37 -0000	1.8
  @@ -3,19 +3,25 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
   import java.util.List;
  +import java.util.Map;
   import java.util.MissingResourceException;
   
   import javax.faces.application.FacesMessage;
   import javax.faces.application.FacesMessage.Severity;
  +import javax.faces.component.UIComponent;
   import javax.faces.context.FacesContext;
   
  +import org.hibernate.validator.InvalidValue;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.interceptors.ValidationInterceptor;
   import org.jboss.seam.util.Template;
   
   /**
  @@ -30,6 +36,7 @@
   {
      
      private List<FacesMessage> facesMessages = new ArrayList<FacesMessage>();
  +   private Map<String, List<FacesMessage>> keyedFacesMessages = new HashMap<String, List<FacesMessage>>();
   
      public void beforeRenderResponse() 
      {
  @@ -54,6 +61,40 @@
         facesMessages.add(facesMessage);
      }
      
  +   /**
  +    * Add a FacesMessage instance to a particular component id
  +    * @param id a JSF component id
  +    */
  +   public void add(String id, FacesMessage facesMessage)
  +   {
  +      String clientId = getClientId(id);
  +      List<FacesMessage> list = keyedFacesMessages.get(clientId);
  +      if (list==null)
  +      {
  +         list = new ArrayList<FacesMessage>();
  +         keyedFacesMessages.put(clientId, list);
  +      }
  +      list.add(facesMessage);
  +   }
  +   
  +   /**
  +    * Add a templated FacesMessage to a particular component id
  +    * @param id a JSF component id
  +    */
  +   public void add(String id, String messageTemplate)
  +   {
  +      add(id, FacesMessage.SEVERITY_INFO, messageTemplate);
  +   }
  +   
  +   /**
  +    * Add a templated FacesMessage to a particular component id
  +    * @param id a JSF component id
  +    */
  +   public void add(String id, Severity severity, String messageTemplate)
  +   {
  +      add( id, createFacesMessage(severity, messageTemplate) );
  +   }
  +
      public static FacesMessages instance()
      {
         if ( !Contexts.isConversationContextActive() )
  @@ -78,7 +119,7 @@
       */
      public void add(Severity severity, String messageTemplate)
      {
  -      add( new FacesMessage( severity, Template.render(messageTemplate), null ) );
  +      add( createFacesMessage(severity, messageTemplate) );
      }
      
      /**
  @@ -120,4 +161,42 @@
         add(severity, messageTemplate);
      }
     
  +   public void add(InvalidValue iv)
  +   {
  +      String clientId = getClientId( iv.getPropertyName() );
  +      ValidationInterceptor.log.debug("invalid value:" + iv + ", clientId: " + clientId);
  +      add( clientId, new FacesMessage( iv.getMessage() ) );
  +   }
  +   
  +   private FacesMessage createFacesMessage(Severity severity, String messageTemplate)
  +   {
  +      return new FacesMessage( severity, Template.render(messageTemplate), null );
  +   }
  +   
  +   private String getClientId(String id)
  +   {
  +      FacesContext facesContext = FacesContext.getCurrentInstance();
  +      return getClientId( facesContext.getViewRoot(), id, facesContext);
  +   }
  +
  +   private static String getClientId(UIComponent component, String id, FacesContext facesContext)
  +   {
  +      String componentId = component.getId();
  +      if (componentId!=null && componentId.equals(id))
  +      {
  +         return component.getClientId(facesContext);
  +      }
  +      else
  +      {
  +         Iterator iter = component.getFacetsAndChildren();
  +         while ( iter.hasNext() )
  +         {
  +            UIComponent child = (UIComponent) iter.next();
  +            String clientId = getClientId(child, id, facesContext);
  +            if (clientId!=null) return clientId;
  +         }
  +         return null;
  +      }
  +   }
  +  
   }

User: gavin   
  Date: 06/04/11 17:46:33

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  oops
  
  Revision  Changes    Path
  1.9       +8 -4      jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- FacesMessages.java	11 Apr 2006 20:02:37 -0000	1.8
  +++ FacesMessages.java	11 Apr 2006 21:46:33 -0000	1.9
  @@ -21,7 +21,6 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.interceptors.ValidationInterceptor;
   import org.jboss.seam.util.Template;
   
   /**
  @@ -44,6 +43,13 @@
         {
            FacesContext.getCurrentInstance().addMessage(null, facesMessage);
         }
  +      for ( Map.Entry<String, List<FacesMessage>> entry: keyedFacesMessages.entrySet() )
  +      {
  +         for ( FacesMessage msg: entry.getValue() )
  +         {
  +            FacesContext.getCurrentInstance().addMessage( entry.getKey(), msg );
  +         }
  +      }
         clear();
      }
      
  @@ -163,9 +169,7 @@
   
      public void add(InvalidValue iv)
      {
  -      String clientId = getClientId( iv.getPropertyName() );
  -      ValidationInterceptor.log.debug("invalid value:" + iv + ", clientId: " + clientId);
  -      add( clientId, new FacesMessage( iv.getMessage() ) );
  +      add( iv.getPropertyName(), new FacesMessage( iv.getMessage() ) );
      }
      
      private FacesMessage createFacesMessage(Severity severity, String messageTemplate)

User: gavin   
  Date: 06/04/14 11:14:16

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  fixed but where Hib Valid messages did not get cleared
  
  Revision  Changes    Path
  1.10      +1 -0      jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- FacesMessages.java	11 Apr 2006 21:46:33 -0000	1.9
  +++ FacesMessages.java	14 Apr 2006 15:14:16 -0000	1.10
  @@ -56,6 +56,7 @@
      public void clear()
      {
         facesMessages.clear();
  +      keyedFacesMessages.clear();
      }
      
      /**

User: gavin   
  Date: 06/04/14 16:24:31

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix a bug with non-JSF invocations
  
  Revision  Changes    Path
  1.53      +5 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -b -r1.52 -r1.53
  --- Manager.java	9 Apr 2006 22:31:34 -0000	1.52
  +++ Manager.java	14 Apr 2006 20:24:31 -0000	1.53
  @@ -40,7 +40,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.52 $
  + * @version $Revision: 1.53 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -296,7 +296,10 @@
               //be destroyed by the servlet session listener
               //Map attributes = FacesContext.getCurrentInstance().getViewRoot().getAttributes();
               //attributes.put(CONVERSATION_ID, currentConversationId);
  +            if ( Contexts.isPageContextActive() )
  +            {
               Contexts.getPageContext().set(CONVERSATION_ID, currentConversationId);
  +            }
               writeConversationIdToResponse(response, currentConversationId);
               
               if ( Init.instance().isJbpmInstalled() )

User: gavin   
  Date: 06/04/15 02:05:04

  Modified:    src/main/org/jboss/seam/core  ManagedPersistenceContext.java
  Log:
  updated to latest EJB3 spec changes
  
  Revision  Changes    Path
  1.11      +2 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedPersistenceContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ManagedPersistenceContext.java	15 Apr 2006 05:40:27 -0000	1.10
  +++ ManagedPersistenceContext.java	15 Apr 2006 06:05:04 -0000	1.11
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.10 2006/04/15 05:40:27 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.11 2006/04/15 06:05:04 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -60,7 +60,7 @@
      @Unwrap
      public EntityManager getEntityManager()
      {
  -      entityManager.isOpen();
  +      entityManager.joinTransaction();
         return entityManager;
      }

User: gavin   
  Date: 06/04/15 11:53:36

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  Much improved jBPM lifecycle
  
  Revision  Changes    Path
  1.7       +44 -26    jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ManagedJbpmContext.java	18 Jan 2006 10:01:33 -0000	1.6
  +++ ManagedJbpmContext.java	15 Apr 2006 15:53:36 -0000	1.7
  @@ -9,6 +9,9 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import javax.naming.NamingException;
  +import javax.transaction.RollbackException;
  +import javax.transaction.Synchronization;
  +import javax.transaction.SystemException;
   
   import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
  @@ -20,7 +23,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.util.Transactions;
   import org.jbpm.JbpmContext;
   import org.jbpm.persistence.db.DbPersistenceServiceFactory;
   import org.jbpm.svc.Services;
  @@ -29,54 +32,69 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
   @Intercept( NEVER )
  -public class ManagedJbpmContext
  +public class ManagedJbpmContext implements Synchronization
   {
      private static final Logger log = Logger.getLogger(ManagedJbpmContext.class);
   
      private JbpmContext jbpmContext;
  -   //private int counter;
  +   private boolean synchronizationRegistered;
   
      @Create
  -   public void create() throws NamingException
  +   public void create() throws NamingException, RollbackException, SystemException
      {
         jbpmContext = Jbpm.instance().getJbpmConfiguration().createJbpmContext();
  -      //counter++;
  +      assertNoTransactionManagement();
         log.debug( "created seam managed jBPM context");
      }
   
  -   @Unwrap
  -   public JbpmContext getJbpmContext()
  -   {
  -      return jbpmContext;
  -   }
  -
  -   @Destroy
  -   public void destroy()
  -   {
  -      if ( Lifecycle.isException() )
  +   private void assertNoTransactionManagement()
         {
            DbPersistenceServiceFactory dpsf = (DbPersistenceServiceFactory) jbpmContext.getJbpmConfiguration()
                  .getServiceFactory(Services.SERVICENAME_PERSISTENCE);
            if ( dpsf.isTransactionEnabled() )
            {
  -            jbpmContext.setRollbackOnly();
  +         throw new IllegalStateException("jBPM transaction is management enabled, disable in jbpm.cfg.xml");
  +      }
  +   }
  +
  +   @Unwrap
  +   public JbpmContext getJbpmContext() throws NamingException, RollbackException, SystemException
  +   {
  +      if ( !synchronizationRegistered )
  +      {
  +         Transactions.registerSynchronization(this);
  +         synchronizationRegistered = true;
            }
  +      return jbpmContext;
         }
  -      else 
  +   
  +   public void beforeCompletion()
         {
  +      log.debug( "flushing seam managed jBPM context" );
            org.jbpm.graph.exe.ProcessInstance processInstance = ProcessInstance.instance();
            if (processInstance!=null) 
            {
               jbpmContext.save( processInstance );
            }
  +      Contexts.getBusinessProcessContext().flush();
  +      jbpmContext.getSession().flush();
         }
  +   
  +   public void afterCompletion(int status) {
  +      synchronizationRegistered = false;
  +   }
  +
  +   @Destroy
  +   public void destroy()
  +   {
         log.debug( "destroying seam managed jBPM context" );
  -      //counter--;
  +      //jbpmContext.setRollbackOnly(); //TODO: this currently has no effect (bug in jBPM)
  +      jbpmContext.getSession().clear(); //WORKAROUND for jBPM bug, prevent flushing of session!
         jbpmContext.close();
      }

User: gavin   
  Date: 06/04/15 12:09:18

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  minor
  
  Revision  Changes    Path
  1.8       +2 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ManagedJbpmContext.java	15 Apr 2006 15:53:36 -0000	1.7
  +++ ManagedJbpmContext.java	15 Apr 2006 16:09:18 -0000	1.8
  @@ -32,7 +32,7 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -58,7 +58,7 @@
               .getServiceFactory(Services.SERVICENAME_PERSISTENCE);
         if ( dpsf.isTransactionEnabled() )
         {
  -         throw new IllegalStateException("jBPM transaction is management enabled, disable in jbpm.cfg.xml");
  +         throw new IllegalStateException("jBPM transaction management is enabled, disable in jbpm.cfg.xml");
         }
      }

User: gavin   
  Date: 06/04/15 14:10:34

  Modified:    src/main/org/jboss/seam/core  ManagedPersistenceContext.java
  Log:
  support non-transactional access 
  
  Revision  Changes    Path
  1.12      +8 -3      jboss-seam/src/main/org/jboss/seam/core/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/core/ManagedPersistenceContext.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- ManagedPersistenceContext.java	15 Apr 2006 06:05:04 -0000	1.11
  +++ ManagedPersistenceContext.java	15 Apr 2006 18:10:34 -0000	1.12
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.11 2006/04/15 06:05:04 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.12 2006/04/15 18:10:34 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -8,6 +8,7 @@
   import javax.naming.NamingException;
   import javax.persistence.EntityManager;
   import javax.persistence.EntityManagerFactory;
  +import javax.transaction.SystemException;
   
   import org.jboss.logging.Logger;
   import org.jboss.seam.Component;
  @@ -18,6 +19,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
   import org.jboss.seam.util.Naming;
  +import org.jboss.seam.util.Transactions;
   
   /**
    * A Seam component that manages a conversation-scoped extended
  @@ -58,9 +60,12 @@
      }
      
      @Unwrap
  -   public EntityManager getEntityManager()
  +   public EntityManager getEntityManager() throws NamingException, SystemException
  +   {
  +      if ( Transactions.isTransactionActive() ) 
      {
         entityManager.joinTransaction();
  +      }
         return entityManager;
      }

User: gavin   
  Date: 06/04/15 18:06:36

  Modified:    src/main/org/jboss/seam/core  PooledTask.java
  Log:
  Need interceptor for task assignment, to allow txm rollback 
  
  Revision  Changes    Path
  1.6       +0 -1      jboss-seam/src/main/org/jboss/seam/core/PooledTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PooledTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PooledTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- PooledTask.java	2 Jan 2006 08:01:38 -0000	1.5
  +++ PooledTask.java	15 Apr 2006 22:06:36 -0000	1.6
  @@ -17,7 +17,6 @@
    */
   @Name( "pooledTask" )
   @Scope( ScopeType.APPLICATION )
  -@...)
   public class PooledTask
   {

User: gavin   
  Date: 06/04/15 22:29:43

  Added:       src/main/org/jboss/seam/core  Events.java
  Log:
  Added event bus and events.xml
  
  Revision  Changes    Path
  1.1      date: 2006/04/16 02:29:43;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/Events.java
  
  Index: Events.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import java.io.InputStream;
  import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
  import javax.faces.context.FacesContext;
  import javax.faces.el.MethodBinding;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  import org.dom4j.Document;
  import org.dom4j.DocumentException;
  import org.dom4j.Element;
  import org.dom4j.io.SAXReader;
  import org.jboss.seam.Component;
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Create;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.contexts.Contexts;
  import org.jboss.seam.util.Resources;
  
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Name("events")
  public class Events 
  {
     
     private static final Log log = LogFactory.getLog(Events.class);
     
     private final Map<String, List<MethodBinding>> listeners = new HashMap<String, List<MethodBinding>>();
     
     @Create
     public void initialize() throws DocumentException
     {
        InputStream stream = Resources.getResourceAsStream("/WEB-INF/events.xml");      
        if (stream==null)
        {
           log.info("no events.xml file found");
        }
        else
        {
           log.info("reading events.xml");
           SAXReader saxReader = new SAXReader();
           saxReader.setMergeAdjacentText(true);
           Document doc = saxReader.read(stream);
           List<Element> elements = doc.getRootElement().elements("event");
           for (Element event: elements)
           {
              String type = event.attributeValue("type");
              List<MethodBinding> methodBindings = new ArrayList<MethodBinding>();
              listeners.put(type, methodBindings);
              
              List<Element> actions = event.elements("action");
              for (Element action: actions)
              {
                 String actionExpression = action.attributeValue("expression");
                 MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
                       .createMethodBinding(actionExpression, null);
                 methodBindings.add(methodBinding);
              }
           }
        }
     }
     
     public void addListener(String type, String methodBindingExpression)
     {
        MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
              .createMethodBinding(methodBindingExpression, null);
        listeners.get(type).add(methodBinding);
     }
     
     public void raiseEvent(String type)
     {
        log.debug("Processing event:" + type);
        for (MethodBinding listener: listeners.get(type) )
        {
           listener.invoke( FacesContext.getCurrentInstance(), null );
        }
     }
     
     public static Events instance()
     {
        if ( !Contexts.isApplicationContextActive() )
        {
           throw new IllegalStateException("No active application context");
        }
        return (Events) Component.getInstance(Events.class, ScopeType.APPLICATION, true);
     }
     
  }

User: gavin   
  Date: 06/04/15 23:16:50

  Modified:    src/main/org/jboss/seam/core  Events.java
  Log:
  Added event bus and events.xml
  
  Revision  Changes    Path
  1.2       +13 -3     jboss-seam/src/main/org/jboss/seam/core/Events.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Events.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Events.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Events.java	16 Apr 2006 02:29:43 -0000	1.1
  +++ Events.java	16 Apr 2006 03:16:50 -0000	1.2
  @@ -73,17 +73,27 @@
      {
         MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
               .createMethodBinding(methodBindingExpression, null);
  -      listeners.get(type).add(methodBinding);
  +      List<MethodBinding> list = listeners.get(type);
  +      if (list==null)
  +      {
  +         list = new ArrayList<MethodBinding>();
  +         listeners.put(type, list);
  +      }
  +      list.add(methodBinding);
      }
      
      public void raiseEvent(String type)
      {
         log.debug("Processing event:" + type);
  -      for (MethodBinding listener: listeners.get(type) )
  +      List<MethodBinding> list = listeners.get(type);
  +      if (list!=null)
  +      {
  +         for (MethodBinding listener: list )
         {
            listener.invoke( FacesContext.getCurrentInstance(), null );
         }
      }
  +   }
      
      public static Events instance()
      {

User: gavin   
  Date: 06/04/16 09:48:41

  Modified:    src/main/org/jboss/seam/core  PooledTask.java
  Log:
  clean up imports
  
  Revision  Changes    Path
  1.7       +0 -2      jboss-seam/src/main/org/jboss/seam/core/PooledTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PooledTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PooledTask.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PooledTask.java	15 Apr 2006 22:06:36 -0000	1.6
  +++ PooledTask.java	16 Apr 2006 13:48:41 -0000	1.7
  @@ -2,9 +2,7 @@
   
   import javax.faces.context.FacesContext;
   
  -import org.jboss.seam.InterceptionType;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jbpm.taskmgmt.exe.TaskInstance;

User: gavin   
  Date: 06/04/17 13:33:12

  Modified:    src/main/org/jboss/seam/core  Conversation.java
  Log:
  JBSEAM-163, additional operations in conversation component
  
  Revision  Changes    Path
  1.13      +43 -0     jboss-seam/src/main/org/jboss/seam/core/Conversation.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Conversation.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Conversation.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Conversation.java	19 Mar 2006 05:53:54 -0000	1.12
  +++ Conversation.java	17 Apr 2006 17:33:12 -0000	1.13
  @@ -3,6 +3,7 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.io.Serializable;
  +import java.util.LinkedList;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -163,4 +164,46 @@
         Manager.instance().endConversation();   
      }
   
  +   /**
  +    * Get the id of the immediate parent of a nested conversation
  +    */
  +   public String getParentId()
  +   {
  +      LinkedList<String> conversationIdStack = Manager.instance().getCurrentConversationIdStack();
  +      return conversationIdStack.size()>1 ? conversationIdStack.get(1) : null;
  +   }
  +   
  +   /**
  +    * Get the id of root conversation of a nested conversation
  +    */
  +   public String getRootId()
  +   {
  +      LinkedList<String> conversationIdStack = Manager.instance().getCurrentConversationIdStack();
  +      return conversationIdStack.get( conversationIdStack.size()-1 );
  +   }
  +   
  +   /**
  +    * "Pop" the conversation stack, switching to the parent conversation
  +    */
  +   public void pop()
  +   {
  +      String parentId = getParentId();
  +      if (parentId!=null)
  +      {
  +         Manager.instance().swapConversation(parentId);
  +      }
  +   }
  +   
  +   /**
  +    * Switch to the root conversation
  +    */
  +   public void root()
  +   {
  +      String rootId = getRootId();
  +      if (rootId!=null)
  +      {
  +         Manager.instance().swapConversation(rootId);
  +      }
  +   }
  +
   }

User: gavin   
  Date: 06/04/17 14:02:05

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  applied JBSEAM-169
  
  Revision  Changes    Path
  1.20      +23 -16    jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- Jbpm.java	15 Apr 2006 22:28:06 -0000	1.19
  +++ Jbpm.java	17 Apr 2006 18:02:05 -0000	1.20
  @@ -70,9 +70,31 @@
      
      public JbpmConfiguration getJbpmConfiguration()
      {
  +      if (jbpmConfiguration==null)
  +      {
  +         initJbpmConfiguration();
  +      }
         return jbpmConfiguration;
      }
   
  +   private void initJbpmConfiguration()
  +   {
  +      jbpmConfiguration = JbpmConfiguration.getInstance();
  +      DbPersistenceServiceFactory dbpsf = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory("persistence");
  +      if (Naming.getInitialContextProperties()!=null)
  +      {
  +         // Prefix regular JNDI properties for Hibernate
  +         Hashtable<String, String> hash = Naming.getInitialContextProperties();
  +         Properties prefixed = new Properties();
  +         for (Map.Entry<String, String> entry: hash.entrySet() )
  +         {
  +            prefixed.setProperty( Environment.JNDI_PREFIX + "." + entry.getKey(), entry.getValue() );
  +         }
  +  
  +         dbpsf.getConfiguration().getProperties().putAll(prefixed);
  +      }
  +   }
  +
      public ProcessDefinition getPageflowProcessDefinition(String pageflowName)
      {
         return pageflowProcessDefinitions.get(pageflowName);
  @@ -118,22 +140,7 @@
      {
         if ( processDefinitions!=null && processDefinitions.length>0 )
         {
  -         jbpmConfiguration = JbpmConfiguration.getInstance();
  -         DbPersistenceServiceFactory dbpsf = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory("persistence");
  -         if (Naming.getInitialContextProperties()!=null)
  -         {
  -            // Prefix regular JNDI properties for Hibernate
  -            Hashtable<String, String> hash = Naming.getInitialContextProperties();
  -            Properties prefixed = new Properties();
  -            for (Map.Entry<String, String> entry: hash.entrySet() )
  -            {
  -               prefixed.setProperty( Environment.JNDI_PREFIX + "." + entry.getKey(), entry.getValue() );
  -            }
  -
  -            dbpsf.getConfiguration().getProperties().putAll(prefixed);
  -         }
  -         
  -         JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
  +         JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
            try
            {
               for ( String definitionResource : processDefinitions )

User: gavin   
  Date: 06/04/17 14:35:08

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  JBSEAM-166 templated validator message
  
  Revision  Changes    Path
  1.11      +207 -207  jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- FacesMessages.java	14 Apr 2006 15:14:16 -0000	1.10
  +++ FacesMessages.java	17 Apr 2006 18:35:08 -0000	1.11
  @@ -170,7 +170,7 @@
   
      public void add(InvalidValue iv)
      {
  -      add( iv.getPropertyName(), new FacesMessage( iv.getMessage() ) );
  +      add( iv.getPropertyName(), createFacesMessage( FacesMessage.SEVERITY_WARN, iv.getMessage() ) );
      }
      
      private FacesMessage createFacesMessage(Severity severity, String messageTemplate)

User: gavin   
  Date: 06/04/17 15:40:03

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  back=enabled instead of backable=true
  
  Revision  Changes    Path
  1.16      +1 -1      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Pageflow.java	31 Mar 2006 15:14:28 -0000	1.15
  +++ Pageflow.java	17 Apr 2006 19:40:03 -0000	1.16
  @@ -69,7 +69,7 @@
         if ( processInstance!=null )
         {
            
  -         if ( getPage().isBackable() )
  +         if ( getPage().isBackEnabled() )
            {
               //check the node name to make sure we are still on the same node
               //String pageNodeName = (String) attributes.get(Manager.PAGEFLOW_NODE_NAME);

User: gavin   
  Date: 06/04/18 13:10:02

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  allow <redirect/> as an element in pageflow
  redefine the default transition
  
  Revision  Changes    Path
  1.17      +7 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- Pageflow.java	17 Apr 2006 19:40:03 -0000	1.16
  +++ Pageflow.java	18 Apr 2006 17:10:02 -0000	1.17
  @@ -18,6 +18,7 @@
   import org.jboss.seam.jbpm.Page;
   import org.jbpm.graph.def.Node;
   import org.jbpm.graph.def.ProcessDefinition;
  +import org.jbpm.graph.def.Transition;
   import org.jbpm.graph.exe.ProcessInstance;
   import org.jbpm.graph.exe.Token;
   
  @@ -143,7 +144,9 @@
   
      public boolean hasDefaultTransition()
      {
  -      return getNode().getDefaultLeavingTransition()!=null;
  +      //we don't use jBPM's default transition,
  +      //instead we use the "anonymous" transition
  +      return getNode().getLeavingTransition(null)!=null;
      }
      
      private boolean isNullOutcome(String outcome) {
  @@ -164,7 +167,9 @@
            //otherwise just redisplay the page
            if ( hasDefaultTransition() )
            {
  -            processInstance.signal();
  +            //we don't use jBPM's default transition,
  +            //instead we use the "anonymous" transition
  +            processInstance.signal( (String) null );
               navigate(context);
            }
         }

User: gavin   
  Date: 06/04/18 18:21:53

  Added:       src/main/org/jboss/seam/core  UserPrincipal.java
  Log:
  added userPrincipal component
  
  Revision  Changes    Path
  1.1      date: 2006/04/18 22:21:53;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/UserPrincipal.java
  
  Index: UserPrincipal.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import java.security.Principal;
  
  import javax.faces.context.FacesContext;
  
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Startup;
  import org.jboss.seam.annotations.Unwrap;
  
  @Scope(ScopeType.APPLICATION)
  @Intercept(NEVER)
  @Startup
  @Name("userPrincipal")
  public class UserPrincipal
  {
     @Unwrap
     public Principal getMap()
     {
        return FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal();
     }
  }

User: gavin   
  Date: 06/04/18 18:32:26

  Modified:    src/main/org/jboss/seam/core  UserPrincipal.java
  Log:
  oops
  
  Revision  Changes    Path
  1.2       +3 -2      jboss-seam/src/main/org/jboss/seam/core/UserPrincipal.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UserPrincipal.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/UserPrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UserPrincipal.java	18 Apr 2006 22:21:53 -0000	1.1
  +++ UserPrincipal.java	18 Apr 2006 22:32:26 -0000	1.2
  @@ -20,8 +20,9 @@
   public class UserPrincipal
   {
      @Unwrap
  -   public Principal getMap()
  +   public Principal getUserPrincipal()
      {
  -      return FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal();
  +      FacesContext facesContext = FacesContext.getCurrentInstance();
  +      return facesContext==null ? null : facesContext.getExternalContext().getUserPrincipal();
      }
   }

User: gavin   
  Date: 06/04/19 00:25:19

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  minor, mainly for testing
  
  Revision  Changes    Path
  1.12      +6 -3      jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Pages.java	15 Apr 2006 22:28:06 -0000	1.11
  +++ Pages.java	19 Apr 2006 04:25:19 -0000	1.12
  @@ -124,6 +124,8 @@
         boolean result = false;
         FacesContext facesContext = FacesContext.getCurrentInstance();
         String viewId = facesContext.getViewRoot().getViewId();
  +      if (viewId!=null)
  +      {
         for (String wildcard: wildcardViewIds)
         {
            if ( viewId.startsWith( wildcard.substring(0, wildcard.length()-1) ) )
  @@ -131,6 +133,7 @@
               result = callAction(facesContext, wildcard) || result;
            }
         }
  +      }
         result = callAction(facesContext, viewId) || result;
         return result;
      }

User: gavin   
  Date: 06/04/19 00:43:39

  Modified:    src/main/org/jboss/seam/core  Redirect.java
  Log:
  more improvs to SeamTest
  
  Revision  Changes    Path
  1.2       +1 -1      jboss-seam/src/main/org/jboss/seam/core/Redirect.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Redirect.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Redirect.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Redirect.java	27 Mar 2006 07:10:02 -0000	1.1
  +++ Redirect.java	19 Apr 2006 04:43:39 -0000	1.2
  @@ -56,7 +56,7 @@
         Manager.instance().redirect(viewId, parameters, false);
      }
      
  -   public Redirect instance()
  +   public static Redirect instance()
      {
         if ( !Contexts.isConversationContextActive() )
         {

User: tbaeyens
  Date: 06/04/19 15:30:42

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  created customized parser for parsing pageflows
  
  Revision  Changes    Path
  1.21      +13 -4     jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- Jbpm.java	17 Apr 2006 18:02:05 -0000	1.20
  +++ Jbpm.java	19 Apr 2006 19:30:42 -0000	1.21
  @@ -20,6 +20,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.jbpm.PageflowParser;
   import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;
  @@ -28,6 +29,7 @@
   import org.jbpm.graph.def.ProcessDefinition;
   import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
   import org.jbpm.persistence.db.DbPersistenceServiceFactory;
  +import org.xml.sax.InputSource;
   
   /**
    * A seam component that boostraps a JBPM SessionFactory
  @@ -130,7 +132,14 @@
         {
            for (String pageflow: pageflowDefinitions)
            {
  -            ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
  +            InputStream resource = Resources.getResourceAsStream(pageflow);
  +            if (resource==null)
  +            {
  +               throw new IllegalArgumentException("resource not found: " + pageflow);
  +            }
  +            InputSource inputSource = new InputSource(resource);
  +            PageflowParser pageflowParser = new PageflowParser(inputSource);
  +            ProcessDefinition pd = pageflowParser.readProcessDefinition();
               pageflowProcessDefinitions.put( pd.getName(), pd );
            }
         }

User: gavin   
  Date: 06/04/19 19:05:13

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  updated to jbpm 3.1
  
  Revision  Changes    Path
  1.22      +17 -13    jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- Jbpm.java	19 Apr 2006 19:30:42 -0000	1.21
  +++ Jbpm.java	19 Apr 2006 23:05:13 -0000	1.22
  @@ -21,13 +21,11 @@
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.jbpm.PageflowParser;
  -import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;
   import org.jbpm.JbpmConfiguration;
   import org.jbpm.JbpmContext;
   import org.jbpm.graph.def.ProcessDefinition;
  -import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
   import org.jbpm.persistence.db.DbPersistenceServiceFactory;
   import org.xml.sax.InputSource;
   
  @@ -60,7 +58,7 @@
         log.trace( "Starting jBPM" );
         installProcessDefinitions();
         installPageflowDefinitions();
  -      JbpmExpressionEvaluator.setVariableResolver( new SeamVariableResolver() );
  +      //JbpmExpressionEvaluator.setVariableResolver( new SeamVariableResolver() );
      }
   
      @Destroy
  @@ -102,15 +100,27 @@
         return pageflowProcessDefinitions.get(pageflowName);
      }
      
  -   public ProcessDefinition getProcessDefinitionFromResource(String resourceName) {
  +   private ProcessDefinition getPageflowDefinitionFromResource(String resourceName)
  +   {
         InputStream resource = Resources.getResourceAsStream(resourceName);
         if (resource==null)
         {
            throw new IllegalArgumentException("resource not found: " + resourceName);
         }
  -      return ProcessDefinition.parseXmlInputStream(resource);
  +      return new PageflowParser( new InputSource(resource) ).readProcessDefinition();
      }
   
  +   //TODO: remove, outofdate...
  +   /*public ProcessDefinition getProcessDefinitionFromResource(String resourceName) 
  +   {
  +      InputStream resource = Resources.getResourceAsStream(resourceName);
  +      if (resource==null)
  +      {
  +         throw new IllegalArgumentException("resource not found: " + resourceName);
  +      }
  +      return ProcessDefinition.parseXmlInputStream(resource);
  +   }*/
  +
      public String[] getPageflowDefinitions() {
         return pageflowDefinitions;
      }
  @@ -132,14 +142,8 @@
         {
            for (String pageflow: pageflowDefinitions)
            {
  -            InputStream resource = Resources.getResourceAsStream(pageflow);
  -            if (resource==null)
  -            {
  -               throw new IllegalArgumentException("resource not found: " + pageflow);
  -            }
  -            InputSource inputSource = new InputSource(resource);
  -            PageflowParser pageflowParser = new PageflowParser(inputSource);
  -            ProcessDefinition pd = pageflowParser.readProcessDefinition();
  +            ProcessDefinition pd = getPageflowDefinitionFromResource(pageflow);
  +            //ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
               pageflowProcessDefinitions.put( pd.getName(), pd );
            }
         }

User: gavin   
  Date: 06/04/19 21:50:26

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  get rid of hack solution
  
  Revision  Changes    Path
  1.18      +4 -8      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Pageflow.java	18 Apr 2006 17:10:02 -0000	1.17
  +++ Pageflow.java	20 Apr 2006 01:50:26 -0000	1.18
  @@ -2,11 +2,9 @@
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  -
   import javax.faces.application.FacesMessage;
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
  -import javax.faces.event.PhaseId;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -14,11 +12,9 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.jbpm.Page;
   import org.jbpm.graph.def.Node;
   import org.jbpm.graph.def.ProcessDefinition;
  -import org.jbpm.graph.def.Transition;
   import org.jbpm.graph.exe.ProcessInstance;
   import org.jbpm.graph.exe.Token;
   
  @@ -186,15 +182,15 @@
         ProcessDefinition pd = Jbpm.instance().getPageflowProcessDefinition(processDefinitionName);
         ProcessInstance pi = pd.createProcessInstance();
         setProcessInstance(pi);
  -      if ( Lifecycle.getPhaseId().equals(PhaseId.RENDER_RESPONSE) ) 
  -      {
  +      //if ( Lifecycle.getPhaseId().equals(PhaseId.RENDER_RESPONSE) ) 
  +      //{
       	  //if a pageflow starts during the render response phase
       	  //(as a result of a @Create method), we know the navigation
       	  //handler will not get called, so we should force the
       	  //pageflow out of the start state immediately
           //TODO: this is not actually completely true, what about <s:actionLink/>
  -    	  pi.signal();
  -      }
  +    	  //pi.signal();
  +      //}
      }
      
   }

User: gavin   
  Date: 06/04/19 21:52:10

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  oops, dvdstore is using that
  
  Revision  Changes    Path
  1.23      +2 -4      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- Jbpm.java	19 Apr 2006 23:05:13 -0000	1.22
  +++ Jbpm.java	20 Apr 2006 01:52:10 -0000	1.23
  @@ -110,8 +110,7 @@
         return new PageflowParser( new InputSource(resource) ).readProcessDefinition();
      }
   
  -   //TODO: remove, outofdate...
  -   /*public ProcessDefinition getProcessDefinitionFromResource(String resourceName) 
  +   public ProcessDefinition getProcessDefinitionFromResource(String resourceName) 
      {
         InputStream resource = Resources.getResourceAsStream(resourceName);
         if (resource==null)
  @@ -119,7 +118,7 @@
            throw new IllegalArgumentException("resource not found: " + resourceName);
         }
         return ProcessDefinition.parseXmlInputStream(resource);
  -   }*/
  +   }
   
      public String[] getPageflowDefinitions() {
         return pageflowDefinitions;
  @@ -143,7 +142,6 @@
            for (String pageflow: pageflowDefinitions)
            {
               ProcessDefinition pd = getPageflowDefinitionFromResource(pageflow);
  -            //ProcessDefinition pd = getProcessDefinitionFromResource(pageflow);
               pageflowProcessDefinitions.put( pd.getName(), pd );
            }
         }

User: gavin   
  Date: 06/04/19 22:26:42

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix JBSEAM-213
  
  Revision  Changes    Path
  1.55      +712 -712  jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -b -r1.54 -r1.55
  --- Manager.java	15 Apr 2006 22:28:06 -0000	1.54
  +++ Manager.java	20 Apr 2006 02:26:42 -0000	1.55
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.54 $
  + * @version $Revision: 1.55 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -303,7 +303,7 @@
               }
               writeConversationIdToResponse(response, currentConversationId);
               
  -            if ( Init.instance().isJbpmInstalled() )
  +            if ( Contexts.isPageContextActive() && Init.instance().isJbpmInstalled() )
               {
                  Pageflow pageflow = Pageflow.instance();
                  if ( pageflow.isInProcess() )

User: gavin   
  Date: 06/04/20 07:33:23

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  rollback
  
  Revision  Changes    Path
  1.24      +3 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- Jbpm.java	20 Apr 2006 01:52:10 -0000	1.23
  +++ Jbpm.java	20 Apr 2006 11:33:23 -0000	1.24
  @@ -21,11 +21,13 @@
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.jbpm.PageflowParser;
  +import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;
   import org.jbpm.JbpmConfiguration;
   import org.jbpm.JbpmContext;
   import org.jbpm.graph.def.ProcessDefinition;
  +import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
   import org.jbpm.persistence.db.DbPersistenceServiceFactory;
   import org.xml.sax.InputSource;
   
  @@ -58,7 +60,7 @@
         log.trace( "Starting jBPM" );
         installProcessDefinitions();
         installPageflowDefinitions();
  -      //JbpmExpressionEvaluator.setVariableResolver( new SeamVariableResolver() );
  +      JbpmExpressionEvaluator.setVariableResolver( new SeamVariableResolver() );
      }
   
      @Destroy

User: gavin   
  Date: 06/04/20 17:35:15

  Modified:    src/main/org/jboss/seam/core  Hibernate.java
  Log:
  fix bug with tomcat deploy of hb app
  
  Revision  Changes    Path
  1.10      +17 -1     jboss-seam/src/main/org/jboss/seam/core/Hibernate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hibernate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Hibernate.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Hibernate.java	13 Sep 2005 07:43:11 -0000	1.9
  +++ Hibernate.java	20 Apr 2006 21:35:15 -0000	1.10
  @@ -1,10 +1,15 @@
  -//$Id: Hibernate.java,v 1.9 2005/09/13 07:43:11 gavin Exp $
  +//$Id: Hibernate.java,v 1.10 2006/04/20 21:35:15 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
  +import java.util.Hashtable;
  +import java.util.Map;
  +import java.util.Properties;
  +
   import org.hibernate.SessionFactory;
   import org.hibernate.cfg.AnnotationConfiguration;
  +import org.hibernate.cfg.Environment;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Destroy;
  @@ -13,6 +18,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.util.Naming;
   
   /**
    * A seam component that boostraps a Hiberate SessionFactory
  @@ -50,6 +56,16 @@
            acfg.configure(cfgResourceName);
         }
         
  +      // Prefix regular JNDI properties for Hibernate
  +      Hashtable<String, String> hash = Naming.getInitialContextProperties();
  +      Properties prefixed = new Properties();
  +      for (Map.Entry<String, String> entry: hash.entrySet() )
  +      {
  +         prefixed.setProperty( Environment.JNDI_PREFIX + "." + entry.getKey(), entry.getValue() );
  +      }
  +
  +      acfg.getProperties().putAll(prefixed);
  +      
         sessionFactory = acfg.buildSessionFactory();
         
      }

User: gavin   
  Date: 06/04/23 23:07:24

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  give FacesMessages component access to outjected variables
  
  Revision  Changes    Path
  1.12      +225 -207  jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- FacesMessages.java	17 Apr 2006 18:35:08 -0000	1.11
  +++ FacesMessages.java	24 Apr 2006 03:07:24 -0000	1.12
  @@ -34,6 +34,8 @@
   public class FacesMessages 
   {
      
  +   private List<Runnable> tasks = new ArrayList<Runnable>();
  +   
      private List<FacesMessage> facesMessages = new ArrayList<FacesMessage>();
      private Map<String, List<FacesMessage>> keyedFacesMessages = new HashMap<String, List<FacesMessage>>();
   
  @@ -53,6 +55,18 @@
         clear();
      }
      
  +   private void runTasks()
  +   {
  +      for (Runnable task: tasks) task.run();
  +      tasks.clear();
  +   }
  +   
  +   public static void afterInvocation()
  +   {
  +      FacesMessages instance = (FacesMessages) Component.getInstance(FacesMessages.class, ScopeType.CONVERSATION, false);
  +      if (instance!=null) instance.runTasks();
  +   }
  +   
      public void clear()
      {
         facesMessages.clear();
  @@ -97,9 +111,11 @@
       * Add a templated FacesMessage to a particular component id
       * @param id a JSF component id
       */
  -   public void add(String id, Severity severity, String messageTemplate)
  +   public void add(final String id, final Severity severity, final String messageTemplate)
      {
  -      add( id, createFacesMessage(severity, messageTemplate) );
  +      tasks.add( new Runnable() {
  +         public void run() { add( id, createFacesMessage(severity, messageTemplate) ); }
  +      } );
      }
   
      public static FacesMessages instance()
  @@ -124,9 +140,11 @@
       * Add a templated FacesMessage that will be used
       * the next time a page is rendered.
       */
  -   public void add(Severity severity, String messageTemplate)
  +   public void add(final Severity severity, final String messageTemplate)
      {
  -      add( createFacesMessage(severity, messageTemplate) );
  +      tasks.add( new Runnable() {
  +         public void run() { add( createFacesMessage(severity, messageTemplate) ); }
  +      } );
      }
      
      /**
  @@ -170,7 +188,7 @@
   
      public void add(InvalidValue iv)
      {
  -      add( iv.getPropertyName(), createFacesMessage( FacesMessage.SEVERITY_WARN, iv.getMessage() ) );
  +      add( iv.getPropertyName(), FacesMessage.SEVERITY_WARN, iv.getMessage() );
      }
      
      private FacesMessage createFacesMessage(Severity severity, String messageTemplate)

User: gavin   
  Date: 06/04/26 12:59:32

  Modified:    src/main/org/jboss/seam/core  ManagedJbpmContext.java
  Log:
  fix bookkeeping
  
  Revision  Changes    Path
  1.11      +2 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedJbpmContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedJbpmContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ManagedJbpmContext.java	24 Apr 2006 00:16:12 -0000	1.10
  +++ ManagedJbpmContext.java	26 Apr 2006 16:59:32 -0000	1.11
  @@ -33,7 +33,7 @@
    * Manages a reference to a JbpmSession.
    *
    * @author <a href="mailto:steve@... Ebersole </a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   @Scope( ScopeType.EVENT )
   @Name( "jbpmContext" )
  @@ -70,7 +70,7 @@
         {
            throw new IllegalStateException("JbpmContext may only be used inside a transaction");
         }
  -      if ( !synchronizationRegistered )
  +      if ( !synchronizationRegistered && Transactions.isTransactionActive() )
         {
            Transactions.registerSynchronization(this);
            synchronizationRegistered = true;

User: gavin   
  Date: 06/04/27 11:21:41

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  added <s:validate/> and <s:validateAll/>
  
  Revision  Changes    Path
  1.14      +1 -1      jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- FacesMessages.java	26 Apr 2006 01:12:43 -0000	1.13
  +++ FacesMessages.java	27 Apr 2006 15:21:41 -0000	1.14
  @@ -194,7 +194,7 @@
         add( iv.getPropertyName(), FacesMessage.SEVERITY_WARN, iv.getMessage() );
      }
      
  -   private FacesMessage createFacesMessage(Severity severity, String messageTemplate)
  +   public static FacesMessage createFacesMessage(Severity severity, String messageTemplate)
      {
         return new FacesMessage( severity, Template.render(messageTemplate), null );
      }

User: gavin   
  Date: 06/04/27 21:14:21

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  fix JBSEAM-219
  
  Revision  Changes    Path
  1.58      +3 -1      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -b -r1.57 -r1.58
  --- Manager.java	27 Apr 2006 22:38:52 -0000	1.57
  +++ Manager.java	28 Apr 2006 01:14:21 -0000	1.58
  @@ -42,7 +42,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.57 $
  + * @version $Revision: 1.58 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -634,6 +634,8 @@
      
      public String encodeParameters(String url, Map<String, Object> parameters)
      {
  +      if ( parameters.isEmpty() ) return url;
  +      
         StringBuilder builder = new StringBuilder(url);
         for ( Map.Entry<String, Object> param: parameters.entrySet() )
         {

User: gavin   
  Date: 06/04/28 16:58:42

  Modified:    src/main/org/jboss/seam/core  Conversation.java
  Log:
  by popular demand
  
  Revision  Changes    Path
  1.14      +20 -0     jboss-seam/src/main/org/jboss/seam/core/Conversation.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Conversation.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Conversation.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Conversation.java	17 Apr 2006 17:33:12 -0000	1.13
  +++ Conversation.java	28 Apr 2006 20:58:42 -0000	1.14
  @@ -195,6 +195,16 @@
      }
      
      /**
  +    * Pop the conversation stack and redirect to the last defined
  +    * view-id for the parent conversation.
  +    */
  +   public String redirectToParent()
  +   {
  +      pop();
  +      return redirect();
  +   }
  +   
  +   /**
       * Switch to the root conversation
       */
      public void root()
  @@ -206,4 +216,14 @@
         }
      }
   
  +   /**
  +    * Switch to the root conversation and redirect to the 
  +    * last defined view-id for the root conversation.
  +    */
  +   public String redirectToRoot()
  +   {
  +      root();
  +      return redirect();
  +   }
  +   
   }

User: gavin   
  Date: 06/05/01 03:29:48

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  org.jboss.seam.core.init.debug
  
  Revision  Changes    Path
  1.17      +10 -1     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- Init.java	24 Apr 2006 03:49:02 -0000	1.16
  +++ Init.java	1 May 2006 07:29:48 -0000	1.17
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.16 2006/04/24 03:49:02 gavin Exp $
  +//$Id: Init.java,v 1.17 2006/05/01 07:29:48 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -41,6 +41,7 @@
      private boolean isClientSideConversations = false;
      private boolean jbpmInstalled;
      private String jndiPattern;
  +   private boolean debug;
      
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
  @@ -167,5 +168,13 @@
      {
   	   this.jndiPattern = jndiPattern;
      }
  +   public boolean isDebug()
  +   {
  +      return debug;
  +   }
  +   public void setDebug(boolean debug)
  +   {
  +      this.debug = debug;
  +   }
   
   }

User: gavin   
  Date: 06/05/10 10:46:05

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  oops
  
  Revision  Changes    Path
  1.61      +7 -1      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -b -r1.60 -r1.61
  --- Manager.java	8 May 2006 19:55:38 -0000	1.60
  +++ Manager.java	10 May 2006 14:46:05 -0000	1.61
  @@ -42,7 +42,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.60 $
  + * @version $Revision: 1.61 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -221,6 +221,12 @@
      
      public String getParentConversationViewId()
      {
  +      ConversationEntry conversationEntry = getConversationEntry( getParentConversationId() );
  +      return conversationEntry==null ? null : conversationEntry.getViewId();
  +   }
  +   
  +   public String getParentConversationId()
  +   {
         if ( currentConversationIdStack==null || currentConversationIdStack.size()<2 )
         {
            return null;

User: gavin   
  Date: 06/05/13 11:52:50

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  support nonstring outcomes
  
  Revision  Changes    Path
  1.15      +13 -2     jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Pages.java	7 May 2006 16:36:48 -0000	1.14
  +++ Pages.java	13 May 2006 15:52:50 -0000	1.15
  @@ -29,6 +29,12 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.util.Resources;
   
  +/**
  + * Holds metadata for pages defined in pages.xml, including
  + * page actions and page descriptions.
  + * 
  + * @author Gavin King
  + */
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
   //@Startup(depends="org.jboss.seam.core.microcontainer") //don't make it a startup component 'cos it needs a faces context
  @@ -152,7 +158,7 @@
            {
               fromAction = methodBinding.getExpressionString();
               result = true;
  -            outcome = (String) methodBinding.invoke(facesContext, null);
  +            outcome = toString( methodBinding.invoke(facesContext, null) );
            }
         }
         
  @@ -162,6 +168,11 @@
   
      }
   
  +   private static String toString(Object returnValue)
  +   {
  +      return returnValue == null ? null : returnValue.toString();
  +   }
  +
      private static void handleOutcome(FacesContext facesContext, String outcome, String fromAction)
      {
         if (outcome!=null)
  @@ -198,7 +209,7 @@
               if ( !isActionAllowed(facesContext, expression) ) return result;
               result = true;
               MethodBinding actionBinding = facesContext.getApplication().createMethodBinding(expression, null);
  -            outcome = (String) actionBinding.invoke( facesContext, null );
  +            outcome = toString( actionBinding.invoke(facesContext, null) );
               fromAction = expression;
            }
         }

User: gavin   
  Date: 06/05/14 20:31:22

  Modified:    src/main/org/jboss/seam/core  ResourceBundle.java
  Log:
  imports
  
  Revision  Changes    Path
  1.9       +0 -1      jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceBundle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ResourceBundle.java	8 May 2006 13:50:55 -0000	1.8
  +++ ResourceBundle.java	15 May 2006 00:31:22 -0000	1.9
  @@ -10,7 +10,6 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
  -import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;

User: gavin   
  Date: 06/05/19 19:53:15

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  allow templated URL as an action outcome
  
  Revision  Changes    Path
  1.62      +20 -1     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -b -r1.61 -r1.62
  --- Manager.java	10 May 2006 14:46:05 -0000	1.61
  +++ Manager.java	19 May 2006 23:53:15 -0000	1.62
  @@ -15,6 +15,7 @@
   import java.util.LinkedList;
   import java.util.Map;
   import java.util.Set;
  +import java.util.StringTokenizer;
   
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
  @@ -42,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.61 $
  + * @version $Revision: 1.62 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -730,6 +731,24 @@
         redirect(viewId, null, true);
      }
      
  +   public void interpolateAndRedirect(String url)
  +   {
  +      Map<String, Object> parameters = new HashMap<String, Object>();
  +      int loc = url.indexOf('?');
  +      if (loc>0)
  +      {
  +         StringTokenizer tokens = new StringTokenizer( url.substring(loc), "?=&" );
  +         while ( tokens.hasMoreTokens() )
  +         {
  +            String name = tokens.nextToken();
  +            String value = Interpolator.instance().interpolate( tokens.nextToken() );
  +            parameters.put(name, value);
  +         }
  +         url = url.substring(0, loc);
  +      }
  +      redirect(url, parameters, true);
  +   }
  +   
      private String encodeParameters(String url, Map<String, Object> parameters)
      {
         if ( parameters.isEmpty() ) return url;

User: gavin   
  Date: 06/05/20 18:15:05

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  upgrades to myfaces 1.1.3
  
  Revision  Changes    Path
  1.18      +12 -1     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Init.java	1 May 2006 07:29:48 -0000	1.17
  +++ Init.java	20 May 2006 22:15:05 -0000	1.18
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.17 2006/05/01 07:29:48 gavin Exp $
  +//$Id: Init.java,v 1.18 2006/05/20 22:15:05 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -42,6 +42,7 @@
      private boolean jbpmInstalled;
      private String jndiPattern;
      private boolean debug;
  +   private boolean myFacesLifecycleBug;
      
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
  @@ -177,4 +178,14 @@
         this.debug = debug;
      }
   
  +   public boolean isMyFacesLifecycleBug()
  +   {
  +      return myFacesLifecycleBug;
  +   }
  +   
  +   public void setMyFacesLifecycleBug(boolean myFacesLifecycleBugExists)
  +   {
  +      this.myFacesLifecycleBug = myFacesLifecycleBugExists;
  +   }
  +
   }

User: gavin   
  Date: 06/05/24 03:00:31

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  javadoc
  
  Revision  Changes    Path
  1.2       +13 -1     jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Interpolator.java	7 May 2006 16:36:48 -0000	1.1
  +++ Interpolator.java	24 May 2006 07:00:31 -0000	1.2
  @@ -14,6 +14,11 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   
  +/**
  + * Interpolates EL expressions in Strings
  + * 
  + * @author Gavin King
  + */
   @Intercept(NEVER)
   @Scope(STATELESS)
   @Name("interpolator")
  @@ -26,6 +31,13 @@
         return (Interpolator) Component.getInstance(Interpolator.class, true);
      }
   
  +   /**
  +    * Replace all EL expressions in the form #{...} with their evaluated
  +    * values.
  +    * 
  +    * @param string a template
  +    * @return the interpolated string
  +    */
      public String interpolate(String string) {
         FacesContext context = FacesContext.getCurrentInstance();
         StringTokenizer tokens = new StringTokenizer(string, "#${}", true);

User: gavin   
  Date: 06/05/24 03:04:35

  Modified:    src/main/org/jboss/seam/core  Redirect.java
  Log:
  javadoc
  
  Revision  Changes    Path
  1.3       +28 -0     jboss-seam/src/main/org/jboss/seam/core/Redirect.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Redirect.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Redirect.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Redirect.java	19 Apr 2006 04:43:39 -0000	1.2
  +++ Redirect.java	24 May 2006 07:04:35 -0000	1.3
  @@ -14,6 +14,12 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   
  +/**
  + * Convenient API for performing browser redirects with
  + * parameters.
  + * 
  + * @author Gavin King
  + */
   @Name("redirect")
   @Intercept(InterceptionType.NEVER)
   @Scope(ScopeType.CONVERSATION)
  @@ -22,26 +28,45 @@
      private String viewId;
      private Map<String, Object> parameters = new HashMap<String, Object>();
      
  +   /**
  +    * Get the JSF view id to redirect to
  +    */
      public String getViewId()
      {
         return viewId;
      }
      
  +   /**
  +    * Set the JSF view id to redirect to
  +    * 
  +    * @param viewId any JSF view id
  +    */
      public void setViewId(String viewId)
      {
         this.viewId = viewId;
      }
      
  +   /**
  +    * Get all the request parameters that have been set
  +    */
      public Map<String, Object> getParameters()
      {
         return parameters;
      }
      
  +   /**
  +    * Set a request parameter value
  +    */
      public void setParameter(String name, Object value)
      {
         parameters.put(name, value);
      }
      
  +   /**
  +    * Capture the view id and request parameters from the
  +    * current request and squirrel them away so we can
  +    * return here later in the conversation.
  +    */
      public void captureCurrentRequest()
      {
         parameters.clear();
  @@ -50,6 +75,9 @@
         viewId = context.getViewRoot().getViewId();
      }
      
  +   /**
  +    * Perform the redirect
  +    */
      public void execute()
      {
         // only include the conv-id if the Seam redirect filter is installed

User: gavin   
  Date: 06/05/25 09:13:12

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  close() Jbpm
  
  Revision  Changes    Path
  1.26      +1 -2      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Jbpm.java	23 Apr 2006 20:20:19 -0000	1.25
  +++ Jbpm.java	25 May 2006 13:13:12 -0000	1.26
  @@ -66,8 +66,7 @@
      @Destroy
      public void shutdown()
      {
  -      //TODO: don't I need to destroy it somehow???
  -      jbpmConfiguration = null;
  +      jbpmConfiguration.close();
      }
      
      public JbpmConfiguration getJbpmConfiguration()

User: gavin   
  Date: 06/05/26 15:25:45

  Added:       src/main/org/jboss/seam/core  TreeCache.java
  Log:
  added TreeCache integration
  
  Revision  Changes    Path
  1.1      date: 2006/05/26 19:25:45;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/TreeCache.java
  
  Index: TreeCache.java
  ===================================================================
  //$Id: TreeCache.java,v 1.1 2006/05/26 19:25:45 gavin Exp $
  package org.jboss.seam.core;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  import org.jboss.cache.PropertyConfigurator;
  import org.jboss.seam.InterceptionType;
  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.Name;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Unwrap;
  
  @Name("treeCache")
  @Scope(ScopeType.APPLICATION)
  @Intercept(InterceptionType.NEVER)
  public class TreeCache {
  
  	private static final Log log = LogFactory.getLog( TreeCache.class );
  
  	private org.jboss.cache.TreeCache cache;
     private String cfgResourceName = "treecache.xml";
  
     @Create
     public void start() throws Exception {
        log.debug("starting JBoss Cache");
        cache = new org.jboss.cache.TreeCache();
        new PropertyConfigurator().configure(cache, cfgResourceName);
        cache.start();
     }
     
     @Destroy
     public void stop() {
        log.debug("stopping JBoss Cache");
        cache.stop();
        cache.destroy();
        cache = null;
     }
  
     @Unwrap
     public org.jboss.cache.TreeCache getCache() {
        return cache;
     }
  
     public String getCfgResourceName()
     {
        return cfgResourceName;
     }
  
     public void setCfgResourceName(String cfgResourceName)
     {
        this.cfgResourceName = cfgResourceName;
     }
  }

User: gavin   
  Date: 06/06/02 13:55:09

  Modified:    src/main/org/jboss/seam/core  Messages.java
  Log:
  fix JBSEAM-249
  
  Revision  Changes    Path
  1.5       +4 -5      jboss-seam/src/main/org/jboss/seam/core/Messages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Messages.java	8 May 2006 13:50:55 -0000	1.4
  +++ Messages.java	2 Jun 2006 17:55:09 -0000	1.5
  @@ -52,7 +52,7 @@
                     }
                     catch (MissingResourceException mre)
                     {
  -                     return null;
  +                     return resourceKey;
                     }
                     if (resource==null)
                     {
  @@ -60,14 +60,13 @@
                     }
                     else
                     {
  -                     String result = Interpolator.instance().interpolate(resource);
  -                     cache.put(resourceKey, result);
  -                     return result;
  +                     cache.put(resourceKey, resource);
  +                     return Interpolator.instance().interpolate(resource);
                     }
                  }
                  else
                  {
  -                  return cachedValue;
  +                  return Interpolator.instance().interpolate(cachedValue);
                  }
               }
               else

User: gavin   
  Date: 06/06/06 17:03:32

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  cleanup
  
  Revision  Changes    Path
  1.28      +0 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- Jbpm.java	5 Jun 2006 10:09:52 -0000	1.27
  +++ Jbpm.java	6 Jun 2006 21:03:32 -0000	1.28
  @@ -20,7 +20,6 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.jbpm.PageflowParser;
   import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;

User: gavin   
  Date: 06/06/08 09:33:53

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  better exception
  
  Revision  Changes    Path
  1.23      +4 -0      jboss-seam/src/main/org/jboss/seam/core/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/core/Pageflow.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- Pageflow.java	5 Jun 2006 10:09:52 -0000	1.22
  +++ Pageflow.java	8 Jun 2006 13:33:52 -0000	1.23
  @@ -190,6 +190,10 @@
      public void begin(String processDefinitionName)
      {
         ProcessDefinition pd = Jbpm.instance().getPageflowProcessDefinition(processDefinitionName);
  +      if (pd==null)
  +      {
  +         throw new IllegalArgumentException("pageflow definition not found: " + processDefinitionName);
  +      }
         ProcessInstance pi = PageflowHelper.newPageflowInstance(pd);
         setProcessInstance(pi);
         //if ( Lifecycle.getPhaseId().equals(PhaseId.RENDER_RESPONSE) )

User: gavin   
  Date: 06/06/09 11:00:18

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  improve
  
  Revision  Changes    Path
  1.4       +9 -1      jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Interpolator.java	9 Jun 2006 14:45:58 -0000	1.3
  +++ Interpolator.java	9 Jun 2006 15:00:18 -0000	1.4
  @@ -13,6 +13,7 @@
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.contexts.Contexts;
   
   /**
    * Interpolates EL expressions in Strings
  @@ -28,8 +29,15 @@
      
      public static Interpolator instance()
      {
  +      if ( Contexts.isApplicationContextActive() )
  +      {
         return (Interpolator) Component.getInstance(Interpolator.class, true);
      }
  +      else
  +      {
  +         return new Interpolator(); //for unit testing
  +      }
  +   }
      
      /**
       * Replace all EL expressions in the form #{...} with their evaluated

User: gavin   
  Date: 06/06/10 03:08:47

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  new mechanism for component installation/configuration - components.xml
  
  Revision  Changes    Path
  1.20      +8 -69     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- Init.java	26 May 2006 01:49:21 -0000	1.19
  +++ Init.java	10 Jun 2006 07:08:47 -0000	1.20
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.19 2006/05/26 01:49:21 gavin Exp $
  +//$Id: Init.java,v 1.20 2006/06/10 07:08:47 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -10,9 +10,10 @@
   import java.util.List;
   import java.util.Map;
   
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  @@ -28,18 +29,8 @@
   @Name("org.jboss.seam.core.init")
   public class Init
   {
  -   private static final String NAME = Seam.getComponentName(Init.class);
  -   public static final String COMPONENT_CLASSES = NAME + ".componentClasses";
  -   public static final String MANAGED_PERSISTENCE_CONTEXTS = NAME + ".managedPersistenceContexts";
  -   public static final String MANAGED_SESSIONS = NAME + ".managedSessions";
  -   public static final String MANAGED_DATA_SOURCES = NAME + ".managedDataSources";
  -   public static final String JNDI_PATTERN = NAME + ".jndiPattern";
  -   
  -   private String[] managedPersistenceContexts = {};
  -   private String[] managedSessions = {};
  -   private String[] managedTopicPublishers = {};
  -   private String[] managedQueueSenders = {};
  -   private String[] componentClasses = {};
  +   private static final Log log = LogFactory.getLog(Init.class);
  +   
      private boolean isClientSideConversations = false;
      private boolean jbpmInstalled;
      private String jndiPattern;
  @@ -49,43 +40,6 @@
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
   
  -   public String[] getManagedPersistenceContexts()
  -   {
  -      return managedPersistenceContexts;
  -   }
  -   public void setManagedPersistenceContexts(String[] managedPersistenceContexts)
  -   {
  -      this.managedPersistenceContexts = managedPersistenceContexts;
  -   }
  -
  -   public String[] getManagedSessions()
  -   {
  -      return managedSessions;
  -   }
  -
  -   public void setManagedSessions(String[] managedSessions)
  -   {
  -      this.managedSessions = managedSessions;
  -   }
  -
  -   public String[] getComponentClasses()
  -   {
  -      return componentClasses;
  -   }
  -
  -   public void setComponentClasses(String[] componentClasses)
  -   {
  -      this.componentClasses = componentClasses;
  -      jbpmInstalled = false;
  -      for (String className: componentClasses)
  -      {
  -         if ( Jbpm.class.getName().equals(className) )
  -         {
  -            jbpmInstalled = true;
  -         }
  -      }
  -   }
  -   
      public static Init instance()
      {
         if ( !Contexts.isApplicationContextActive() )
  @@ -190,24 +144,9 @@
         this.myFacesLifecycleBug = myFacesLifecycleBugExists;
      }
      
  -   public String[] getManagedTopicPublishers()
  -   {
  -      return managedTopicPublishers;
  -   }
  -   
  -   public void setManagedTopicPublishers(String[] managedTopicPublishers)
  -   {
  -      this.managedTopicPublishers = managedTopicPublishers;
  -   }
  -   
  -   public String[] getManagedQueueSenders()
  -   {
  -      return managedQueueSenders;
  -   }
  -   
  -   public void setManagedQueueSenders(String[] managedQueueSenders)
  +   public void setJbpmInstalled(boolean jbpmInstalled)
      {
  -      this.managedQueueSenders = managedQueueSenders;
  +      this.jbpmInstalled = jbpmInstalled;
      }
   
   }

User: gavin   
  Date: 06/06/10 13:01:26

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  fix npe
  
  Revision  Changes    Path
  1.29      +4 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- Jbpm.java	6 Jun 2006 21:03:32 -0000	1.28
  +++ Jbpm.java	10 Jun 2006 17:01:26 -0000	1.29
  @@ -66,8 +66,11 @@
      @Destroy
      public void shutdown()
      {
  +      if (jbpmConfiguration!=null) 
  +      {
         jbpmConfiguration.close();
      }
  +   }
      
      public JbpmConfiguration getJbpmConfiguration()
      {

User: gavin   
  Date: 06/06/16 21:33:32

  Modified:    src/main/org/jboss/seam/core  PojoCache.java
  Log:
  ws
  
  Revision  Changes    Path
  1.2       +9 -5      jboss-seam/src/main/org/jboss/seam/core/PojoCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PojoCache.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PojoCache.java	6 Jun 2006 19:58:10 -0000	1.1
  +++ PojoCache.java	17 Jun 2006 01:33:32 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: PojoCache.java,v 1.1 2006/06/06 19:58:10 gavin Exp $
  +//$Id: PojoCache.java,v 1.2 2006/06/17 01:33:32 gavin Exp $
   package org.jboss.seam.core;
   
   import org.apache.commons.logging.Log;
  @@ -18,7 +18,8 @@
   @Name("pojoCache")
   @Scope(ScopeType.APPLICATION)
   @Intercept(InterceptionType.NEVER)
  -public class PojoCache {
  +public class PojoCache 
  +{
   
   	private static final Log log = LogFactory.getLog(PojoCache.class);
   
  @@ -26,7 +27,8 @@
      private String cfgResourceName = "treecache.xml";
   
      @Create
  -   public void start() throws Exception {
  +   public void start() throws Exception 
  +   {
         log.debug("starting JBoss Cache");
         cache = new org.jboss.cache.aop.PojoCache();
         new PropertyConfigurator().configure(cache, cfgResourceName);
  @@ -34,7 +36,8 @@
      }
      
      @Destroy
  -   public void stop() {
  +   public void stop() 
  +   {
         log.debug("stopping JBoss Cache");
         cache.stop();
         cache.destroy();
  @@ -42,7 +45,8 @@
      }
   
      @Unwrap
  -   public org.jboss.cache.aop.PojoCache getCache() {
  +   public org.jboss.cache.aop.PojoCache getCache() 
  +   {
         return cache;
      }

User: gavin   
  Date: 06/06/17 00:49:31

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  use WebRequest impl oe EVENT context
  set up convo and biz context in direct call to EJB
  
  Revision  Changes    Path
  1.65      +9 -9      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -b -r1.64 -r1.65
  --- Manager.java	17 Jun 2006 01:35:11 -0000	1.64
  +++ Manager.java	17 Jun 2006 04:49:30 -0000	1.65
  @@ -34,7 +34,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.ServerConversationContext;
  -import org.jboss.seam.contexts.Session;
  +import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.util.Id;
   import org.jbpm.pageflow.Page;
   
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.64 $
  + * @version $Revision: 1.65 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -290,7 +290,7 @@
            {
               String conversationId = entry.getKey();
               log.debug("conversation timeout for conversation: " + conversationId);
  -            Session session = Session.getSession(externalContext, true);
  +            ContextAdaptor session = ContextAdaptor.getSession(externalContext, true);
               destroyConversation(conversationId, session, entries);
            }
         }
  @@ -299,7 +299,7 @@
      /**
       * Clean up all state associated with a conversation
       */
  -   private void destroyConversation(String conversationId, Session session, Iterator iter)
  +   private void destroyConversation(String conversationId, ContextAdaptor session, Iterator iter)
      {
         ServerConversationContext conversationContext = new ServerConversationContext(session, conversationId);
         Contexts.destroy( conversationContext );
  @@ -327,7 +327,7 @@
       * if we have a long running conversation, or discard the state
       * of a temporary conversation.
       */
  -   public void storeConversation(Session session, Object response)
  +   public void storeConversation(ContextAdaptor session, Object response)
      {
         if ( isLongRunningConversation() )
         {
  @@ -340,7 +340,7 @@
         }
         else
         {
  -         discardTemporaryConversaction(session, response);
  +         discardTemporaryConversation(session, response);
         }
      }
   
  @@ -368,7 +368,7 @@
         }
      }
   
  -   private void discardTemporaryConversaction(Session session, Object response)
  +   private void discardTemporaryConversation(ContextAdaptor session, Object response)
      {
         log.debug("Discarding conversation state: " + currentConversationId);
   
  @@ -410,12 +410,12 @@
         }
      }
   
  -   private void removeCurrentConversationAndDestroyNestedContexts(Session session) {
  +   private void removeCurrentConversationAndDestroyNestedContexts(ContextAdaptor session) {
         removeConversationEntry(currentConversationId);
         destroyNestedContexts(session, currentConversationId);
      }
   
  -   private void destroyNestedContexts(Session session, String conversationId) {
  +   private void destroyNestedContexts(ContextAdaptor session, String conversationId) {
         Iterator<ConversationEntry> entries = getConversationIdEntryMap().values().iterator();
         while ( entries.hasNext() )
         {

User: gavin   
  Date: 06/06/17 16:07:42

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  remove obsolete
  
  Revision  Changes    Path
  1.30      +0 -3      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- Jbpm.java	10 Jun 2006 17:01:26 -0000	1.29
  +++ Jbpm.java	17 Jun 2006 20:07:42 -0000	1.30
  @@ -46,9 +46,6 @@
   {
      private static final Log log = LogFactory.getLog( Jbpm.class );
      
  -   public static final String PROCESS_DEFINITIONS = Seam.getComponentName(Jbpm.class) + ".processDefinitions";
  -   public static final String PAGEFLOW_DEFINITIONS = Seam.getComponentName(Jbpm.class) + ".pageflowDefinitions";
  -
      private JbpmConfiguration jbpmConfiguration;
      private String[] processDefinitions;
      private String[] pageflowDefinitions;

User: gavin   
  Date: 06/06/17 20:19:11

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  added id to @Begin/@BeginTask
  
  Revision  Changes    Path
  1.66      +35 -1     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -b -r1.65 -r1.66
  --- Manager.java	17 Jun 2006 04:49:30 -0000	1.65
  +++ Manager.java	18 Jun 2006 00:19:11 -0000	1.66
  @@ -13,6 +13,7 @@
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.LinkedList;
  +import java.util.List;
   import java.util.Map;
   import java.util.Set;
   import java.util.StringTokenizer;
  @@ -43,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.65 $
  + * @version $Revision: 1.66 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -80,11 +81,44 @@
         return currentConversationId;
      }
   
  +   /**
  +    * Only public for the unit tests!
  +    * @param id
  +    */
      public void setCurrentConversationId(String id)
      {
         currentConversationId = id;
      }
   
  +   public void updateCurrentConversationId(String id)
  +   {
  +      
  +      String[] names = Contexts.getConversationContext().getNames();
  +      Object[] values = new Object[names.length];
  +      for (int i=0; i<names.length; i++)
  +      {
  +         values[i] = Contexts.getConversationContext().get(names[i]);
  +         Contexts.getConversationContext().remove(names[i]);
  +      }
  +      Contexts.getConversationContext().flush();
  +      
  +      Map<String, ConversationEntry> map = getConversationIdEntryMap();
  +      ConversationEntry ce = map.remove(currentConversationId);
  +      if (ce!=null){
  +         ce.setId(id);
  +         map.put(id, ce);
  +         dirty();
  +      }
  +      currentConversationIdStack.set(0, id);
  +      currentConversationId = id;
  +      
  +      for (int i=0; i<names.length; i++)
  +      {
  +         Contexts.getConversationContext().set(names[i], values[i]);
  +      }
  +      
  +   }
  +
      public Set<String> getSessionConversationIds()
      {
         return getConversationIdEntryMap().keySet();

User: gavin   
  Date: 06/06/17 20:19:41

  Modified:    src/main/org/jboss/seam/core  ConversationEntry.java
  Log:
  oops
  
  Revision  Changes    Path
  1.15      +5 -0      jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationEntry.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntry.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ConversationEntry.java	23 Apr 2006 20:20:19 -0000	1.14
  +++ ConversationEntry.java	18 Jun 2006 00:19:41 -0000	1.15
  @@ -165,4 +165,9 @@
      public void setRemoveAfterRedirect(boolean removeAfterRedirect) {
         this.removeAfterRedirect = removeAfterRedirect;
      }
  +   
  +   void setId(String id)
  +   {
  +      this.id = id;
  +   }
   }
  \ No newline at end of file

User: gavin   
  Date: 06/06/20 06:56:36

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  JBSEAM-268
  
  Revision  Changes    Path
  1.5       +11 -2     jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Interpolator.java	9 Jun 2006 15:00:18 -0000	1.4
  +++ Interpolator.java	20 Jun 2006 10:56:36 -0000	1.5
  @@ -78,10 +78,19 @@
               }
               else 
               {
  -               int index = Integer.parseInt( nextTok.substring(0, 1) );
  +               int index;
  +               try
  +               {
  +                  index = Integer.parseInt( nextTok.substring(0, 1) );
  +               }
  +               catch (NumberFormatException nfe)
  +               {
  +                  builder.append(nextTok);
  +                  continue;
  +               }
                  if (index>=params.length) 
                  {
  -                  throw new IllegalArgumentException("parameter index out of bounds: " + index + " in: " + string);
  +                  log.warn("parameter index out of bounds: " + index + " in: " + string);
                  }
                  builder.append( params[index] );
                  builder.append( nextTok.substring(1) );

User: gavin   
  Date: 06/06/20 06:58:50

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  JBSEAM-268
  
  Revision  Changes    Path
  1.6       +6 -3      jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Interpolator.java	20 Jun 2006 10:56:36 -0000	1.5
  +++ Interpolator.java	20 Jun 2006 10:58:50 -0000	1.6
  @@ -74,7 +74,7 @@
                  {
                     log.warn("exception interpolating string: " + string, e);
                  }
  -               tokens.nextToken();
  +               tokens.nextToken(); //the }
               }
               else 
               {
  @@ -92,10 +92,13 @@
                  {
                     log.warn("parameter index out of bounds: " + index + " in: " + string);
                  }
  +               else
  +               {
                  builder.append( params[index] );
                  builder.append( nextTok.substring(1) );
               }
            }
  +         }
            else
            {
               builder.append(tok);

User: gavin   
  Date: 06/06/21 22:24:51

  Added:       src/main/org/jboss/seam/core  Alias.java
  Log:
  added Alias component
  
  Revision  Changes    Path
  1.1      date: 2006/06/22 02:24:51;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/core/Alias.java
  
  Index: Alias.java
  ===================================================================
  package org.jboss.seam.core;
  
  import static org.jboss.seam.InterceptionType.NEVER;
  
  import org.jboss.seam.Component;
  import org.jboss.seam.ScopeType;
  import org.jboss.seam.annotations.Intercept;
  import org.jboss.seam.annotations.Scope;
  import org.jboss.seam.annotations.Unwrap;
  
  /**
   * Allows creation of an alias to some existing context
   * variable via components.xml.
   * 
   * @author Gavin King
   */
  @Scope(ScopeType.STATELESS)
  @Intercept(NEVER)
  public class Alias
  {
     
     private String name;
     
     @Unwrap
     public Object getValue()
     {
        //Note that by making this component stateless, we ensure
        //that this method never gets called if create=false
        return Component.getInstance(name);
     }
  
     public String getName()
     {
        return name;
     }
  
     public void setName(String name)
     {
        this.name = name;
     }
     
  }

User: gavin   
  Date: 06/06/22 01:23:59

  Modified:    src/main/org/jboss/seam/core  Messages.java
  Log:
  theme support
  
  Revision  Changes    Path
  1.6       +6 -6      jboss-seam/src/main/org/jboss/seam/core/Messages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Messages.java	2 Jun 2006 17:55:09 -0000	1.5
  +++ Messages.java	22 Jun 2006 05:23:59 -0000	1.6
  @@ -35,16 +35,16 @@
         messages = new AbstractMap<String, String>()
         {
            private java.util.ResourceBundle bundle = ResourceBundle.instance();
  -         private Map<String, String> cache = new HashMap<String, String>();
  +         //private Map<String, String> cache = new HashMap<String, String>();
   
            @Override
            public String get(Object key) {
               if (key instanceof String)
               {
                  String resourceKey = (String) key;
  -               String cachedValue = cache.get(key);
  +               /*String cachedValue = cache.get(key);
                  if (cachedValue==null)
  -               {
  +               {*/
                     String resource;
                     try
                     {
  @@ -60,14 +60,14 @@
                     }
                     else
                     {
  -                     cache.put(resourceKey, resource);
  +                     //cache.put(resourceKey, resource);
                        return Interpolator.instance().interpolate(resource);
                     }
  -               }
  +               /*}
                  else
                  {
                     return Interpolator.instance().interpolate(cachedValue);
  -               }
  +               }*/
               }
               else
               {

User: gavin   
  Date: 06/06/22 05:46:01

  Modified:    src/main/org/jboss/seam/core  LocaleSelector.java
  Log:
  JBSEAM-275, JJBSEAM-278
  
  Revision  Changes    Path
  1.10      +25 -2     jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/LocaleSelector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- LocaleSelector.java	22 Jun 2006 08:26:46 -0000	1.9
  +++ LocaleSelector.java	22 Jun 2006 09:46:01 -0000	1.10
  @@ -12,7 +12,9 @@
   import javax.faces.context.FacesContext;
   import javax.faces.model.SelectItem;
   import javax.servlet.ServletRequest;
  +import javax.servlet.http.Cookie;
   import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  @@ -42,10 +44,17 @@
      private String country;
      private String variant;
      
  +   private boolean cookieEnabled;
  +   
      @Create
      public void initLocale()
      {
  -      //TODO: look for a cookie
  +      if (cookieEnabled)
  +      {
  +         Cookie cookie = (Cookie) FacesContext.getCurrentInstance().getExternalContext()
  +               .getRequestCookieMap().get("org.jboss.seam.core.Locale");
  +         if (cookie!=null) setLocaleString( cookie.getValue() );
  +      }
      }
      
      /**
  @@ -56,7 +65,11 @@
         FacesContext.getCurrentInstance().getViewRoot().setLocale( getLocale() );
         Contexts.removeFromAllContexts( Seam.getComponentName(ResourceBundle.class) );
         Contexts.removeFromAllContexts( Seam.getComponentName(Messages.class) );
  -      //TODO: set the cookie
  +      if (cookieEnabled)
  +      {
  +         HttpServletResponse response = (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse();
  +         response.addCookie( new Cookie( "org.jboss.seam.core.Locale", getLocaleString() ) );
  +      }
      }
      
      public Locale calculateLocale(Locale jsfLocale)
  @@ -172,4 +185,14 @@
         this.variant = variant;
      }
      
  +   public boolean isCookieEnabled()
  +   {
  +      return cookieEnabled;
  +   }
  +
  +   public void setCookieEnabled(boolean cookieEnabled)
  +   {
  +      this.cookieEnabled = cookieEnabled;
  +   }
  +   
   }

User: gavin   
  Date: 06/06/22 06:25:42

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  JBSEAM-262
  
  Revision  Changes    Path
  1.18      +36 -3     jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- FacesMessages.java	9 Jun 2006 14:45:58 -0000	1.17
  +++ FacesMessages.java	22 Jun 2006 10:25:41 -0000	1.18
  @@ -172,12 +172,45 @@
      }
      
      /**
  -    * Add a templated FacesMessage by looking for the message
  -    * template in the resource bundle. If it is missing, use
  +    * Add a templated FacesMessage to a particular component id by looking 
  +    * for the message template in the resource bundle. 
  +    */
  +   public void addFromResourceBundle(String id, String key, Object... params)
  +   {
  +      addFromResourceBundle(FacesMessage.SEVERITY_INFO, key, params);
  +   }
  +   
  +   /**
  +    * Add a templated FacesMessage to a particular component id by looking 
  +    * for the message template in the resource bundle. 
  +    */
  +   public void addFromResourceBundle(String id, Severity severity, String key, Object... params)
  +   {
  +      addFromResourceBundle(severity, key, key, params);
  +   }
  +   
  +   /**
  +    * Add a templated FacesMessage to a particular component id by looking 
  +    * for the message template in the resource bundle. If it is missing, use
       * the given message template.
       */
      public void addFromResourceBundle(Severity severity, String key, String defaultMessageTemplate, Object... params)
      {
  +      add( severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
  +   }
  +
  +   /**
  +    * Add a templated FacesMessage to a particular component id by looking 
  +    * for the message template in the resource bundle. If it is missing, use
  +    * the given message template.
  +    */
  +   public void addFromResourceBundle(String id, Severity severity, String key, String defaultMessageTemplate, Object... params)
  +   {
  +      add( id, severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
  +   }
  +
  +   private String interpolateBundleMessage(String key, String defaultMessageTemplate)
  +   {
         String messageTemplate = defaultMessageTemplate;
         java.util.ResourceBundle resourceBundle = ResourceBundle.instance();
         if (resourceBundle!=null) 
  @@ -189,7 +222,7 @@
            }
            catch (MissingResourceException mre) {} //swallow
         }
  -      add(severity, messageTemplate, params);
  +      return messageTemplate;
      }
   
      public void add(InvalidValue iv)

User: theute  
  Date: 06/06/23 08:46:49

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  Added the ability to add/remove pageflow definitions at runtime:
  	http://jira.jboss.org/jira/browse/JBSEAM-176
  
  Howard (hxp) will be happy ;)
  Thanks to Rani Kav who provided a patch.
  
  Revision  Changes    Path
  1.31      +49 -4     jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- Jbpm.java	17 Jun 2006 20:07:42 -0000	1.30
  +++ Jbpm.java	23 Jun 2006 12:46:48 -0000	1.31
  @@ -3,6 +3,7 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.io.InputStream;
  +import java.io.StringReader;
   import java.util.HashMap;
   import java.util.Hashtable;
   import java.util.Map;
  @@ -12,7 +13,6 @@
   import org.apache.commons.logging.LogFactory;
   import org.hibernate.cfg.Environment;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.Intercept;
  @@ -20,6 +20,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.jbpm.PageflowParser;
   import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;
  @@ -35,8 +36,9 @@
    * A seam component that boostraps a JBPM SessionFactory
    * 
    * @author Gavin King
  - * @author <a href="mailto:steve@... Ebersole </a>
  + * @author <a href="mailto:steve@... Ebersole</a>
    * @author Norman Richards
  + * @author <a href="mailto:theute@... Heute</a>
    */
   @Scope(ScopeType.APPLICATION)
   @Intercept(NEVER)
  @@ -137,6 +139,46 @@
         this.processDefinitions = processDefinitions;
      }
      
  +   /**
  +    * Dynamically add a page flow definition, if a pageflow with an identical name already exists,
  +    * the pageflow is updated.
  +    * @param pageflowDefinition The page flow definition
  +    * @return The pageflow definition name.
  +    */
  +   public String addPageflowDefinition(String pageflowDefinition) 
  +   {
  +      String pageFlowName = null;
  +     
  +      if ( pageflowDefinition!=null )
  +      {
  +         ProcessDefinition pd = new PageflowParser( new StringReader(pageflowDefinition) ).readProcessDefinition();
  +         if (log.isDebugEnabled() && pageflowProcessDefinitions.containsKey(pd.getName()))
  +         {
  +            log.debug("Updating the already existing pageflow definition: " + pd.getName());
  +         }
  +         pageflowProcessDefinitions.put( pd.getName(), pd );
  +         pageFlowName = pd.getName();
  +      }
  +      return pageFlowName;
  +   }
  +   
  +   /**
  +    * Remove a pageflow definition
  +    * @param pageflowName Name of the pageflow to remove
  +    * @return true if the pageflow definition has been removed
  +    */
  +   public boolean removePageflowDefinition(String pageflowName) 
  +   {
  +      String pageFlowName = null;
  +     
  +      if (( pageflowName != null ) && pageflowProcessDefinitions.containsKey(pageFlowName))
  +      {
  +         pageflowProcessDefinitions.remove(pageFlowName);
  +         return true;
  +      }
  +      return false;
  +   }
  +   
      private void installPageflowDefinitions() {
         if ( pageflowDefinitions!=null )
         {
  @@ -158,7 +200,10 @@
               for ( String definitionResource : processDefinitions )
               {
                  ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource( definitionResource );
  -               log.trace( "deploying process definition : " + processDefinition.getName() );
  +               if (log.isDebugEnabled())
  +               {
  +                  log.debug( "deploying process definition : " + processDefinition.getName() );
  +               }
                  jbpmContext.deployProcessDefinition(processDefinition);
               }
            }

User: gavin   
  Date: 06/06/24 06:01:23

  Modified:    src/main/org/jboss/seam/core  Messages.java
  Log:
  more robust
  
  Revision  Changes    Path
  1.7       +11 -8     jboss-seam/src/main/org/jboss/seam/core/Messages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Messages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Messages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Messages.java	22 Jun 2006 05:23:59 -0000	1.6
  +++ Messages.java	24 Jun 2006 10:01:23 -0000	1.7
  @@ -45,14 +45,17 @@
                  /*String cachedValue = cache.get(key);
                  if (cachedValue==null)
                  {*/
  -                  String resource;
  +                  String resource=null;
  +                  if (bundle!=null)
  +                  {
                     try
                     {
                        resource = bundle.getString(resourceKey);
                     }
                     catch (MissingResourceException mre)
                     {
  -                     return resourceKey;
  +                        //Just swallow
  +                     }
                     }
                     if (resource==null)
                     {

User: gavin   
  Date: 06/06/24 06:24:31

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  don't just blindly commit user written patches
  
  Revision  Changes    Path
  1.32      +33 -30    jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- Jbpm.java	23 Jun 2006 12:46:48 -0000	1.31
  +++ Jbpm.java	24 Jun 2006 10:24:31 -0000	1.32
  @@ -12,6 +12,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.hibernate.cfg.Environment;
  +import org.hibernate.lob.ReaderInputStream;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Destroy;
  @@ -103,14 +104,14 @@
         return pageflowProcessDefinitions.get(pageflowName);
      }
      
  -   private ProcessDefinition getPageflowDefinitionFromResource(String resourceName)
  +   public ProcessDefinition getPageflowDefinitionFromResource(String resourceName)
      {
         InputStream resource = Resources.getResourceAsStream(resourceName);
         if (resource==null)
         {
            throw new IllegalArgumentException("pageflow resource not found: " + resourceName);
         }
  -      return PageflowHelper.parseInputSource(new InputSource(resource));
  +      return PageflowHelper.parseInputSource( new InputSource(resource) );
      }
      
      public ProcessDefinition getProcessDefinitionFromResource(String resourceName) 
  @@ -140,43 +141,45 @@
      }
      
      /**
  -    * Dynamically add a page flow definition, if a pageflow with an identical name already exists,
  -    * the pageflow is updated.
  -    * @param pageflowDefinition The page flow definition
  -    * @return The pageflow definition name.
  +    * Dynamically deploy a page flow definition, if a pageflow with an 
  +    * identical name already exists, the pageflow is updated.
  +    * 
  +    * @return true if the pageflow definition has been updated
       */
  -   public String addPageflowDefinition(String pageflowDefinition) 
  +   public boolean deployPageflowDefinition(ProcessDefinition pageflowDefinition) 
      {
  -      String pageFlowName = null;
  +      return pageflowProcessDefinitions.put( pageflowDefinition.getName(), pageflowDefinition )!=null;
  +   }
        
  -      if ( pageflowDefinition!=null )
  -      {
  -         ProcessDefinition pd = new PageflowParser( new StringReader(pageflowDefinition) ).readProcessDefinition();
  -         if (log.isDebugEnabled() && pageflowProcessDefinitions.containsKey(pd.getName()))
  +   /**
  +    * Read a pageflow definition
  +    * 
  +    * @param pageflowDefinition the pageflow as an XML string
  +    */
  +   public ProcessDefinition getPageflowDefinitionFromXml(String pageflowDefinition)
            {
  -            log.debug("Updating the already existing pageflow definition: " + pd.getName());
  -         }
  -         pageflowProcessDefinitions.put( pd.getName(), pd );
  -         pageFlowName = pd.getName();
  +      return PageflowHelper.parseInputSource( new InputSource( new ReaderInputStream( new StringReader(pageflowDefinition) ) ) );
         }
  -      return pageFlowName;
  +   
  +   /**
  +    * Read a process definition
  +    * 
  +    * @param processDefinition the process as an XML string
  +    */
  +   public ProcessDefinition getProcessDefinitionFromXml(String processDefinition)
  +   {
  +      return ProcessDefinition.parseXmlInputStream( new ReaderInputStream( new StringReader(processDefinition) ) );
      }
      
      /**
       * Remove a pageflow definition
  +    * 
       * @param pageflowName Name of the pageflow to remove
       * @return true if the pageflow definition has been removed
       */
  -   public boolean removePageflowDefinition(String pageflowName) 
  -   {
  -      String pageFlowName = null;
  -     
  -      if (( pageflowName != null ) && pageflowProcessDefinitions.containsKey(pageFlowName))
  +   public boolean undeployPageflowDefinition(String pageflowName) 
         {
  -         pageflowProcessDefinitions.remove(pageFlowName);
  -         return true;
  -      }
  -      return false;
  +      return pageflowProcessDefinitions.remove(pageflowName)!=null;
      }
      
      private void installPageflowDefinitions() {

User: gavin   
  Date: 06/06/24 06:27:57

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  import
  
  Revision  Changes    Path
  1.33      +0 -1      jboss-seam/src/main/org/jboss/seam/core/Jbpm.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Jbpm.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Jbpm.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- Jbpm.java	24 Jun 2006 10:24:31 -0000	1.32
  +++ Jbpm.java	24 Jun 2006 10:27:57 -0000	1.33
  @@ -21,7 +21,6 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.jbpm.PageflowParser;
   import org.jboss.seam.jbpm.SeamVariableResolver;
   import org.jboss.seam.util.Naming;
   import org.jboss.seam.util.Resources;

User: gavin   
  Date: 06/06/28 15:04:17

  Modified:    src/main/org/jboss/seam/core  Conversation.java
  Log:
  convenience method
  
  Revision  Changes    Path
  1.17      +13 -0     jboss-seam/src/main/org/jboss/seam/core/Conversation.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Conversation.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Conversation.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- Conversation.java	20 Jun 2006 04:11:03 -0000	1.16
  +++ Conversation.java	28 Jun 2006 19:04:17 -0000	1.17
  @@ -196,6 +196,19 @@
      }
      
      /**
  +    * Is this conversation long-running? Note that this method returns
  +    * false even when the conversation has been temporarily promoted
  +    * to long-running for the course of a redirect, so it does what
  +    * the user really expects.
  +    */
  +   public boolean isLongRunning()
  +   {
  +      Manager manager = Manager.instance();
  +      return manager.isLongRunningConversation() && 
  +            !manager.getCurrentConversationEntry().isRemoveAfterRedirect();
  +   }
  +   
  +   /**
       * Get the id of the immediate parent of a nested conversation
       */
      public String getParentId()

User: gavin   
  Date: 06/06/28 18:22:50

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  org.jboss.seam.core.manager.conversationIdParameter
  
  Revision  Changes    Path
  1.68      +16 -4     jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -b -r1.67 -r1.68
  --- Manager.java	28 Jun 2006 18:35:21 -0000	1.67
  +++ Manager.java	28 Jun 2006 22:22:50 -0000	1.68
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.67 $
  + * @version $Revision: 1.68 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -76,6 +76,8 @@
   
      private int conversationTimeout = 600000; //10 mins
   
  +   private String conversationIdParameter = "conversationId";
  +
      public String getCurrentConversationId()
      {
         return currentConversationId;
  @@ -436,11 +438,11 @@
      {
         if (response instanceof HttpServletResponse)
         {
  -         ( (HttpServletResponse) response ).setHeader("conversationId", conversationId);
  +         ( (HttpServletResponse) response ).setHeader(conversationIdParameter, conversationId);
         }
         else if (response instanceof ActionResponse)
         {
  -         ( (ActionResponse) response ).setRenderParameter("conversationId", conversationId);
  +         ( (ActionResponse) response ).setRenderParameter(conversationIdParameter, conversationId);
         }
      }
   
  @@ -611,7 +613,7 @@
       * @return the conversation id
       */
      private String getConversationIdFromRequestParameter(Map parameters) {
  -      Object object = parameters.get("conversationId");
  +      Object object = parameters.get(conversationIdParameter);
         if (object==null)
         {
            return null;
  @@ -903,4 +905,14 @@
         this.nonFacesRequest = nonFacesRequest;
      }
      
  +   public String getConversationIdParameter()
  +   {
  +      return conversationIdParameter;
  +   }
  +
  +   public void setConversationIdParameter(String conversationIdParameter)
  +   {
  +      this.conversationIdParameter = conversationIdParameter;
  +   }
  +   
   }

User: gavin   
  Date: 06/06/30 06:20:55

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  JBSEAM-288
  
  Revision  Changes    Path
  1.69      +8 -3      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -b -r1.68 -r1.69
  --- Manager.java	28 Jun 2006 22:22:50 -0000	1.68
  +++ Manager.java	30 Jun 2006 10:20:54 -0000	1.69
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.68 $
  + * @version $Revision: 1.69 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -761,8 +761,13 @@
      }
   
      public String encodeConversationId(String url) {
  -      char sep = url.contains("?") ? '&' : '?';
  -      return url + sep + "conversationId=" + getCurrentConversationId();
  +      return new StringBuilder( url.length() + conversationIdParameter.length() + 5 )
  +         .append(url)
  +         .append( url.contains("?") ? '&' : '?' )
  +         .append(conversationIdParameter)
  +         .append('=')
  +         .append( getCurrentConversationId() )
  +         .toString();
      }
   
      /**

User: gavin   
  Date: 06/06/30 16:56:50

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  oops
  
  Revision  Changes    Path
  1.18      +1 -1      jboss-seam/src/main/org/jboss/seam/core/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/core/Pages.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Pages.java	30 Jun 2006 20:42:43 -0000	1.17
  +++ Pages.java	30 Jun 2006 20:56:50 -0000	1.18
  @@ -97,7 +97,7 @@
                  timeoutsByViewId.put( viewId, Integer.parseInt(timeoutString) );
               }
               String noConversationViewId = page.attributeValue("no-conversation-view-id");
  -            if (timeoutString!=null)
  +            if (noConversationViewId!=null)
               {
                  noConverationViewIdByViewId.put( viewId, noConversationViewId );
               }

User: gavin   
  Date: 06/06/30 18:50:07

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  smallish fixes
  
  Revision  Changes    Path
  1.73      +26 -15    jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -b -r1.72 -r1.73
  --- Manager.java	30 Jun 2006 20:42:43 -0000	1.72
  +++ Manager.java	30 Jun 2006 22:50:07 -0000	1.73
  @@ -43,7 +43,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.72 $
  + * @version $Revision: 1.73 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -296,7 +296,8 @@
      public boolean isReallyLongRunningConversation()
      {
         return isLongRunningConversation() && 
  -            !getCurrentConversationEntry().isRemoveAfterRedirect();
  +            !getCurrentConversationEntry().isRemoveAfterRedirect() &&
  +            !Seam.isSessionInvalid();
      }
   
      public void setLongRunningConversation(boolean isLongRunningConversation)
  @@ -399,9 +400,12 @@
         {
            //TODO: we really only need to execute this code when we are in the 
            //      RENDER_RESPONSE phase, ie. not before redirects
  +         if ( isReallyLongRunningConversation() )
  +         {
            Contexts.getPageContext().set( CONVERSATION_ID, currentConversationId );
            Contexts.getPageContext().set( CONVERSATION_IS_LONG_RUNNING, true );
         }
  +      }
         writeConversationIdToResponse(response, currentConversationId);
         
         if ( Contexts.isPageContextActive() && Init.instance().isJbpmInstalled() )
  @@ -778,6 +782,12 @@
      }
   
      public String encodeConversationId(String url) {
  +      if ( Seam.isSessionInvalid() )
  +      {
  +         return url;
  +      }
  +      else
  +      {
         StringBuilder builder = new StringBuilder( url.length() + conversationIdParameter.length() + 5 )
               .append(url)
               .append( url.contains("?") ? '&' : '?' )
  @@ -793,6 +803,7 @@
         }
         return builder.toString();
      }
  +   }
   
      /**
       * Redirect to the given view id, encoding the conversation id

User: gavin   
  Date: 06/07/01 08:38:48

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  improve error page
  
  Revision  Changes    Path
  1.76      +8 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -b -r1.75 -r1.76
  --- Manager.java	1 Jul 2006 11:29:21 -0000	1.75
  +++ Manager.java	1 Jul 2006 12:38:48 -0000	1.76
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute@... Heute</a>
  - * @version $Revision: 1.75 $
  + * @version $Revision: 1.76 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -614,9 +614,15 @@
            ConversationEntry ce = getCurrentConversationEntry();
            setCurrentConversationIdStack( ce.getConversationIdStack() );
   
  -         if ( ce.isRemoveAfterRedirect() )
  +         boolean removeAfterRedirect = ce.isRemoveAfterRedirect() && !(
  +               Init.instance().isDebug() &&
  +               "/debug.xhtml".equals( FacesContext.getCurrentInstance().getViewRoot().getViewId() )
  +            );
  +         
  +         if (removeAfterRedirect)
            {
               setLongRunningConversation(false);
  +            ce.setRemoveAfterRedirect(false);
            }
            
            return true;

User: gavin   
  Date: 06/07/02 22:28:28

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  support <factory> in components.xml
  
  Revision  Changes    Path
  1.22      +18 -5     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- Init.java	17 Jun 2006 01:35:11 -0000	1.21
  +++ Init.java	3 Jul 2006 02:28:28 -0000	1.22
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.21 2006/06/17 01:35:11 gavin Exp $
  +//$Id: Init.java,v 1.22 2006/07/03 02:28:28 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -10,8 +10,9 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  +import javax.faces.context.FacesContext;
  +import javax.faces.el.MethodBinding;
  +
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Intercept;
  @@ -29,7 +30,6 @@
   @Name("org.jboss.seam.core.init")
   public class Init
   {
  -   private static final Log log = LogFactory.getLog(Init.class);
      
      private boolean isClientSideConversations = false;
      private boolean jbpmInstalled;
  @@ -38,8 +38,9 @@
      private boolean myFacesLifecycleBug;
      private List<String> mutableComponentNames = new ArrayList<String>();
      
  -   private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
  +   private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
  +   private Map<String, MethodBinding> factoryMethodBindings = new HashMap<String, MethodBinding>();
      
      public static Init instance()
      {
  @@ -81,11 +82,23 @@
         return factories.get(variable);
      }
      
  +   public MethodBinding getFactoryMethodBinding(String variable)
  +   {
  +      return factoryMethodBindings.get(variable);
  +   }
  +   
      public void addFactoryMethod(String variable, Method method, Component component)
      {
   	   factories.put( variable, new FactoryMethod(method, component) );
      }
      
  +   public void addFactory(String variable, String methodBindingExpression)
  +   {
  +      MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
  +            .createMethodBinding(methodBindingExpression, null);
  +      factoryMethodBindings.put(variable, methodBinding);
  +   }
  +   
      public static class ObserverMethod {
         public Method method;
         public Component component;

User: gavin   
  Date: 06/07/03 12:57:44

  Modified:    src/main/org/jboss/seam/core  Init.java
  Log:
  factory methods that return values
  
  Revision  Changes    Path
  1.23      +17 -5     jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- Init.java	3 Jul 2006 02:28:28 -0000	1.22
  +++ Init.java	3 Jul 2006 16:57:44 -0000	1.23
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.22 2006/07/03 02:28:28 gavin Exp $
  +//$Id: Init.java,v 1.23 2006/07/03 16:57:44 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -40,7 +40,7 @@
      
      private Map<String, List<ObserverMethod>> observers = new HashMap<String, List<ObserverMethod>>();
      private Map<String, FactoryMethod> factories = new HashMap<String, FactoryMethod>();
  -   private Map<String, MethodBinding> factoryMethodBindings = new HashMap<String, MethodBinding>();
  +   private Map<String, FactoryMethodBinding> factoryMethodBindings = new HashMap<String, FactoryMethodBinding>();
      
      public static Init instance()
      {
  @@ -70,10 +70,22 @@
      public static class FactoryMethod {
   	   public Method method;
   	   public Component component;
  +      public ScopeType scope;
   	   FactoryMethod(Method method, Component component)
   	   {
   		   this.method = method;
   		   this.component = component;
  +         scope = method.getAnnotation(org.jboss.seam.annotations.Factory.class).scope();
  +	   }
  +   }
  +   
  +   public static class FactoryMethodBinding {
  +      public MethodBinding methodBinding;
  +      public ScopeType scope;
  +      FactoryMethodBinding(MethodBinding methodBinding, ScopeType scope)
  +      {
  +         this.methodBinding = methodBinding;
  +         this.scope = scope;
   	   }
      }
      
  @@ -82,7 +94,7 @@
         return factories.get(variable);
      }
      
  -   public MethodBinding getFactoryMethodBinding(String variable)
  +   public FactoryMethodBinding getFactoryMethodBinding(String variable)
      {
         return factoryMethodBindings.get(variable);
      }
  @@ -92,11 +104,11 @@
   	   factories.put( variable, new FactoryMethod(method, component) );
      }
      
  -   public void addFactory(String variable, String methodBindingExpression)
  +   public void addFactory(String variable, String methodBindingExpression, ScopeType scope)
      {
         MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
               .createMethodBinding(methodBindingExpression, null);
  -      factoryMethodBindings.put(variable, methodBinding);
  +      factoryMethodBindings.put( variable, new FactoryMethodBinding(methodBinding, scope) );
      }
      
      public static class ObserverMethod {

User: gavin   
  Date: 06/07/04 19:43:47

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  JBSEAM-285
  
  Revision  Changes    Path
  1.7       +14 -1     jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Interpolator.java	20 Jun 2006 10:58:50 -0000	1.6
  +++ Interpolator.java	4 Jul 2006 23:43:46 -0000	1.7
  @@ -3,6 +3,7 @@
   import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.ScopeType.STATELESS;
   
  +import java.text.MessageFormat;
   import java.util.StringTokenizer;
   
   import javax.faces.context.FacesContext;
  @@ -47,12 +48,24 @@
       * @return the interpolated string
       */
      public String interpolate(String string, Object... params) {
  -      if ( string.indexOf('#')<0 ) return string;
         if ( params.length>10 ) 
         {
            throw new IllegalArgumentException("more than 10 parameters");
         }
         
  +      if ( string.indexOf('#')>=0 )
  +      {
  +         string = interpolateExpressions(string, params);
  +      }
  +      if ( params.length>1 && string.indexOf('{')>=0 )
  +      {
  +         string = new MessageFormat(string, Locale.instance()).format(params);
  +      }
  +      return string;
  +   }
  +
  +   private String interpolateExpressions(String string, Object... params)
  +   {
         FacesContext context = FacesContext.getCurrentInstance();
         StringTokenizer tokens = new StringTokenizer(string, "#{}", true);
         StringBuilder builder = new StringBuilder(string.length());