You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/09/17 18:47:43 UTC
svn commit: rev 46261 - in incubator/lenya/trunk/src/test/org/apache/lenya/cms: publication publication/file workflow
Author: andreas
Date: Fri Sep 17 09:47:42 2004
New Revision: 46261
Modified:
incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java
incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/TestPageEnvelope.java
incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java
incubator/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
Log:
introduced DocumentFactory
Modified: incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java
==============================================================================
--- incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java (original)
+++ incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentBuilderTest.java Fri Sep 17 09:47:42 2004
@@ -67,6 +67,6 @@
protected Document getDocument(DocumentTestSet set) throws DocumentBuildException {
Publication pub = PublicationHelper.getPublication();
- return getIdentityMap().get(pub.getId() + "/" + set.getArea() + set.getUrl());
+ return getIdentityMap().getFactory().getFromURL(pub.getId() + "/" + set.getArea() + set.getUrl());
}
}
Modified: incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/TestPageEnvelope.java
==============================================================================
--- incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/TestPageEnvelope.java (original)
+++ incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/TestPageEnvelope.java Fri Sep 17 09:47:42 2004
@@ -36,7 +36,7 @@
try {
DocumentIdentityMap map = new DocumentIdentityMap(publication);
- setDocument(map.get(url));
+ setDocument(map.getFactory().getFromURL(url));
} catch (DocumentBuildException e) {
throw new PageEnvelopeException(e);
}
Modified: incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java
==============================================================================
--- incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java (original)
+++ incubator/lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java Fri Sep 17 09:47:42 2004
@@ -26,7 +26,6 @@
import org.apache.lenya.cms.PublicationHelper;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.DocumentBuilder;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentIdentityMap;
import org.apache.lenya.cms.publication.Publication;
@@ -110,8 +109,8 @@
Publication publication = PublicationHelper.getPublication();
DocumentIdentityMap map = new DocumentIdentityMap(publication);
- Document sourceDocument = map.get(sourceArea, sourceDocumentId, sourceLanguage);
- Document destinationDocument = map.get(destinationArea, destinationDocumentId,
+ Document sourceDocument = map.getFactory().get(sourceArea, sourceDocumentId, sourceLanguage);
+ Document destinationDocument = map.getFactory().get(destinationArea, destinationDocumentId,
destinationLanguage);
publication.copyDocument(sourceDocument, destinationDocument);
Modified: incubator/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
==============================================================================
--- incubator/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ incubator/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java Fri Sep 17 09:47:42 2004
@@ -30,7 +30,6 @@
import org.apache.lenya.ac.Policy;
import org.apache.lenya.ac.Role;
import org.apache.lenya.ac.User;
-import org.apache.lenya.ac.file.FileItemManager;
import org.apache.lenya.ac.impl.AccessControlTest;
import org.apache.lenya.cms.PublicationHelper;
import org.apache.lenya.cms.publication.Document;
@@ -41,7 +40,6 @@
import org.apache.lenya.cms.publication.DocumentTypeBuilder;
import org.apache.lenya.cms.publication.PageEnvelopeException;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.site.tree.TreeSiteManager;
import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowException;
@@ -95,7 +93,7 @@
Publication publication = PublicationHelper.getPublication();
String url = "/" + publication.getId() + URL;
DocumentIdentityMap map = new DocumentIdentityMap(publication);
- Document document = map.get(url);
+ Document document = map.getFactory().getFromURL(url);
File configDir = new File(publication.getDirectory(), "config" + File.separator + "ac"
+ File.separator + "passwd");
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org