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

[Gavin King]

  User: gavin   
  Date: 06/11/03 21:17:50

  Modified:    src/main/org/jboss/seam/core  Jbpm.java
  Log:
  JBSEAM-431
  
  Revision  Changes    Path
  1.35      +29 -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.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- Jbpm.java	30 Jun 2006 10:58:26 -0000	1.34
  +++ Jbpm.java	4 Nov 2006 02:17:50 -0000	1.35
  @@ -9,6 +9,8 @@
   import java.util.Map;
   import java.util.Properties;
   
  +import javax.naming.NamingException;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.hibernate.cfg.Environment;
  @@ -49,6 +51,7 @@
      private static final Log log = LogFactory.getLog( Jbpm.class );
      
      private JbpmConfiguration jbpmConfiguration;
  +   private String jbpmConfigurationJndiName;
      private String[] processDefinitions;
      private String[] pageflowDefinitions;
      private Map<String, ProcessDefinition> pageflowProcessDefinitions = new HashMap<String, ProcessDefinition>();
  @@ -82,7 +85,22 @@
   
      private void initJbpmConfiguration()
      {
  +      if (jbpmConfigurationJndiName==null)
  +      {
         jbpmConfiguration = JbpmConfiguration.getInstance();
  +      }
  +      else
  +      {
  +         try
  +         {
  +            jbpmConfiguration = (JbpmConfiguration) Naming.getInitialContext().lookup(jbpmConfigurationJndiName);
  +         }
  +         catch (NamingException ne)
  +         {
  +            throw new IllegalArgumentException("JbpmConfiguration not found in JNDI", ne);
  +         }
  +      }
  +
         DbPersistenceServiceFactory dbpsf = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory("persistence");
         if (Naming.getInitialContextProperties()!=null)
         {
  @@ -225,4 +243,14 @@
         return (Jbpm) Contexts.getApplicationContext().get(Jbpm.class);
      }
      
  +   protected String getJbpmConfigurationJndiName()
  +   {
  +      return jbpmConfigurationJndiName;
  +   }
  +
  +   protected void setJbpmConfigurationJndiName(String jbpmConfigurationJndiName)
  +   {
  +      this.jbpmConfigurationJndiName = jbpmConfigurationJndiName;
  +   }
  +   
   }