You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/11/24 15:18:00 UTC

svn commit: r1038615 - in /lenya/trunk/org.apache.lenya.core.publication.api: ./ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/lenya/ src/main/java/org/apache/lenya/cms/ src/main/java/org/apache/lenya/cms/publication/ src/main/j...

Author: florent
Date: Wed Nov 24 14:17:59 2010
New Revision: 1038615

URL: http://svn.apache.org/viewvc?rev=1038615&view=rev
Log:
- populate the api

Added:
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Area.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Area.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
      - copied, changed from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
      - copied unchanged from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactory.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
      - copied unchanged from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentFactoryBuilder.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
      - copied unchanged from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentManager.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Publication.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationException.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationException.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationManager.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationUtil.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationUtil.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/ResourceNotFoundException.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/ResourceTypeResolver.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/ResourceTypeResolver.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Revision.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Revision.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Session.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/UriHandler.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/UriHandler.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/Instantiator.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/templating/Instantiator.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManager.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/templating/PublicationTemplateManager.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/PublicationVisitor.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/templating/PublicationVisitor.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/SourceVisitor.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/templating/SourceVisitor.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/templating/VisitingSourceResolver.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/templating/VisitingSourceResolver.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/Link.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/Link.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteException.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteException.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteNode.java
      - copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteNode.java
    lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteStructure.java
      - copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteStructure.java
Modified:
    lenya/trunk/org.apache.lenya.core.publication.api/pom.xml

Modified: lenya/trunk/org.apache.lenya.core.publication.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/pom.xml?rev=1038615&r1=1038614&r2=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/pom.xml Wed Nov 24 14:17:59 2010
@@ -16,7 +16,34 @@
   <description>API for publications</description>
   
   <dependencies>
-  
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+    </dependency>
+      <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-repository-api</artifactId>
+    </dependency>
+    <!-- TODO : normally core-transaction-api could be a dependencie or repository-api and not transaction...
+      maybe it's because exception are impl and not api ?
+     -->
+          <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-transaction-api</artifactId>
+    </dependency>
+<!--      <dependency>-->
+<!--      <groupId>org.apache.lenya</groupId>-->
+<!--      <artifactId>lenya-core-sitemanagement</artifactId>-->
+<!--    </dependency>-->
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-document-api</artifactId>
+    </dependency>
+     <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-proxy</artifactId>
+    </dependency>
+    
   <!-- TODO : see if all theses dependencies are required -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Area.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Area.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Area.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Area.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Area.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Area.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Area.java Wed Nov 24 14:17:59 2010
@@ -17,8 +17,9 @@
  */
 package org.apache.lenya.cms.publication;
 
+import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.lenya.cms.site.SiteStructure;
-
+import org.apache.lenya.cms.publication.Document;
 /**
  * An area.
  */

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java (from r1035056, lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java&p1=lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java&r1=1035056&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.document.impl/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/DocumentBuilder.java Wed Nov 24 14:17:59 2010
@@ -21,7 +21,9 @@
 package org.apache.lenya.cms.publication;
 
 import java.net.MalformedURLException;
-
+import org.apache.lenya.cms.publication.Session;
+//import from core-document-api
+import org.apache.lenya.cms.publication.DocumentLocator;
 /**
  * A document builder builds a document from a URL.
  */

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Publication.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Publication.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Publication.java Wed Nov 24 14:17:59 2010
@@ -107,7 +107,7 @@ public interface Publication {
      * Set the path mapper
      * @param mapper The path mapper
      */
-    void setPathMapper(DefaultDocumentIdToPathMapper mapper);
+    void setPathMapper(DocumentIdToPathMapper mapper);
 
     /**
      * Returns the path mapper.

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationException.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationException.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationException.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationException.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationException.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/PublicationException.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/PublicationException.java Wed Nov 24 14:17:59 2010
@@ -20,10 +20,14 @@
 
 package org.apache.lenya.cms.publication;
 
+import org.apache.lenya.cms.repository.RepositoryException;
+
 /**
  * Publication Exception
  */
-public class PublicationException extends RepositoryException {
+//florent : change exceptions extension in order to repect dependencies
+//public class PublicationException extends RepositoryException {
+public class PublicationException extends DocumentException {
 
     /**
 	 * 

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java (from r1034526, lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java&p1=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Repository.java Wed Nov 24 14:17:59 2010
@@ -19,13 +19,15 @@ package org.apache.lenya.cms.publication
 
 import javax.servlet.http.HttpServletRequest;
 import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.ac.Identity;
+//import org.apache.lenya.ac.Identity;
 
 public interface Repository {
     
     Session getSession(HttpServletRequest request);
-
-    Session startSession(Identity identity, boolean modifiable);
+    
+    //florent : remove as it create cycliq dependencies.
+    // suppress this comment when ok
+    //Session startSession(Identity identity, boolean modifiable);
 
     void removeSession(HttpServletRequest request);
     

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Session.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Session.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/Session.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/Session.java Wed Nov 24 14:17:59 2010
@@ -17,7 +17,8 @@
  */
 package org.apache.lenya.cms.publication;
 
-import org.apache.lenya.ac.Identity;
+//import org.apache.lenya.ac.Identity;
+import org.apache.lenya.cms.repository.RepositoryException;
 
 public interface Session {
     
@@ -40,8 +41,10 @@ public interface Session {
     Publication addPublication(String id) throws RepositoryException;
 
     boolean existsPublication(String id);
-
-    Identity getIdentity();
+    
+    //Florent : remove because create cycliq dependencies.
+    //remove it when ok
+    //Identity getIdentity();
 
     void commit() throws RepositoryException;
 
@@ -51,7 +54,8 @@ public interface Session {
 
     UriHandler getUriHandler();
 
-    void enqueueEvent(Document document, Object descriptor);
+    //Florent : to remove, seems to not be used, and create cyclic dependencies
+    //void enqueueEvent(Document document, Object descriptor);
 
     String getId();
 

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/publication/util/DocumentSet.java Wed Nov 24 14:17:59 2010
@@ -16,8 +16,6 @@
  *
  */
 
-/* $Id$  */
-
 package org.apache.lenya.cms.publication.util;
 
 import java.util.ArrayList;
@@ -30,45 +28,15 @@ import org.apache.lenya.cms.publication.
 /**
  * An ordered set of documents without duplicates.
  */
-public class DocumentSet {
-
-    /**
-     * Ctor.
-     */
-    public DocumentSet() {
-        // do nothing
-    }
-
-    /**
-     * Ctor.
-     * 
-     * @param _documents The initial documents.
-     */
-    public DocumentSet(Document[] _documents) {
-        for (int i = 0; i < _documents.length; i++) {
-            add(_documents[i]);
-        }
-    }
-
-    private List documents = new ArrayList();
-
-    /**
-     * Returns the list object that stores the documents.
-     * 
-     * @return A list.
-     */
-    protected List getList() {
-        return this.documents;
-    }
+public interface DocumentSet {
 
+    
     /**
      * Returns the documents contained in this set.
      * 
      * @return An array of documents.
      */
-    public Document[] getDocuments() {
-        return (Document[]) this.documents.toArray(new Document[this.documents.size()]);
-    }
+    public Document[] getDocuments() ;
 
     /**
      * Adds a document to this set.
@@ -76,48 +44,27 @@ public class DocumentSet {
      * @param document The document to add.
      * @throws IllegalArgumentException if the document is <code>null</code> or already contained.
      */
-    public void add(Document document) {
-        if (document == null) {
-            throw new IllegalArgumentException("The document is null!");
-        }
-        if (this.documents.contains(document)) {
-            throw new IllegalArgumentException("The document [" + document
-                    + "] is already contained!");
-        }
-        this.documents.add(document);
-    }
-
+    public void add(Document document) ;
+    
     /**
      * Adds a document set to this set.
      * 
      * @param set The documents to add.
      */
-    public void addAll(DocumentSet set) {
-        assert set != null;
-        Document[] documents = set.getDocuments();
-        for (int i = 0; i < documents.length; i++) {
-            if (!contains(documents[i])) {
-                add(documents[i]);
-            }
-        }
-    }
-
+    public void addAll(DocumentSet set) ;
+    
     /**
      * @param document The document.
      * @return if the document is contained.
      */
-    public boolean contains(Document document) {
-        return getList().contains(document);
-    }
+    public boolean contains(Document document);
 
     /**
      * Checks if this set is empty.
      * 
      * @return A boolean value.
      */
-    public boolean isEmpty() {
-        return getList().isEmpty();
-    }
+    public boolean isEmpty() ;
 
     /**
      * Visits the set.
@@ -125,53 +72,31 @@ public class DocumentSet {
      * @param visitor The visitor.
      * @throws Exception if an error occurs during visiting.
      */
-    public void visit(DocumentVisitor visitor) throws Exception {
-        Document[] resources = getDocuments();
-        for (int i = 0; i < resources.length; i++) {
-            resources[i].accept(visitor);
-        }
-    }
-
+    public void visit(DocumentVisitor visitor) throws Exception ;
+    
     /**
      * Removes a document.
      * 
      * @param resource The document.
      * @throws PublicationException if an error occurs.
      */
-    public void remove(Document resource) throws PublicationException {
-        if (resource == null) {
-            throw new IllegalArgumentException("The resource is null!");
-        }
-        if (!getList().contains(resource)) {
-            throw new IllegalArgumentException("The resource [" + resource + "] is not contained!");
-        }
-        getList().remove(resource);
-    }
+    public void remove(Document resource) throws PublicationException ;
     
     /**
      * Removes all documents in a set from this set.
      * @param set The set.
      * @throws PublicationException if an error occurs.
      */
-    public void removeAll(DocumentSet set) throws PublicationException {
-        Document[] documents = set.getDocuments();
-        for (int i = 0; i < documents.length; i++) {
-            remove(documents[i]);
-        }
-    }
-
+    public void removeAll(DocumentSet set) throws PublicationException ;
+    
     /**
      * Removes all documents.
      */
-    public void clear() {
-        getList().clear();
-    }
-
+    public void clear() ;
+    
     /**
      * Reverses the document order.
      */
-    public void reverse() {
-        Collections.reverse(getList());
-    }
+    public void reverse() ;
 
 }

Copied: lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteStructure.java (from r1034526, lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteStructure.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteStructure.java?p2=lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteStructure.java&p1=lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteStructure.java&r1=1034526&r2=1038615&rev=1038615&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/SiteStructure.java (original)
+++ lenya/trunk/org.apache.lenya.core.publication.api/src/main/java/org/apache/lenya/cms/site/SiteStructure.java Wed Nov 24 14:17:59 2010
@@ -18,7 +18,7 @@
 package org.apache.lenya.cms.site;
 
 import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.Node;
+import org.apache.lenya.cms.repository.Node;
 import org.apache.lenya.cms.publication.Publication;
 
 /**



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