CVS: Tapestry/framework/src/net/sf/tapestry/pageload PageSpecificationResolver.java,1.1.2.2,1.1.2.3

Update of /cvsroot/tapestry/Tapestry/framework/src/net/sf/tapestry/pageload
In directory sc8-pr-cvs1:/tmp/cvs-serv7216/framework/src/net/sf/tapestry/pageload

Modified Files:
      Tag: hship-2-3
	PageSpecificationResolver.java 
Log Message:
Fix a bug where pages defined in the application spec were not locatable.
Make a slight change to where page specifications are stored under WEB-INF.

Index: PageSpecificationResolver.java
===================================================================
RCS file: /cvsroot/tapestry/Tapestry/framework/src/net/sf/tapestry/pageload/Attic/PageSpecificationResolver.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** PageSpecificationResolver.java	12 Dec 2002 12:42:39 -0000	1.1.2.2
--- PageSpecificationResolver.java	13 Dec 2002 12:22:45 -0000	1.1.2.3
***************
*** 23,27 ****
   *  <ul>
   *  <li><i>simple-name</i>.page in the same folder as the application specification
!  *  <li><i>simple-name</i> page in the WEB-INF/pages/<i>servlet-name</i> directory of the context root
   *  <li><i>simple-name</i>.page in WEB-INF
   *  <li><i>simple-name</i>.page in the application root (within the context root)
--- 23,27 ----
   *  <ul>
   *  <li><i>simple-name</i>.page in the same folder as the application specification
!  *  <li><i>simple-name</i> page in the WEB-INF/<i>servlet-name</i> directory of the context root
   *  <li><i>simple-name</i>.page in WEB-INF
   *  <li><i>simple-name</i>.page in the application root (within the context root)
***************
*** 63,67 ****
  
          _webInfLocation = _applicationRootLocation.getRelativeLocation("/WEB-INF/");
!         _webInfPagesLocation = _webInfLocation.getRelativeLocation("pages/" + servletName + "/");
      }
  
--- 63,67 ----
  
          _webInfLocation = _applicationRootLocation.getRelativeLocation("/WEB-INF/");
!         _webInfPagesLocation = _webInfLocation.getRelativeLocation(servletName + "/");
      }
  
***************
*** 73,82 ****
       * 
       **/
!     
      public void resolve(String pageName)
      {
          _namespace = null;
          _specification = null;
!         
          int colonx = pageName.indexOf(':');
  
--- 73,82 ----
       * 
       **/
! 
      public void resolve(String pageName)
      {
          _namespace = null;
          _specification = null;
! 
          int colonx = pageName.indexOf(':');
  
***************
*** 99,105 ****
  
          if (_namespace.containsPage(_simplePageName))
              _specification = _namespace.getPageSpecification(_simplePageName);
          {
! 
              searchForPage();
  
--- 99,109 ----
  
          if (_namespace.containsPage(_simplePageName))
+         {
              _specification = _namespace.getPageSpecification(_simplePageName);
+         }
+         else
          {
!             // Not defined in the specification, so it's time to hunt it down.
!             
              searchForPage();
  



-------------------------------------------------------
This sf.net email is sponsored by:
With Great Power, Comes Great Responsibility 
Learn to use your power at OSDN's High Performance Computing Channel
http://hpc.devchannel.org/