You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2003/12/03 16:26:30 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting RevisionControllerAction.java

michi       2003/12/03 07:26:30

  Modified:    src/java/org/apache/lenya/cms/cocoon/acting
                        RevisionControllerAction.java
  Log:
  AbsolutePath replaced by CanonicalPath because of Softlink problem
  
  Revision  Changes    Path
  1.30      +9 -4      cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
  
  Index: RevisionControllerAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- RevisionControllerAction.java	3 Dec 2003 15:14:48 -0000	1.29
  +++ RevisionControllerAction.java	3 Dec 2003 15:26:30 -0000	1.30
  @@ -138,7 +138,8 @@
           //get Parameters for RC
           String publicationPath = publication.getDirectory().getCanonicalPath();
           RCEnvironment rcEnvironment =
  -            RCEnvironment.getInstance(publication.getServletContext().getAbsolutePath());
  +        RCEnvironment.getInstance(publication.getServletContext().getCanonicalPath());
  +        //RCEnvironment.getInstance(publication.getServletContext().getAbsolutePath());
           rcmlDirectory = rcEnvironment.getRCMLDirectory();
           rcmlDirectory = publicationPath + File.separator + rcmlDirectory;
           backupDirectory = rcEnvironment.getBackupDirectory();
  @@ -193,13 +194,17 @@
               String srcUrl = builder.buildCanonicalUrl(publication, document.getArea(), documentid, language);
               Document srcDoc = builder.buildDocument(publication, srcUrl);
               File newFile = srcDoc.getFile();
  -            filename = newFile.getAbsolutePath();
  +            filename = newFile.getCanonicalPath();
  +            //filename = newFile.getAbsolutePath();
   
           } else {
  -            filename = document.getFile().getAbsolutePath();
  +            filename = document.getFile().getCanonicalPath();
  +            //filename = document.getFile().getAbsolutePath();
           }
   
  +        log.error("Filename (with publicationPath): " + filename);
           filename = filename.substring(publicationPath.length());
  +        log.error("Publication Path: " + publicationPath);
           log.error("Filename: " + filename);
   
           username = null;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org