You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/08/07 18:48:05 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ant DocumentCreatorTask.java

egli        2003/08/07 09:48:05

  Modified:    src/java/org/apache/lenya/cms/authoring DocumentCreator.java
               src/java/org/apache/lenya/cms/ant DocumentCreatorTask.java
  Log:
  Changed the interface to no longer use the deprecated interface
  of SiteTree.
  
  Revision  Changes    Path
  1.5       +4 -5      cocoon-lenya/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java
  
  Index: DocumentCreator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DocumentCreator.java	30 Jul 2003 15:30:06 -0000	1.4
  +++ DocumentCreator.java	7 Aug 2003 16:48:05 -0000	1.5
  @@ -76,7 +76,7 @@
        *
        * @param publication DOCUMENT ME!
        * @param authoringDirectory DOCUMENT ME!
  -     * @param treeFileName DOCUMENT ME!
  +     * @param area the area
        * @param parentId DOCUMENT ME!
        * @param childId DOCUMENT ME!
        * @param childName DOCUMENT ME!
  @@ -89,7 +89,7 @@
       public void create(
           Publication publication,
           File authoringDirectory,
  -        String treeFileName,
  +        String area,
           String parentId,
           String childId,
           String childName,
  @@ -133,8 +133,7 @@
           DefaultSiteTree siteTree;
   
           try {
  -            siteTree =
  -                new DefaultSiteTree(new File(authoringDirectory, treeFileName));
  +            siteTree = publication.getSiteTree(area);
           } catch (Exception e) {
               throw new CreatorException(e);
           }
  
  
  
  1.6       +21 -23    cocoon-lenya/src/java/org/apache/lenya/cms/ant/DocumentCreatorTask.java
  
  Index: DocumentCreatorTask.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/DocumentCreatorTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DocumentCreatorTask.java	30 Jul 2003 15:30:43 -0000	1.5
  +++ DocumentCreatorTask.java	7 Aug 2003 16:48:05 -0000	1.6
  @@ -74,7 +74,7 @@
       private String childName;
       private String childType;
       private String documentType;
  -    private String treeFile;
  +    private String area;
       private String authoringPath;
       private String language;
   
  @@ -90,7 +90,7 @@
               creator.create(
                   getPublication(),
                   new File(getPublication().getDirectory(), getAuthoringPath()),
  -                getTreeFile(),
  +                getArea(),
                   getParentId(),
                   getChildId(),
                   getChildName(),
  @@ -219,17 +219,6 @@
       }
   
       /**
  -     * Get the tree file
  -     * 
  -     * @return the path to the tree file
  -     */
  -    public String getTreeFile() {
  -        assertString(treeFile);
  -
  -        return treeFile;
  -    }
  -
  -    /**
        * Set the authoring path
        * 
        * @param string the authoring path
  @@ -240,15 +229,6 @@
       }
   
       /**
  -     * Set the tree file
  -     * 
  -     * @param string the path to the tree file
  -     */
  -    public void setTreeFile(String string) {
  -        assertString(string);
  -        treeFile = string;
  -    }
  -    /**
        * Get the language
        * 
        * @return the language
  @@ -264,6 +244,24 @@
        */
       public void setLanguage(String language) {
           this.language = language;
  +    }
  +
  +    /**
  +     * Get the area.
  +     * 
  +     * @return the area
  +     */
  +    public String getArea() {
  +        return area;
  +    }
  +
  +    /**
  +     * Set the area.
  +     * 
  +     * @param area the area
  +     */
  +    public void setArea(String area) {
  +        this.area = area;
       }
   
   }
  
  
  

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