svn commit: r151165 - in lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon: acting/RevisionControllerAction.java flow/FlowHelper.java

[mi...@apache.org]

Author: michi
Date: Thu Feb  3 07:34:19 2005
New Revision: 151165

URL: http://svn.apache.org/viewcvs?view=rev&rev=151165
Log:
thanks to Josias softlinks for the content and resources directory should be possible

Modified:
    lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
    lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java

Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java?view=diff&r1=151164&r2=151165
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Thu Feb  3 07:34:19 2005
@@ -15,7 +15,7 @@
  *
  */
 
-/* $Id: RevisionControllerAction.java,v 1.35 2004/08/16 12:14:13 andreas Exp $  */
+/* $Id$  */
 
 package org.apache.lenya.cms.cocoon.acting;
 
@@ -92,9 +92,9 @@
         }
 
         //get Parameters for RC
-        String publicationPath = publication.getDirectory().getCanonicalPath();
+        String publicationPath = publication.getDirectory().getAbsolutePath();
         RCEnvironment rcEnvironment =
-            RCEnvironment.getInstance(publication.getServletContext().getCanonicalPath());
+            RCEnvironment.getInstance(publication.getServletContext().getAbsolutePath());
         rcmlDirectory = rcEnvironment.getRCMLDirectory();
         rcmlDirectory = publicationPath + File.separator + rcmlDirectory;
         backupDirectory = rcEnvironment.getBackupDirectory();
@@ -147,10 +147,10 @@
                 builder.buildCanonicalUrl(publication, document.getArea(), documentid, language);
             Document srcDoc = builder.buildDocument(publication, srcUrl);
             File newFile = srcDoc.getFile();
-            filename = newFile.getCanonicalPath();
+            filename = newFile.getAbsolutePath();
 
         } else {
-            filename = document.getFile().getCanonicalPath();
+            filename = document.getFile().getAbsolutePath();
         }
 
         filename = filename.substring(publicationPath.length());

Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java?view=diff&r1=151164&r2=151165
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelper.java Thu Feb  3 07:34:19 2005
@@ -206,8 +206,8 @@
     public RevisionController getRevisionController(FOM_Cocoon cocoon) 
     throws PageEnvelopeException, IOException {        
         final Publication publication = getPageEnvelope(cocoon).getPublication();
-        final String publicationPath = publication.getDirectory().getCanonicalPath();
-        final RCEnvironment rcEnvironment = RCEnvironment.getInstance(publication.getServletContext().getCanonicalPath());
+        final String publicationPath = publication.getDirectory().getAbsolutePath();
+        final RCEnvironment rcEnvironment = RCEnvironment.getInstance(publication.getServletContext().getAbsolutePath());
         String rcmlDirectory = rcEnvironment.getRCMLDirectory();
         rcmlDirectory = publicationPath + File.separator + rcmlDirectory;
         String backupDirectory = rcEnvironment.getBackupDirectory();
@@ -230,7 +230,7 @@
         final Identity identity = (Identity) ObjectModelHelper.getRequest(cocoon.getObjectModel()).getSession().getAttribute(Identity.class.getName());
         final PageEnvelope pageEnvelope = getPageEnvelope(cocoon);
         final Publication publication = getPageEnvelope(cocoon).getPublication();
-        final String filename = pageEnvelope.getDocument().getFile().getCanonicalPath().substring(publication.getDirectory().getCanonicalPath().length());   
+        final String filename = pageEnvelope.getDocument().getFile().getAbsolutePath().substring(publication.getDirectory().getAbsolutePath().length());   
         getRevisionController(cocoon).reservedCheckIn(filename, identity.getUser().getId(), backup);
     }
 }



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