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

[Gavin King]

  User: gavin   
  Date: 07/06/02 21:58:01

  Modified:    src/main/org/jboss/seam/core   Jbpm.java Pages.java
  Log:
  JBSEAM-715
  
  Revision  Changes    Path
  1.42      +8 -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.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- Jbpm.java	17 May 2007 09:12:53 -0000	1.41
  +++ Jbpm.java	3 Jun 2007 01:58:01 -0000	1.42
  @@ -146,19 +146,23 @@
         return ProcessDefinition.parseXmlInputStream(resource);
      }
   
  -   public String[] getPageflowDefinitions() {
  +   public String[] getPageflowDefinitions() 
  +   {
         return pageflowDefinitions;
      }
   
  -   public void setPageflowDefinitions(String[] pageflowDefinitions) {
  +   public void setPageflowDefinitions(String[] pageflowDefinitions) 
  +   {
         this.pageflowDefinitions = pageflowDefinitions;
      }
      
  -   public String[] getProcessDefinitions() {
  +   public String[] getProcessDefinitions() 
  +   {
         return processDefinitions;
      }
   
  -   public void setProcessDefinitions(String[] processDefinitions) {
  +   public void setProcessDefinitions(String[] processDefinitions) 
  +   {
         this.processDefinitions = processDefinitions;
      }
      
  
  
  
  1.121     +23 -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.120
  retrieving revision 1.121
  diff -u -b -r1.120 -r1.121
  --- Pages.java	3 Jun 2007 01:15:35 -0000	1.120
  +++ Pages.java	3 Jun 2007 01:58:01 -0000	1.121
  @@ -86,6 +86,8 @@
      private Integer httpPort;
      private Integer httpsPort;
    
  +   private String[] resources = { "/WEB-INF/pages.xml" };
  + 
      private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
            new Comparator<String>() {
               public int compare(String x, String y)
  @@ -100,17 +102,20 @@
      @Create
      public void initialize()
      {
  -      InputStream stream = Resources.getResourceAsStream("/WEB-INF/pages.xml");      
  +      for (String resource: resources)
  +      {
  +         InputStream stream = Resources.getResourceAsStream(resource);      
         if (stream==null)
         {
  -         log.debug("no pages.xml file found");
  +            log.info("no pages.xml file found: " + resource);
         }
         else
         {
  -         log.debug("reading pages.xml");
  +            log.debug("reading pages.xml file: " + resource);
            parse(stream);
         }
      }
  +   }
      /**
       * Run any navigation rule defined in pages.xml
       * 
  @@ -1421,4 +1426,14 @@
         this.invalidateSessionBeforeSchemeChange = invalidateSessionBeforeSchemeChange;
      }
      
  +   public String[] getResources()
  +   {
  +      return resources;
  +   }
  +   
  +   public void setResources(String[] resources)
  +   {
  +      this.resources = resources;
  +   }
  +   
   }