You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by so...@apache.org on 2006/06/16 02:52:50 UTC

svn commit: r414714 - in /lenya/branches/revolution/1.3.x: ./ src/cocoon/ src/java/org/apache/lenya/cms/cocoon/components/modules/input/ src/java/org/apache/lenya/cms/content/ src/java/org/apache/lenya/cms/content/flat/ src/java/org/apache/lenya/cms/co...

Author: solprovider
Date: Thu Jun 15 17:52:49 2006
New Revision: 414714

URL: http://svn.apache.org/viewvc?rev=414714&view=rev
Log:
General cleanup and preparation for the "edit" Module (which will be delayed by the weekend.)

Added:
    lenya/branches/revolution/1.3.x/13ModuleFiles.txt   (with props)
Modified:
    lenya/branches/revolution/1.3.x/13HELP.txt
    lenya/branches/revolution/1.3.x/13TODO.txt
    lenya/branches/revolution/1.3.x/src/cocoon/local.blocks.properties
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationModule.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Content.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Resource.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/CreateRevisionTransformer.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatContent.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatIndex.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatRevision.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatTranslation.java
    lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/hierarchical/HierarchicalContent.java
    lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/module.xmap

Modified: lenya/branches/revolution/1.3.x/13HELP.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/13HELP.txt?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/13HELP.txt (original)
+++ lenya/branches/revolution/1.3.x/13HELP.txt Thu Jun 15 17:52:49 2006
@@ -84,3 +84,4 @@
 content://structure/path/docid - Get Resource using a specific structure to convert to a UNID.
 content:/unid - Get the Resource by the UNID.
 
+content::/ - Double colons return Meta document, guaranteed XML.  For binary files, this is the associated XML file.  For XML data, this is identical to single colon syntax.
\ No newline at end of file

Added: lenya/branches/revolution/1.3.x/13ModuleFiles.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/13ModuleFiles.txt?rev=414714&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/13ModuleFiles.txt (added)
+++ lenya/branches/revolution/1.3.x/13ModuleFiles.txt Thu Jun 15 17:52:49 2006
@@ -0,0 +1,24 @@
+This is a list of special filenames in Modules.  None are required.
+
+=== Lenya 1.3 Files ===
+module.xmap - Entry point when PageModule is called from a URL.
+
+module.xml - Description of Module.
+
+
+=== Specific Module Files ===
+navigation.xmap - Overrides Navigation Module.
+navigation.xsl - Overrides XSL in Navigation Module.
+
+nav.xmap - Overrides Nav Module.
+nav.xsl - Overrides XSL in Nav Module.
+
+edit.xmap - For additional fields in Edit Module. (Still in development)
+
+
+=== Common Naming Standards ===
+code.js - JavaScript Flow functions.
+
+page2xhtml.xsl - Transforms aggregated DIVs to HTML.
+
+xhtml.xsl - Transforms doctype XML to a <DIV id="body">.
\ No newline at end of file

Propchange: lenya/branches/revolution/1.3.x/13ModuleFiles.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lenya/branches/revolution/1.3.x/13TODO.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/13TODO.txt?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/13TODO.txt (original)
+++ lenya/branches/revolution/1.3.x/13TODO.txt Thu Jun 15 17:52:49 2006
@@ -1,14 +1,6 @@
 === 1.2.x Conversion
 Session Module: login.xsp -> NullPointerException
 
-===
-Modules.java - Add EXCLUDE parameter to config
-
-== Menu Module
-Fix XSL
-Started fixing menu.xsl.  All others have not been touched.
-DESIGN: Pass prefix ("root" parameter) from parent module?
-
 === Modules.java
 synchronize setting of static variables.
 
@@ -61,14 +53,14 @@
 
 === HTML Serializer
 Add link rewriting.  
-Change <LINK UNID="xxx"> to appropriate A tag.
-Change <LINK UNID="xxx" TAG="img"> to appropriate IMG tag.
+Change <RESOURCE UNID="xxx"> to appropriate A tag.
+Change <RESOURCE UNID="xxx" TAG="img"> to appropriate IMG tag.
 
 Automatically pass through i18n Transformer using current language.  Build catalog from current module (including inheritance), publication, and global.
 Replace unfound i18n tags with default.
 
 === CreateRevisionTransformer
-Replace all A and IMG tags with appropriate LINK tags, creating new Resources as necessary.
+Replace all A and IMG tags with appropriate RESOURCE tags, creating new Resources as necessary.
 
 === Admin Screens
 Admin screen: Navigation between User/Group maintenance and Site maintenance.
@@ -110,6 +102,16 @@
 /parameters/path/page.html
 Also check if last element is a UNID.
 
+
+=== File Resource
+Changing XML and Uploading are different operations.  How to handle?
+XML must change when file is uploaded (new creator, change time)
+XML can change without upload.  
+New XML should reference old file?  Need another file to register all uses of revision binary
+Or make copy? (waste space, but safer when deleting revisions)
+
+
+
 === Modules
 ContentModule.java "content:" Variables: type, doctype, extension.
 
@@ -142,6 +144,9 @@
 =======================
 ====  Enhancements ====
 =======================
+publication:name - should return name, currently stored in publication.xml.  Why?  Move to publication.xconf?  Must be available from Publication.java and PublicationModule.java
+
+
 Resource: Active dates: start, expire
 Careful: All children will disappear from Index when parent is deactivated.
 
@@ -152,7 +157,8 @@
 Admin screen: User editor
 Change FileUser to allow dynamic fields.  Show all fields.  Pub can configure list of fields with default values.
 
-Editor: Save checks for static links and replaces with ResourceLink.  Create new Resource type=link for external links if they do not exist.  Need syntax for embedded links.  <link structure="live" unid="####"/>.  Structure needed to create human-readable URLs.  HTMLSerializer should replace with Anchor tag containing Title.  Need marker for link in editor, or use WYSIWYG (Replace with HTML for editing, then replace with link tag during save)?
+Editor: Save checks for static links and replaces with RESOURCE link tag.  Create new Resource type=link for external links if they do not exist.  Need syntax for embedded links.  <RESOURCE structure="live" unid="####"/>.  Structure needed to create human-readable URLs.  HTMLSerializer should replace with Anchor tag containing Title.  
+Replace with HTML for editing, then replace with RESOURCE link tag during save.  
 
 Editor: Create reusable CSS classes?  Create "style" with settings of current location.  Maintenance?  For one RichText field, all RichText fields of the same type, for whole Publication, or Lenya server?  Will be easier when CSS are Resources.
 

Modified: lenya/branches/revolution/1.3.x/src/cocoon/local.blocks.properties
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/cocoon/local.blocks.properties?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/cocoon/local.blocks.properties (original)
+++ lenya/branches/revolution/1.3.x/src/cocoon/local.blocks.properties Thu Jun 15 17:52:49 2006
@@ -139,7 +139,7 @@
 #-----[dependency]: "faces" depends on "portal", "taglib".
 include.block.faces=false
 #-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore", "portal", "querybean", "tour".
-#include.block.forms=false
+#include.block.forms=true
 #-----[dependency]: "javaflow" depends on "forms", "ojb".
 include.block.javaflow=false
 #include.block.jcr=false

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationModule.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationModule.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationModule.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationModule.java Thu Jun 15 17:52:49 2006
@@ -57,7 +57,7 @@
            return "error";
         }
 
-        if(name.equalsIgnoreCase("defaultlanguage")){
+        if(name.equalsIgnoreCase("languages")){
            String[] langa = pub.getLanguages();
            String langs = langa[0];
            for(int l=1; l < langa.length; l++) langs += ";" + langa[l];

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Content.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Content.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Content.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Content.java Thu Jun 15 17:52:49 2006
@@ -5,8 +5,11 @@
 import org.apache.lenya.cms.publication.Publication;
 
 public interface Content{
+   public String getURI(String unid, String language, String revision);
+   public String getMetaURI(String unid, String language, String revision);
+   public String getNewURI(String unid, String language);
+
    public String getUNID(String structure, String id);
-   public String getNewFilename(String unid, String language);
    public String getIndexFilename(String indexName, String language);
    public String[] getLanguages();
 }

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Resource.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Resource.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Resource.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/Resource.java Thu Jun 15 17:52:49 2006
@@ -4,25 +4,19 @@
 import org.apache.excalibur.source.SourceNotFoundException;
 
 public interface Resource{
- 
-//   public Source getSource(String translation, String revision) throws SourceNotFoundException;
+/* These 3 functions are called URI (in preparation for JCR) but return filenames. */
+   public String getURI();
+   public String getMetaURI();
+   public String getNewURI();
 
    public String getUNID();
    public String getID();
-
    public String getType();
-
    public String getDocumentType();
-
    public String getLanguage();
-
    public String getDefaultLanguage();
-
    public String[] getLanguages();
 
-   public String getNewFilename(String language);
-
-
 /**
  * Get Navigation Title from live revision of current language.
  */
@@ -35,7 +29,4 @@
  * Get Navigation Title from specified revision of specified language.
  */
    public String getTitle(String language, String revision);
-
-//   public Translation getTranslation(String translation);
-
 }

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/CreateRevisionTransformer.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/CreateRevisionTransformer.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/CreateRevisionTransformer.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/CreateRevisionTransformer.java Thu Jun 15 17:52:49 2006
@@ -57,7 +57,7 @@
        Content content = pub.getContent();
        String unid = this.source;
        String language = envelope.getDocument().getLanguage();
-       String sourceName = content.getNewFilename(unid, language);
+       String sourceName = content.getNewURI(unid, language);
        try{
            save(sourceName, doc);
        }catch(java.io.IOException ioe){

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatContent.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatContent.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatContent.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatContent.java Thu Jun 15 17:52:49 2006
@@ -24,9 +24,17 @@
    public String getIndexFilename(String indexName, String language){
      return indexer.getIndexFilename(indexName, language);
    }
-   public String getNewFilename(String unid, String language){
+   public String getURI(String unid, String language, String revision){
+      Resource resource = getResource(unid, language, revision);
+      return resource.getURI();
+   }
+   public String getMetaURI(String unid, String language, String revision){
+      Resource resource = getResource(unid, language, revision);
+      return resource.getMetaURI();
+   }
+   public String getNewURI(String unid, String language){
       Resource resource = getResource(unid, language, "live");
-      return resource.getNewFilename(language);
+      return resource.getNewURI();
    }
    public String getUNID(String structure, String id){
       FlatRelations relations = getRelations(structure);
@@ -45,21 +53,4 @@
    public FlatRelations getRelations(String structure){
      return new FlatRelations(new File(directory, "relation" + File.separator + structure + ".xml"));
    }
-
-/* Obsolete 
-   public Resource getResource(String unid){
-      return (Resource) new FlatResource(directory, unid);
-   }
-   public Resource getResource(String unid, String language){
-      return (Resource) new FlatResource(directory, unid, language);
-   }
-
-   public Source getSource(String unid, String translation, String revision) throws SourceNotFoundException {
-      return (Source) null;
-   }
-   public Source getMeta(String unid, String translation, String revision) throws SourceNotFoundException {
-      return (Source) null;
-   }
-*/
-
 }

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatIndex.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatIndex.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatIndex.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatIndex.java Thu Jun 15 17:52:49 2006
@@ -71,6 +71,7 @@
       include.put("id", new FlatIndexPart("id"));
       include.put("title", new FlatIndexPart("title"));
       include.put("href", new FlatIndexPart("href"));
+      include.put("extension", new FlatIndexPart("extension"));
    }
    public String getIndexFilename(){
       if(!indexFile.exists()) update();

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatResource.java Thu Jun 15 17:52:49 2006
@@ -40,7 +40,7 @@
    public FlatResource(File directory, String punid){
       contentDirectory = directory;
       unid = punid;
-//WORK: defaultLanguage = Publication's default language.
+//TODO: defaultLanguage = Publication's default language.
       init(true);
    }
    private void init(boolean useDefaultLanguage){
@@ -52,7 +52,7 @@
             if(root.hasAttribute("defaultlanguage")){
               defaultLanguage = root.getAttribute("defaultlanguage");
             }else{
-//WORK: Use Publication's Default Language
+//TODO: Use Publication's Default Language
             }
          }
          if(root.hasAttribute("doctype")) doctype = root.getAttribute("doctype");
@@ -70,6 +70,16 @@
       }catch(java.io.IOException ioe){
       }
    }
+   public String getURI(){
+      return getTranslation(defaultLanguage).getURI();
+   }
+   public String getMetaURI(){
+      return getTranslation(defaultLanguage).getMetaURI();
+   }
+   public String getNewURI(){
+      return getTranslation(defaultLanguage).getNewURI();
+   }
+
    public String getUNID(){
       return unid;
    }
@@ -92,6 +102,7 @@
    public String[] getLanguages(){
      return languages;
    }
+
 /**
  * Get Navigation Title from live revision of current language.
  */
@@ -108,7 +119,12 @@
  * Get Navigation Title from specified revision of specified language.
  */
    public String getTitle(String language, String revision){
-      return getTranslation(language).getRevision(revision).getTitle();
+      try{
+         return getTranslation(language).getRevision(revision).getTitle();
+      }catch(java.lang.NullPointerException npe){
+System.out.println("FR.gTitle NPE UNID=" + unid);
+         return "";
+      }
    }
    public String getExtension(){
       return getTranslation().getExtension();
@@ -116,10 +132,6 @@
    public String getHREF(){
       return getTranslation().getHREF();
    }
-   public String getNewFilename(String language){
-      return getTranslation(language).getNewFilename();
-   }
-
 /**
  * Get variable for Index Filters
  */
@@ -168,15 +180,15 @@
       }else return new FlatTranslation(resourceDirectory, language);
    }
    public boolean hasRevision(){
-/*
-System.out.println("U=" + unid + " L=" + defaultLanguage + " R=" + defaultRevision);
-     FlatTranslation translation = getTranslation(defaultLanguage, false);
-     if(null == translation) System.out.println("Null Translation");
-     FlatRevision revision = translation.getRevision(defaultRevision);
-     if(null == revision) System.out.println("Null Revision");
-     boolean exists = revision.exists();
-     System.out.println("Exists=" + exists);
-*/
+      FlatTranslation translation = getTranslation(defaultLanguage, false);
+      if(null == translation) return false;
+      FlatRevision revision = translation.getRevision(defaultRevision);
+      if(null == revision) return false;
+      boolean exists = revision.exists();
+      if(getTitle().length() < 1){
+         System.out.println("Exists=" + exists + " U=" + unid + " L=" + defaultLanguage + " R=" + defaultRevision);
+         return false;
+      }
       try{
          return getTranslation(defaultLanguage, false).getRevision(defaultRevision).exists();
       }catch(java.lang.NullPointerException npe){

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatRevision.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatRevision.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatRevision.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatRevision.java Thu Jun 15 17:52:49 2006
@@ -49,20 +49,13 @@
    public String getHREF(){
       return href;
    }
-   public String getFilename(){
+   public String getURI(){
       return file.getPath();
    }
-   public String getMetaFilename(){
+   public String getMetaURI(){
       return metafile.getPath();
    }
    public boolean exists(){
       return file.exists();
    }
-
-
-/*
-   public Source getSource() throws SourceNotFoundException{
-      throw new SourceNotFoundException("FlatRevision.getSource is not implemented yet");
-   }
-*/
 }

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatTranslation.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatTranslation.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatTranslation.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/flat/FlatTranslation.java Thu Jun 15 17:52:49 2006
@@ -21,6 +21,7 @@
    String revision = "live";
    Document document;
    Element root;
+   FlatRevision fr;
 
    SortedSet revisions = new TreeSet();
    public FlatTranslation(File directory, String planguage, String pdefaultLanguage, String prevision){
@@ -75,18 +76,28 @@
    public String getEdit() {
       return edit;
    }
-   public String getNewFilename(){
+   public String getURI(){
+      if(null == fr) fr = getRevision();
+      if(null == fr) return "";
+      return fr.getURI();
+   }
+   public String getMetaURI(){
+      if(null == fr) fr = getRevision();
+      if(null == fr) return "";
+      return fr.getMetaURI();
+   }
+   public String getNewURI(){
       String newRevision = getDateString();
 //WORK: Change Edit to newRevision
       return new File(translationDirectory, newRevision + ".xml").getPath();
    }
    public String getExtension() {
-      FlatRevision fr = getRevision();
+      if(null == fr) fr = getRevision();
       if(null == fr) return "";
       return fr.getExtension();
    }
    public String getHREF() {
-      FlatRevision fr = getRevision();
+      if(null == fr) fr = getRevision();
       if(null == fr) return "";
       return fr.getHREF();
    }
@@ -114,16 +125,4 @@
    private String getDateString(){
       return Long.toString(new java.util.Date().getTime());
    }
-
-/*
-   public Source getSource(String revision) throws SourceNotFoundException {
-      throw new SourceNotFoundException("FlatTranslation.getSource is not implemented yet");
-   }
-   public Source getMeta() throws SourceNotFoundException {
-      throw new SourceNotFoundException("FlatTranslation.getMeta is not implemented yet");
-   }
-   public Source getTranslationMeta(String translation) throws SourceNotFoundException {
-      throw new SourceNotFoundException("FlatTranslation.getTranslationMeta is not implemented yet");
-   }
-*/
 }

Modified: lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/hierarchical/HierarchicalContent.java
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/hierarchical/HierarchicalContent.java?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/hierarchical/HierarchicalContent.java (original)
+++ lenya/branches/revolution/1.3.x/src/java/org/apache/lenya/cms/content/hierarchical/HierarchicalContent.java Thu Jun 15 17:52:49 2006
@@ -26,10 +26,15 @@
    public String[] getLanguages(){
       return languages;
    }
-   public String getNewFilename(String unid, String language){
+   public String getURI(String unid, String language, String revision){
+      return new File(directory, revision + File.separator + unid + File.separator + "index_" + language +"." + ".xml").getPath();
+   }
+   public String getMetaURI(String unid, String language, String revision){
+      return new File(directory, revision + File.separator + unid + File.separator + "index_" + language +"." + ".xml").getPath();
+   }
+   public String getNewURI(String unid, String language){
       return new File(directory, "live" + File.separator + unid + File.separator + getDateString() + "_" + language +"." + ".xml").getPath();
    }
-
    private String getDateString(){
       return Long.toString(new java.util.Date().getTime());
    }

Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/module.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/module.xmap?rev=414714&r1=414713&r2=414714&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/module.xmap (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/module.xmap Thu Jun 15 17:52:49 2006
@@ -104,6 +104,8 @@
         </map:call>
       </map:match>
 <!-- Default -->
+        <map:generate src="cocoon:/sitetree/index"/>
+        <map:serialize type="xml"/>
    </map:match>
     </map:pipeline>
   </map:pipelines>



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