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

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/rc RevisionController.java RCML.java

edith       2003/08/26 08:51:12

  Modified:    src/java/org/apache/lenya/cms/rc RevisionController.java
                        RCML.java
  Log:
  change file  path
  
  Revision  Changes    Path
  1.21      +6 -6      cocoon-lenya/src/java/org/apache/lenya/cms/rc/RevisionController.java
  
  Index: RevisionController.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/rc/RevisionController.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- RevisionController.java	25 Jul 2003 18:59:04 -0000	1.20
  +++ RevisionController.java	26 Aug 2003 15:51:12 -0000	1.21
  @@ -262,11 +262,11 @@
               }
           }
   
  -        File originalFile = new File(rootDir + destination);
  +        File originalFile = new File(rootDir , destination);
           long time = new Date().getTime();
   
           if (backup && originalFile.isFile()) {
  -            File backupFile = new File(backupDir + "/" + destination + ".bak." + time);
  +            File backupFile = new File(backupDir , destination + ".bak." + time);
               File parent = new File(backupFile.getParent());
   
               if (!parent.isDirectory()) {
  @@ -309,7 +309,7 @@
        * @return DOCUMENT ME!
        */
       public String getBackupFilename(long time, String filename) {
  -        File backup = new File(backupDir + "/" + filename + ".bak." + time);
  +        File backup = new File(backupDir , filename + ".bak." + time);
   
           return backup.getAbsolutePath();
       }
  @@ -334,8 +334,8 @@
               Exception {
           // Make sure the old version exists
           //
  -        File backup = new File(backupDir + "/" + destination + ".bak." + time);
  -        File current = new File(rootDir + destination);
  +        File backup = new File(backupDir , destination + ".bak." + time);
  +        File current = new File(rootDir , destination);
   
           if (!backup.isFile()) {
               throw new FileNotFoundException(backup.getAbsolutePath());
  
  
  
  1.17      +3 -3      cocoon-lenya/src/java/org/apache/lenya/cms/rc/RCML.java
  
  Index: RCML.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/rc/RCML.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- RCML.java	31 Jul 2003 11:56:42 -0000	1.16
  +++ RCML.java	26 Aug 2003 15:51:12 -0000	1.17
  @@ -110,12 +110,12 @@
       public RCML(String rcmlDirectory, String filename, String rootDirectory)
           throws Exception {
           this();
  -        rcmlFile = new File(rcmlDirectory + "/" + filename + ".rcml");
  +        rcmlFile = new File(rcmlDirectory , filename + ".rcml");
   
           if (!rcmlFile.isFile()) {
               // The rcml file does not yet exist, so we create it now...
               //
  -            File dataFile = new File(rootDirectory + filename);
  +            File dataFile = new File(rootDirectory , filename);
               long lastModified = 0;
   
               if (dataFile.isFile()) {
  
  
  

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