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 2006/03/11 20:00:49 UTC

svn commit: r385137 - /lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java

Author: michi
Date: Sat Mar 11 11:00:47 2006
New Revision: 385137

URL: http://svn.apache.org/viewcvs?rev=385137&view=rev
Log:
LENYA_META_SUFFIX introduced to make sure that the suffix is defined only once

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java?rev=385137&r1=385136&r2=385137&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/repository/SourceNode.java Sat Mar 11 11:00:47 2006
@@ -46,6 +46,7 @@
 import org.apache.lenya.transaction.Lock;
 import org.apache.lenya.transaction.TransactionException;
 import org.apache.lenya.transaction.Transactionable;
+import org.apache.log4j.Category;
 
 /**
  * A repository node.
@@ -54,10 +55,14 @@
  */
 public class SourceNode extends AbstractLogEnabled implements Node, Transactionable {
 
+    private Category log = Category.getInstance(SourceNode.class);
+
     private String sourceURI;
     protected ServiceManager manager;
     public static final String FILE_PREFIX = "file:/";
     public static final String CONTEXT_PREFIX = "context://";
+    public static final String LENYA_META_SUFFIX = "meta";
+    //public static final String LENYA_META_SUFFIX = "lenyameta";
 
     /**
      * Ctor.
@@ -346,7 +351,7 @@
         }
         this.lock = new Lock(currentVersion);
 
-        if (!getSourceURI().endsWith(".meta")) {
+        if (!getSourceURI().endsWith("." + LENYA_META_SUFFIX)) {
             lockMetaData();
         }
     }
@@ -638,7 +643,8 @@
     }
 
     protected String getMetaSourceURI() {
-        return getSourceURI() + ".meta";
+        log.debug("Meta source URI: " + getSourceURI() + "." + LENYA_META_SUFFIX);
+        return getSourceURI() + "." + LENYA_META_SUFFIX;
     }
 
     private MetaDataManager metaDataManager;



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