lenya/src/webapp/lenya/content/rc versions-screen.xsp,1.10,1.11 view.xsp,1.7,1.8

Update of /usr/local/repositories/lenya/src/webapp/lenya/content/rc
In directory erbium:/tmp/cvs-serv19453/src/webapp/lenya/content/rc

Modified Files:
	versions-screen.xsp view.xsp 
Log Message:
Revision Controller in the usecase sitemap

Index: versions-screen.xsp
===================================================================
RCS file: /usr/local/repositories/lenya/src/webapp/lenya/content/rc/versions-screen.xsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** versions-screen.xsp	8 May 2003 10:09:38 -0000	1.10
--- versions-screen.xsp	20 May 2003 16:45:20 -0000	1.11
***************
*** 4,9 ****
         language="java" 
         xmlns:xsp="http://apache.org/xsp" 
!        xmlns:util="http://apache.org/xsp/util/2.0"
!        xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
         >
         
--- 4,8 ----
         language="java" 
         xmlns:xsp="http://apache.org/xsp" 
!        xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
         >
         
***************
*** 12,15 ****
--- 11,15 ----
      <xsp:include>java.io.IOException</xsp:include>
      <xsp:include>org.apache.cocoon.environment.Session</xsp:include>
+     <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
      <xsp:include>org.apache.lenya.cms.rc.RCEnvironment</xsp:include>
    </xsp:structure>                                                                                                                          
***************
*** 18,33 ****
  
      <!-- Import Lenya Page Envelope -->
-     <xsp-lenya:util/>
- 
      <xsp:logic>
- 
        String docId = request.getParameter("documentid");
!       String filename=xspUtilPublication.getEnvironment().getAuthoringPath() + "/" +docId;
  
!       <xsp:content><filename><xsp:expr>filename</xsp:expr></filename></xsp:content>
        <xsp:content><usecase><xsp:expr>request.getParameter("lenya.usecase")</xsp:expr></usecase></xsp:content>
  
!       String rootDir=xspUtilPublicationPath;
!       RCEnvironment rcEnvironment = new RCEnvironment(xspUtilServletContextPath);
        String rcmlDirectory = rcEnvironment.getRCMLDirectory();
        rcmlDirectory=rootDir+rcmlDirectory;
--- 18,36 ----
  
      <!-- Import Lenya Page Envelope -->
      <xsp:logic>
        String docId = request.getParameter("documentid");
!       <xsp:content><documentId><xsp:expr>docId</xsp:expr></documentId></xsp:content>
  
!       Publication publication = (Publication)<input:get-attribute module="page-envelope" as="object" name="publication"/>;
!       String filename=publication.getEnvironment().getAuthoringPath() + "/" +docId;
        <xsp:content><usecase><xsp:expr>request.getParameter("lenya.usecase")</xsp:expr></usecase></xsp:content>
+       <xsp:content><request_uri><xsp:expr>request.getRequestURI()</xsp:expr></request_uri></xsp:content>
  
! 
!       String rootDir=publication.getEnvironment().getPublicationPath();
! 
!       String servletContextPath = publication.getServletContext().getCanonicalPath();
! 
!       RCEnvironment rcEnvironment = new RCEnvironment(servletContextPath);
        String rcmlDirectory = rcEnvironment.getRCMLDirectory();
        rcmlDirectory=rootDir+rcmlDirectory;

Index: view.xsp
===================================================================
RCS file: /usr/local/repositories/lenya/src/webapp/lenya/content/rc/view.xsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** view.xsp	30 Apr 2003 16:44:24 -0000	1.7
--- view.xsp	20 May 2003 16:45:20 -0000	1.8
***************
*** 4,9 ****
         language="java"
         xmlns:xsp="http://apache.org/xsp"
!        xmlns:util="http://apache.org/xsp/util/2.0"
!        xmlns:xsp-lenya="http://www.lenya.org/xsp/lenya/1.0"
         >
  
--- 4,8 ----
         language="java"
         xmlns:xsp="http://apache.org/xsp"
!        xmlns:input="http://apache.org/cocoon/xsp/input/1.0"
         >
  
***************
*** 11,14 ****
--- 10,14 ----
      <xsp:include>org.apache.lenya.cms.rc.RevisionController</xsp:include>
      <xsp:include>org.apache.lenya.cms.rc.RCEnvironment</xsp:include>
+     <xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
      <xsp:include>org.apache.lenya.xml.DOMParserFactory</xsp:include>
    </xsp:structure>                                                                                                                          
***************
*** 17,29 ****
  
      <!-- Import Lenya Page Envelope -->
-     <xsp-lenya:util/>
  
      <xsp:logic>
  
!       String filename=request.getParameter("filename");                 
        String rollbackTime=request.getParameter("rollbackTime");
-       String rootDir=xspUtilPublicationPath;
  
!       RCEnvironment rcEnvironment = new RCEnvironment(xspUtilServletContextPath);
        String rcmlDirectory = rcEnvironment.getRCMLDirectory();
        rcmlDirectory=rootDir+rcmlDirectory;
--- 17,33 ----
  
      <!-- Import Lenya Page Envelope -->
  
      <xsp:logic>
  
!       String docId=request.getParameter("documentid");                 
        String rollbackTime=request.getParameter("rollbackTime");
  
!       Publication publication = (Publication)<input:get-attribute module="page-envelope" as="object" name="publication"/>;
!       String rootDir=publication.getEnvironment().getPublicationPath();
!       String servletContextPath = publication.getServletContext().getCanonicalPath();
! 
!       String filename = publication.getEnvironment().getAuthoringPath() + "/" +docId;    
!  
!       RCEnvironment rcEnvironment = new RCEnvironment(servletContextPath);
        String rcmlDirectory = rcEnvironment.getRCMLDirectory();
        rcmlDirectory=rootDir+rcmlDirectory;