svn commit: r742812 [1/2] - in /lenya/trunk: ./ org.apache.lenya.core.janitor/ org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/ org.apache.lenya.co...
[email protected] Tue, 10 Feb 2009 01:37:38 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Tue Feb 10 01:37:33 2009
New Revision: 742812
URL: http://svn.apache.org/viewvc?rev=742812&view=rev
Log:
Updating client code to API changes, remove dependencies to repository where possible, add some temporary dependencies to repository where necessary.
Modified:
lenya/trunk/org.apache.lenya.core.janitor/pom.xml
lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java
lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/LenyaMetaDataGenerator.java
lenya/trunk/org.apache.lenya.core.observation/pom.xml
lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
lenya/trunk/org.apache.lenya.core.workflow/pom.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
lenya/trunk/org.apache.lenya.core.workflow/src/test/java/org/apache/lenya/cms/workflow/WorkflowTest.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
lenya/trunk/org.apache.lenya.module.cforms/src/main/java/org/apache/lenya/cms/editors/cforms/CForms.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java
lenya/trunk/org.apache.lenya.module.lenyadoc/pom.xml
lenya/trunk/org.apache.lenya.module.lucene/pom.xml
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexDocument.java
lenya/trunk/org.apache.lenya.module.navigation/src/main/java/org/apache/lenya/modules/navigation/SiteFragmentGenerator.java
lenya/trunk/org.apache.lenya.module.notification/pom.xml
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/NotificationListener.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/publication/ResourceWrapper.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/cms/site/usecases/CreateResource.java
lenya/trunk/org.apache.lenya.module.resource/src/main/java/org/apache/lenya/modules/resource/PdfToTextGenerator.java
lenya/trunk/org.apache.lenya.module.simplesite/pom.xml
lenya/trunk/org.apache.lenya.module.simplesite/src/main/java/org/apache/lenya/cms/site/simple/DocumentStore.java
lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeVisitor.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/usecases/Nudge.java
lenya/trunk/org.apache.lenya.module.sourcerepository/pom.xml
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/MetaSourceWrapper.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/ModifiableMetaDataHandler.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNode.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaData.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeMetaDataHandler.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRCML.java
lenya/trunk/org.apache.lenya.module.sourcerepository/src/main/java/org/apache/lenya/cms/repository/SourceNodeRevision.java
lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/FilePropfind.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Propfind.java
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java
lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/usecases/Import.java
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.janitor/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.janitor/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.janitor/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.janitor/pom.xml Tue Feb 10 01:37:33 2009
@@ -23,5 +23,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java (original)
+++ lenya/trunk/org.apache.lenya.core.janitor/src/main/java/org/apache/lenya/cms/janitor/ContentJanitor.java Tue Feb 10 01:37:33 2009
@@ -21,6 +21,7 @@
import org.apache.cocoon.processing.ProcessInfoProvider;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.observation.AbstractRepositoryListener;
import org.apache.lenya.cms.observation.DocumentEvent;
@@ -35,6 +36,7 @@
public class ContentJanitor extends AbstractRepositoryListener {
private Repository repository;
+ private SourceResolver sourceResolver;
public void eventFired(RepositoryEvent repoEvent) {
@@ -54,7 +56,7 @@
Publication pub = session.getPublication(event.getPublicationId());
File contentFile = pub.getContentDirectory(event.getArea());
String contentUri = contentFile.toURI().toString();
- SourceUtil.deleteEmptyCollections(contentUri, this.manager);
+ SourceUtil.deleteEmptyCollections(contentUri, this.sourceResolver);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -64,4 +66,8 @@
this.repository = repository;
}
+ public void setSourceResolver(SourceResolver sourceResolver) {
+ this.sourceResolver = sourceResolver;
+ }
+
}
Modified: lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/LenyaMetaDataGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/LenyaMetaDataGenerator.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/LenyaMetaDataGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.core.metadata/src/main/java/org/apache/lenya/modules/metadata/LenyaMetaDataGenerator.java Tue Feb 10 01:37:33 2009
@@ -28,12 +28,11 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.generation.ServiceableGenerator;
import org.apache.excalibur.source.SourceValidity;
-import org.apache.excalibur.source.impl.validity.TimeStampValidity;
import org.apache.excalibur.xml.dom.DOMParser;
-import org.apache.lenya.cms.cocoon.source.RepositorySource;
+import org.apache.lenya.cms.cocoon.source.DocumentSource;
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataException;
-import org.apache.lenya.cms.repository.ContentHolder;
+import org.apache.lenya.cms.publication.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -86,7 +85,7 @@
private String src;
/** The repository content holder to generate the meta data for */
- private ContentHolder content;
+ private Document document;
private SourceValidity validity;
@@ -94,7 +93,7 @@
* Recycle this component. All instance variables are set to <code>null</code>.
*/
public void recycle() {
- this.content = null;
+ this.document = null;
this.src = null;
this.parser = null;
this.validity = null;
@@ -123,10 +122,10 @@
super.setup(resolver, objectModel, src, par);
this.src = src;
- RepositorySource source = null;
+ DocumentSource source = null;
try {
- source = (RepositorySource) resolver.resolveURI(src);
- this.content = source.getContent();
+ source = (DocumentSource) resolver.resolveURI(src);
+ this.document = source.getDocument();
this.validity = source.getValidity();
} catch (Exception e) {
throw new RuntimeException(e);
@@ -169,7 +168,7 @@
private void performIncludesMeta() throws SAXException, ProcessingException {
try {
- String[] namespaces = this.content.getMetaDataNamespaceUris();
+ String[] namespaces = this.document.getMetaDataNamespaceUris();
for (int i = 0; i < namespaces.length; i++) {
this.contentHandler.startPrefixMapping("", namespaces[i]);
startNodeMeta(namespaces[i]);
@@ -226,9 +225,9 @@
protected MetaData getMetaData(String namespaceUri) throws ProcessingException {
try {
- return this.content.getMetaData(namespaceUri);
+ return this.document.getMetaData(namespaceUri);
} catch (Exception e1) {
- throw new ProcessingException("Obtaining meta data value for [" + this.content
+ throw new ProcessingException("Obtaining meta data value for [" + this.document
+ "] failed: ", e1);
}
}
Modified: lenya/trunk/org.apache.lenya.core.observation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.observation/pom.xml Tue Feb 10 01:37:33 2009
@@ -23,5 +23,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.observation/src/main/java/org/apache/lenya/cms/observation/ObservationManager.java Tue Feb 10 01:37:33 2009
@@ -36,8 +36,9 @@
private Map identifier2listeners = new HashMap();
private Set listeners = new HashSet();
- public synchronized void registerListener(RepositoryListener listener, Document doc)
+ public synchronized void registerListener(RepositoryListener listener, Observeable observeable)
throws ObservationException {
+ Document doc = (Document) observeable;
Set listeners = getListeners(doc.getIdentifier());
if (listeners.contains(listener)) {
throw new ObservationException("The listener [" + listener
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java Tue Feb 10 01:37:33 2009
@@ -27,7 +27,7 @@
import org.apache.lenya.cms.metadata.MetaData;
import org.apache.lenya.cms.metadata.MetaDataRegistry;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.site.usecases.SiteUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -47,7 +47,7 @@
protected Node[] getNodesToLock() throws UsecaseException {
Node[] objects = new Node[0];
if(getSourceDocument() != null) {
- objects = new Node[] { getSourceDocument().getRepositoryNode() };
+ objects = new Node[] { getSourceDocument() };
}
return objects;
}
@@ -109,7 +109,7 @@
try {
- boolean canChange = WorkflowUtil.canInvoke(getLogger(), doc, "edit");
+ boolean canChange = WorkflowUtil.canInvoke(doc, "edit");
if (!canChange) {
addInfoMessage("cannot-change-metadata");
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java Tue Feb 10 01:37:33 2009
@@ -22,8 +22,8 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -68,7 +68,7 @@
List nodes = new ArrayList();
if (getSourceDocument() != null) {
SiteStructure structure = getSourceDocument().area().getSite();
- nodes.add(structure.getRepositoryNode());
+ nodes.add(structure);
}
return (Node[]) nodes.toArray(new Node[nodes.size()]);
@@ -110,7 +110,7 @@
String label = getParameterAsString(LABEL).trim();
document.getLink().setLabel(label);
- WorkflowUtil.invoke(getLogger(), document, getEvent());
+ WorkflowUtil.invoke(document, getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java Tue Feb 10 01:37:33 2009
@@ -26,8 +26,8 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.NodeIterator;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteException;
@@ -36,7 +36,6 @@
import org.apache.lenya.cms.site.SiteUtil;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
-import org.apache.lenya.transaction.TransactionException;
/**
* Change the node ID of a document.
@@ -68,7 +67,7 @@
try {
if (getSourceDocument() != null) {
- Node siteNode = getSourceDocument().area().getSite().getRepositoryNode();
+ Node siteNode = getSourceDocument().area().getSite();
nodes.add(siteNode);
Document sourceDocument = getSourceDocument();
@@ -79,7 +78,7 @@
String[] languages = node.getLanguages();
for (int l = 0; l < languages.length; l++) {
Document doc = node.getLink(languages[l]).getDocument();
- nodes.add(doc.getRepositoryNode());
+ nodes.add(doc);
}
}
}
@@ -90,12 +89,11 @@
return (Node[]) nodes.toArray(new Node[nodes.size()]);
}
- protected List getAllLanguageVersionNodes(Document doc) throws DocumentException,
- TransactionException, DocumentBuildException {
+ protected List getAllLanguageVersionNodes(Document doc) throws DocumentException, DocumentBuildException {
String[] languages = doc.getLanguages();
List nodes = new ArrayList();
for (int i = 0; i < languages.length; i++) {
- nodes.add(doc.getTranslation(languages[i]).getRepositoryNode());
+ nodes.add(doc.getTranslation(languages[i]));
}
return nodes;
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java Tue Feb 10 01:37:33 2009
@@ -22,8 +22,8 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteNode;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.usecase.DocumentUsecase;
@@ -84,7 +84,7 @@
String[] languages = doc.getLanguages();
for (int i = 0; i < languages.length; i++) {
Document version = doc.getTranslation(languages[i]);
- WorkflowUtil.invoke(getLogger(), version, getEvent());
+ WorkflowUtil.invoke(version, getEvent());
}
}
@@ -95,7 +95,7 @@
List nodes = new ArrayList();
if (getSourceDocument() != null) {
SiteStructure structure = getSourceDocument().area().getSite();
- nodes.add(structure.getRepositoryNode());
+ nodes.add(structure);
}
return (Node[]) nodes.toArray(new Node[nodes.size()]);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java Tue Feb 10 01:37:33 2009
@@ -35,11 +35,11 @@
import org.apache.lenya.cms.metadata.dublincore.DublinCore;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.publication.ResourceTypeResolver;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteStructure;
import org.apache.lenya.cms.usecase.AbstractUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -88,7 +88,7 @@
protected Node[] getNodesToLock() throws UsecaseException {
try {
SiteStructure structure = getPublication().getArea(getArea()).getSite();
- Node[] nodes = { structure.getRepositoryNode() };
+ Node[] nodes = { structure };
return nodes;
} catch (Exception e) {
throw new UsecaseException(e);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Tue Feb 10 01:37:33 2009
@@ -21,9 +21,9 @@
import java.util.List;
import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.util.DocumentHelper;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -62,8 +62,8 @@
protected Node[] getNodesToLock() throws UsecaseException {
List nodes = new ArrayList();
if(getSourceDocument() != null) {
- Node docNode = getSourceDocument().getRepositoryNode();
- Node siteNode = getSourceDocument().area().getSite().getRepositoryNode();
+ Node docNode = getSourceDocument();
+ Node siteNode = getSourceDocument().area().getSite();
nodes.add(docNode);
nodes.add(siteNode);
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/EmptyTrash.java Tue Feb 10 01:37:33 2009
@@ -23,6 +23,7 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.URLInformation;
@@ -66,22 +67,21 @@
* </ul>
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
List nodes = new ArrayList();
try {
String pubId = new URLInformation(getSourceURL()).getPublicationId();
Publication publication = getSession().getPublication(pubId);
Document[] docs = getTrashDocuments();
for (int i = 0; i < docs.length; i++) {
- nodes.add(docs[i].getRepositoryNode());
+ nodes.add(docs[i]);
}
SiteStructure structure = publication.getArea(Publication.TRASH_AREA).getSite();
- nodes.add(structure.getRepositoryNode());
+ nodes.add(structure);
} catch (Exception e) {
throw new UsecaseException(e);
}
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
}
/**
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceCheckIn.java Tue Feb 10 01:37:33 2009
@@ -28,7 +28,7 @@
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.metadata.dublincore.DublinCoreHelper;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.modules.monitoring.SessionListener;
@@ -48,7 +48,7 @@
return;
}
- Node node = doc.getRepositoryNode();
+ Node node = doc;
if (!node.isCheckedOut()) {
String[] params = { DublinCoreHelper.getTitle(doc, true) };
addErrorMessage("not-checked-out", params);
@@ -56,7 +56,7 @@
}
protected void prepareView() throws Exception {
- Node node = getSourceDocument().getRepositoryNode();
+ Node node = getSourceDocument();
if (node.isCheckedOut()) {
String userId = node.getCheckoutUserId();
User currentUser = getSession().getIdentity().getUser();
@@ -101,11 +101,7 @@
protected void doExecute() throws Exception {
super.doExecute();
-
- Document doc = getSourceDocument();
- Node node = doc.getRepositoryNode();
-
- node.forceCheckIn();
+ getSourceDocument().forceCheckIn();
}
/**
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ForceLiveCheckIn.java Tue Feb 10 01:37:33 2009
@@ -17,9 +17,9 @@
*/
package org.apache.lenya.cms.site.usecases;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.AbstractUsecase;
/**
@@ -55,6 +55,6 @@
}
private Node getNode() throws PublicationException {
- return getPublication().getArea(Publication.LIVE_AREA).getSite().getRepositoryNode();
+ return getPublication().getArea(Publication.LIVE_AREA).getSite();
}
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java Tue Feb 10 01:37:33 2009
@@ -26,9 +26,9 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.Link;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteException;
@@ -108,13 +108,13 @@
SiteStructure targetSite = getSourceDocument().getPublication().getArea(
getTargetArea()).getSite();
- nodes.add(sourceSite.getRepositoryNode());
- nodes.add(targetSite.getRepositoryNode());
+ nodes.add(sourceSite);
+ nodes.add(targetSite);
Document[] docs = SiteUtil.getSubSite(getSourceDocument().getLink().getNode())
.getDocuments();
for (int i = 0; i < docs.length; i++) {
- nodes.add(docs[i].getRepositoryNode());
+ nodes.add(docs[i]);
}
} catch (PublicationException e) {
@@ -139,10 +139,10 @@
targetLoc = SiteUtil.getAvailableLocator(getSession(), targetLoc);
for (int i = 0; i < sources.length; i++) {
- WorkflowUtil.invoke(getLogger(), sources[i], getEvent(), true);
+ WorkflowUtil.invoke(sources[i], getEvent(), true);
if (this.getClass().getName().equals(Restore.class.getName())) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), sources[i]);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(sources[i]);
String state = workflowable.getLatestVersion().getState();
if (!state.equals("authoring")) {
addErrorMessage("The state is [" + state + "] instead of [authoring]!");
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java Tue Feb 10 01:37:33 2009
@@ -83,7 +83,7 @@
boolean visible = doc.getLink().getNode().isVisible();
setParameter(VISIBLE_IN_NAVIGATION, Boolean.valueOf(visible));
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), doc);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(doc);
if (getWorkflowManager().hasWorkflow(workflowable)) {
Workflow workflow = getWorkflowManager().getWorkflowSchema(workflowable);
String[] variableNames = workflow.getVariableNames();
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Paste.java Tue Feb 10 01:37:33 2009
@@ -31,9 +31,9 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.SiteNode;
@@ -139,7 +139,7 @@
Clipboard clipboard = new ClipboardHelper().getClipboard(getRequest());
if (clipboard != null) {
- Node siteNode = getArea().getSite().getRepositoryNode();
+ Node siteNode = getArea().getSite();
nodes.add(siteNode);
Publication pub = getPublication();
@@ -150,7 +150,7 @@
for (int i = 0; i < subsiteDocs.length; i++) {
if (clipboard.getMethod() == Clipboard.METHOD_CUT) {
- nodes.add(subsiteDocs[i].getRepositoryNode());
+ nodes.add(subsiteDocs[i]);
}
}
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java Tue Feb 10 01:37:33 2009
@@ -76,7 +76,7 @@
super.doCheckPostconditions();
Document doc = getTargetDocument(true);
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), doc);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(doc);
String state = workflowable.getLatestVersion().getState();
if (!state.equals("authoring")) {
addErrorMessage("The state is [" + state + "] instead of [authoring]!");
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java Tue Feb 10 01:37:33 2009
@@ -18,8 +18,7 @@
package org.apache.lenya.cms.site.usecases;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.repository.History;
-import org.apache.lenya.cms.repository.Revision;
+import org.apache.lenya.cms.publication.History;
import org.apache.lenya.cms.workflow.WorkflowUtil;
import org.apache.lenya.workflow.Version;
import org.apache.lenya.workflow.Workflow;
@@ -41,28 +40,27 @@
Document sourceDoc = getSourceDocument();
if (sourceDoc != null) {
try {
- History history = sourceDoc.getRepositoryNode().getHistory();
+ History history = sourceDoc.getHistory();
int[] numbers = history.getRevisionNumbers();
- Revision[] revisions = new Revision[numbers.length];
+ Document[] revisions = new Document[numbers.length];
for (int i = 0; i < numbers.length; i++) {
- revisions[i] = history.getRevision(numbers[i]);
+ revisions[i] = sourceDoc.getRevision(numbers[i]);
}
setParameter("revisions", revisions);
- Boolean canRollback = Boolean.valueOf(WorkflowUtil.canInvoke(getLogger(),
- sourceDoc, getEvent()));
+ Boolean canRollback = Boolean
+ .valueOf(WorkflowUtil.canInvoke(sourceDoc, getEvent()));
setParameter("canRollback", canRollback);
- if (WorkflowUtil.hasWorkflow(getLogger(), sourceDoc)) {
- Workflowable workflowable = WorkflowUtil
- .getWorkflowable(getLogger(), sourceDoc);
+ if (WorkflowUtil.hasWorkflow(sourceDoc)) {
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(sourceDoc);
Version latestVersion = workflowable.getLatestVersion();
String state;
if (latestVersion != null) {
state = latestVersion.getState();
} else {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(), sourceDoc);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(sourceDoc);
state = workflow.getInitialState();
}
setParameter("workflowState", state);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java Tue Feb 10 01:37:33 2009
@@ -17,8 +17,6 @@
*/
package org.apache.lenya.cms.site.usecases;
-import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -32,8 +30,8 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
- org.apache.lenya.cms.repository.Node[] objects = { getSourceDocument().getRepositoryNode() };
+ protected org.apache.lenya.cms.publication.Node[] getNodesToLock() throws UsecaseException {
+ org.apache.lenya.cms.publication.Node[] objects = { getSourceDocument() };
return objects;
}
@@ -53,11 +51,9 @@
int revision = getParameterAsInteger("rollbackRevision", -1);
- Document document = getSourceDocument();
- Node node = document.getRepositoryNode();
- node.rollback(revision);
+ getSourceDocument().rollback(revision);
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(getSourceDocument(), getEvent());
}
protected String getEvent() {
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java Tue Feb 10 01:37:33 2009
@@ -35,10 +35,8 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
+import org.apache.lenya.cms.publication.RepositoryException;
import org.apache.lenya.cms.publication.ResourceType;
-import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.repository.RepositoryException;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.usecase.AbstractUsecase;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -136,14 +134,14 @@
String lastModified = format.format(new Date(doc.getLastModified()));
entry.setValue(KEY_LAST_MODIFIED, lastModified);
- if (WorkflowUtil.hasWorkflow(getLogger(), doc)) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), doc);
+ if (WorkflowUtil.hasWorkflow(doc)) {
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(doc);
Version latestVersion = workflowable.getLatestVersion();
String state;
if (latestVersion != null) {
state = latestVersion.getState();
} else {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(), doc);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(doc);
state = workflow.getInitialState();
}
entry.setValue(KEY_WORKFLOW_STATE, state);
@@ -151,9 +149,8 @@
entry.setValue(KEY_WORKFLOW_STATE, "");
}
- Node node = doc.getRepositoryNode();
- if (node.isCheckedOut()) {
- entry.setValue(KEY_CHECKED_OUT, node.getCheckoutUserId());
+ if (doc.isCheckedOut()) {
+ entry.setValue(KEY_CHECKED_OUT, doc.getCheckoutUserId());
} else {
entry.setValue(KEY_CHECKED_OUT, "");
}
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Tue Feb 10 01:37:33 2009
@@ -32,18 +32,14 @@
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.spring.configurator.WebAppContextUtils;
import org.apache.cocoon.util.AbstractLogEnabled;
-import org.apache.lenya.cms.publication.DocumentFactory;
-import org.apache.lenya.cms.publication.DocumentFactoryBuilder;
+import org.apache.lenya.cms.publication.LockException;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.Repository;
+import org.apache.lenya.cms.publication.RepositoryException;
import org.apache.lenya.cms.publication.Session;
+import org.apache.lenya.cms.publication.TransactionLock;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.Node;
-import org.apache.lenya.cms.repository.RepositoryException;
-import org.apache.lenya.transaction.ConcurrentModificationException;
-import org.apache.lenya.transaction.LockException;
-import org.apache.lenya.transaction.TransactionLock;
/**
* Abstract usecase implementation.
@@ -322,7 +318,7 @@
} else {
getSession().rollback();
}
- } catch (ConcurrentModificationException e) {
+ } catch (RepositoryException e) {
getLogger()
.error("Could not commit usecase [" + getName() + "]: " + e.getMessage());
addErrorMessage(e.getMessage());
@@ -673,7 +669,7 @@
* @return The objects that could be changed during the usecase.
* @throws UsecaseException if an error occurs.
*/
- protected Node[] getNodesToLock() throws UsecaseException {
+ protected org.apache.lenya.cms.publication.Node[] getNodesToLock() throws UsecaseException {
return new Node[0];
}
@@ -725,7 +721,9 @@
if (!objects[i].isLocked()) {
objects[i].lock();
}
- if (!isOptimistic() && !objects[i].isCheckedOutBySession(getRepositorySession())) {
+ if (!isOptimistic()
+ && !objects[i].isCheckedOutBySession(getSession().getId(), getSession()
+ .getIdentity().getUser().getId())) {
objects[i].checkout(checkoutRestrictedToSession());
}
}
@@ -739,7 +737,8 @@
for (int i = 0; i < objects.length; i++) {
if (objects[i].isCheckedOut()
- && !objects[i].isCheckedOutBySession(getRepositorySession())) {
+ && !objects[i].isCheckedOutBySession(getSession().getId(), getSession()
+ .getIdentity().getUser().getId())) {
if (getLogger().isDebugEnabled()) {
getLogger().debug(
"AbstractUsecase::lockInvolvedObjects() can not execute, object ["
@@ -751,10 +750,6 @@
return canExecute;
}
- private org.apache.lenya.cms.repository.Session getRepositorySession() {
- return (org.apache.lenya.cms.repository.Session) getSession();
- }
-
/**
* @see org.apache.lenya.cms.usecase.Usecase#cancel()
*/
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java Tue Feb 10 01:37:33 2009
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.lenya.cms.repository.Session;
+import org.apache.lenya.cms.publication.Session;
import org.apache.lenya.cms.usecase.Usecase;
import org.apache.lenya.cms.usecase.UsecaseView;
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Tue Feb 10 01:37:33 2009
@@ -20,15 +20,13 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.cron.CronJob;
import org.apache.cocoon.components.cron.JobScheduler;
@@ -40,7 +38,6 @@
import org.apache.lenya.ac.Machine;
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.publication.URLInformation;
-import org.apache.lenya.cms.repository.UUIDGenerator;
import org.apache.lenya.cms.usecase.Usecase;
import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
@@ -54,10 +51,7 @@
*
* @version $Id$
*/
-public class UsecaseSchedulerImpl extends AbstractLogEnabled implements UsecaseScheduler,
- Serviceable, Contextualizable, Disposable {
-
- private UUIDGenerator uuidGenerator;
+public class UsecaseSchedulerImpl extends AbstractLogEnabled implements UsecaseScheduler {
/**
* @see org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler#schedule(org.apache.lenya.cms.usecase.Usecase,
@@ -118,19 +112,8 @@
}
}
- protected UUIDGenerator getUuidGenerator() {
- if (this.uuidGenerator == null) {
- try {
- this.uuidGenerator = (UUIDGenerator) this.manager.lookup(UUIDGenerator.ROLE);
- } catch (ServiceException e) {
- throw new RuntimeException(e);
- }
- }
- return this.uuidGenerator;
- }
-
protected String getJobName() {
- return getUuidGenerator().nextUUID();
+ return UUID.randomUUID().toString();
}
protected ServiceManager manager;
@@ -184,9 +167,4 @@
return info.getPublicationId();
}
- public void dispose() {
- if (this.uuidGenerator != null) {
- this.manager.release(this.uuidGenerator);
- }
- }
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/pom.xml?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/pom.xml Tue Feb 10 01:37:33 2009
@@ -24,6 +24,11 @@
<artifactId>avalon-framework-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
+ <!-- Lenya -->
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
@@ -40,8 +45,34 @@
<artifactId>lenya-module-notification</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-repository</artifactId>
+ </dependency>
+
+ <!-- Tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <!-- FIXME: This dependency is transitive and should be obtained automatically
+ see http://jira.codehaus.org/browse/MNG-1378 -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-sitemap-impl</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
</dependency>
+
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java Tue Feb 10 01:37:33 2009
@@ -96,7 +96,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Invoking workflow event");
}
- WorkflowUtil.invoke(getLogger(), document, eventName);
+ WorkflowUtil.invoke(document, eventName);
return Collections.EMPTY_MAP;
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java Tue Feb 10 01:37:33 2009
@@ -77,22 +77,21 @@
PageEnvelope envelope = getEnvelope(objectModel, name);
Document document = envelope.getDocument();
if (document != null && document.exists()) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), document);
- if (WorkflowUtil.hasWorkflow(getLogger(), document)) {
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(document);
+ if (WorkflowUtil.hasWorkflow(document)) {
Version latestVersion = workflowable.getLatestVersion();
if (name.equals(STATE)) {
if (latestVersion == null) {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(),
- document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(document);
value = workflow.getInitialState();
} else {
value = latestVersion.getState();
}
} else if (name.startsWith(VARIABLE_PREFIX)) {
String variableName = name.substring(VARIABLE_PREFIX.length());
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(), document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(document);
String[] variableNames = workflow.getVariableNames();
if (Arrays.asList(variableNames).contains(variableName)) {
if (latestVersion == null) {
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java Tue Feb 10 01:37:33 2009
@@ -139,10 +139,10 @@
}
if (hasWorkflow()) {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(), document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(document);
String[] events = workflow.getEvents();
for (int i = 0; i < events.length; i++) {
- if (WorkflowUtil.canInvoke(getLogger(), document, events[i])) {
+ if (WorkflowUtil.canInvoke(document, events[i])) {
this.executableEvents.add(events[i]);
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java Tue Feb 10 01:37:33 2009
@@ -57,7 +57,7 @@
}
Document doc = getSourceDocument();
- if (!WorkflowUtil.canInvoke(getLogger(), doc, getEvent())) {
+ if (!WorkflowUtil.canInvoke(doc, getEvent())) {
UsecaseWorkflowHelper.addWorkflowError(this, getEvent(), doc);
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Deactivate.java Tue Feb 10 01:37:33 2009
@@ -25,6 +25,7 @@
import org.apache.lenya.cms.linking.LinkManager;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteNode;
@@ -100,18 +101,18 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
try {
List nodes = new ArrayList();
Document doc = getSourceDocument();
if (doc != null) {
- nodes.add(doc.getRepositoryNode());
+ nodes.add(doc);
Document liveDoc = doc.getAreaVersion(Publication.LIVE_AREA);
- nodes.add(liveDoc.getRepositoryNode());
- nodes.add(liveDoc.area().getSite().getRepositoryNode());
+ nodes.add(liveDoc);
+ nodes.add(liveDoc.area().getSite());
}
- return (org.apache.lenya.cms.repository.Node[]) nodes.toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java Tue Feb 10 01:37:33 2009
@@ -36,8 +36,7 @@
super.initParameters();
if (getSourceDocument() != null) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(),
- getSourceDocument());
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(getSourceDocument());
setParameter("versions", workflowable.getVersions());
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java Tue Feb 10 01:37:33 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.workflow.usecases;
-import org.apache.lenya.cms.repository.Node;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -43,7 +43,7 @@
protected Node[] getNodesToLock() throws UsecaseException {
Node[] objects = new Node[0];
if (getSourceDocument() != null) {
- objects = new Node[] { getSourceDocument().getRepositoryNode() };
+ objects = new Node[] { getSourceDocument() };
}
return objects;
}
@@ -53,7 +53,7 @@
*/
protected void doExecute() throws Exception {
super.doExecute();
- WorkflowUtil.invoke(getLogger(), getSourceDocument(), getEvent());
+ WorkflowUtil.invoke(getSourceDocument(), getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java Tue Feb 10 01:37:33 2009
@@ -47,6 +47,7 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentLocator;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Proxy;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
@@ -127,7 +128,7 @@
protected boolean canNotifySubmitter() {
boolean shallNotifySubmitter = false;
- Workflowable workflowable = WorkflowUtil.getWorkflowable(logger, getSourceDocument());
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(getSourceDocument());
Version versions[] = workflowable.getVersions();
// consider the case that there was no submit transition
@@ -162,26 +163,26 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
try {
List nodes = new ArrayList();
Document doc = getSourceDocument();
if (doc != null) {
- nodes.add(doc.getRepositoryNode());
+ nodes.add(doc);
// lock the authoring site to avoid having live nodes for which no corresponding
// authoring node exists
- nodes.add(doc.area().getSite().getRepositoryNode());
+ nodes.add(doc.area().getSite());
// lock the live site to avoid overriding changes made by others
SiteStructure liveSite = doc.getPublication().getArea(Publication.LIVE_AREA)
.getSite();
- nodes.add(liveSite.getRepositoryNode());
+ nodes.add(liveSite);
}
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ return (Node[]) nodes
+ .toArray(new Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
@@ -354,7 +355,7 @@
return;
}
- Workflowable workflowable = WorkflowUtil.getWorkflowable(logger, authoringDocument);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(authoringDocument);
Version versions[] = workflowable.getVersions();
// obtain submitted version
@@ -381,7 +382,7 @@
NotificationEventDescriptor descriptor = new NotificationEventDescriptor(message);
org.apache.lenya.cms.repository.Session repoSession = (Session) getSession();
- RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, getLogger(), descriptor);
+ RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, getLogger());
repoSession.enqueueEvent(event);
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java Tue Feb 10 01:37:33 2009
@@ -78,7 +78,7 @@
User sender = getSession().getIdentity().getUser();
String reason = getParameterAsString(PARAM_REJECT_REASON);
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), authoringDocument);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(authoringDocument);
Version versions[] = workflowable.getVersions();
// current version is reject, want originating submit
Version version = versions[versions.length - 2];
@@ -118,7 +118,7 @@
NotificationEventDescriptor descriptor = new NotificationEventDescriptor(message);
org.apache.lenya.cms.repository.Session repoSession = (Session) getSession();
- RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, getLogger(), descriptor);
+ RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, descriptor);
repoSession.enqueueEvent(event);
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java Tue Feb 10 01:37:33 2009
@@ -102,7 +102,7 @@
NotificationEventDescriptor descriptor = new NotificationEventDescriptor(message);
org.apache.lenya.cms.repository.Session repoSession = (Session) getSession();
- RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, getLogger(), descriptor);
+ RepositoryEvent event = RepositoryEventFactory.createEvent(repoSession, descriptor);
repoSession.enqueueEvent(event);
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java Tue Feb 10 01:37:33 2009
@@ -64,7 +64,7 @@
public static final void checkWorkflow(AbstractUsecase usecase, String event, Document doc,
Log logger) {
try {
- if (!WorkflowUtil.canInvoke(logger, doc, event)) {
+ if (!WorkflowUtil.canInvoke(doc, event)) {
UsecaseWorkflowHelper.addWorkflowError(usecase, event, doc);
}
} catch (WorkflowException e) {
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java Tue Feb 10 01:37:33 2009
@@ -51,7 +51,7 @@
protected Workflowable getWorkflowable() {
if (this.workflowable == null) {
- this.workflowable = WorkflowUtil.getWorkflowable(getLogger(), this.document);
+ this.workflowable = WorkflowUtil.getWorkflowable(this.document);
}
return this.workflowable;
}
@@ -80,7 +80,7 @@
}
protected Workflow getWorkflowSchema() throws WorkflowException {
- return WorkflowUtil.getWorkflowSchema(getLogger(), this.document);
+ return WorkflowUtil.getWorkflowSchema(this.document);
}
/**
@@ -112,7 +112,7 @@
*/
public boolean canInvoke(String usecaseName) throws WorkflowException {
String event = this.usecase.getEvent(usecaseName);
- return WorkflowUtil.canInvoke(getLogger(), this.document, event);
+ return WorkflowUtil.canInvoke(this.document, event);
}
/**
@@ -122,9 +122,9 @@
* @throws WorkflowException if an error occurs.
*/
public boolean getValue(String variable) throws WorkflowException {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(getLogger(), this.document);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.document);
if (workflowable.getVersions().length == 0) {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(getLogger(), this.document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(this.document);
return workflow.getInitialValue(variable);
} else {
return workflowable.getLatestVersion().getValue(variable);
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/test/java/org/apache/lenya/cms/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/test/java/org/apache/lenya/cms/workflow/WorkflowTest.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/test/java/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/test/java/org/apache/lenya/cms/workflow/WorkflowTest.java Tue Feb 10 01:37:33 2009
@@ -83,10 +83,7 @@
protected void invoke(Document document, TestSituation situation)
throws AccessControlException, RepositoryException, WorkflowException {
Session session = getSession(situation);
- Workflowable instance = new DocumentWorkflowable(getManager(),
- session,
- document,
- getLogger());
+ Workflowable instance = new DocumentWorkflowable(document);
assertNotNull(instance);
String event = situation.getEvent();
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java Tue Feb 10 01:37:33 2009
@@ -22,6 +22,7 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -33,7 +34,7 @@
* @version $Id: Deactivate.java 264805 2005-08-30 16:20:15Z andreas $
*/
public class Deactivate extends DocumentUsecase {
-
+
private DocumentManager documentManager;
/**
@@ -50,7 +51,7 @@
return;
}
String event = getEvent();
- if (!WorkflowUtil.canInvoke(getLogger(), getSourceDocument(), event)) {
+ if (!WorkflowUtil.canInvoke(getSourceDocument(), event)) {
addInfoMessage("The document cannot be deactivated because the workflow event cannot be invoked.");
}
}
@@ -59,17 +60,16 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
try {
List nodes = new ArrayList();
Document doc = getSourceDocument();
Document liveDoc = doc.getAreaVersion(Publication.LIVE_AREA);
- nodes.add(doc.getRepositoryNode());
- nodes.add(liveDoc.getRepositoryNode());
- nodes.add(liveDoc.area().getSite().getRepositoryNode());
- nodes.add(doc.area().getSite().getRepositoryNode());
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ nodes.add(doc);
+ nodes.add(liveDoc);
+ nodes.add(liveDoc.area().getSite());
+ nodes.add(doc.area().getSite());
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
}
@@ -95,7 +95,7 @@
getDocumentManager().delete(liveDocument);
- WorkflowUtil.invoke(getLogger(), authoringDocument, getEvent());
+ WorkflowUtil.invoke(authoringDocument, getEvent());
success = true;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -125,5 +125,5 @@
public void setDocumentManager(DocumentManager documentManager) {
this.documentManager = documentManager;
}
-
+
}
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java Tue Feb 10 01:37:33 2009
@@ -22,6 +22,7 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
@@ -55,7 +56,7 @@
return;
}
String event = getEvent();
- if (!WorkflowUtil.canInvoke(getLogger(), getSourceDocument(), event)) {
+ if (!WorkflowUtil.canInvoke(getSourceDocument(), event)) {
addInfoMessage("The document cannot be deactivated because the workflow event cannot be invoked.");
}
}
@@ -64,14 +65,13 @@
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
try {
List nodes = new ArrayList();
Document doc = getSourceDocument();
- nodes.add(doc.getRepositoryNode());
- nodes.add(doc.area().getSite().getRepositoryNode());
- return (org.apache.lenya.cms.repository.Node[]) nodes
- .toArray(new org.apache.lenya.cms.repository.Node[nodes.size()]);
+ nodes.add(doc);
+ nodes.add(doc.area().getSite());
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
}
@@ -96,7 +96,7 @@
protected void delete(Document document) {
try {
getDocumentManager().delete(document);
- WorkflowUtil.invoke(getLogger(), document, getEvent());
+ WorkflowUtil.invoke(document, getEvent());
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java?rev=742812&r1=742811&r2=742812&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java Tue Feb 10 01:37:33 2009
@@ -26,9 +26,9 @@
import org.apache.lenya.cms.publication.Area;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentManager;
+import org.apache.lenya.cms.publication.Node;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.util.DocumentSet;
-import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.NodeSet;
import org.apache.lenya.cms.site.SiteUtil;
import org.apache.lenya.cms.usecase.DocumentUsecase;
@@ -66,11 +66,11 @@
Document[] documents = set.getDocuments();
for (int i = 0; i < documents.length; i++) {
- nodes.add(documents[i].getRepositoryNode());
+ nodes.add(documents[i]);
}
Area live = doc.getPublication().getArea(Publication.LIVE_AREA);
- nodes.add(live.getSite().getRepositoryNode());
+ nodes.add(live.getSite());
return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
@@ -111,7 +111,7 @@
}
updateFeed();
getDocumentManager().copyToArea(authoringDocument, Publication.LIVE_AREA);
- WorkflowUtil.invoke(getLogger(), authoringDocument, getEvent());
+ WorkflowUtil.invoke(authoringDocument, getEvent());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -168,7 +168,7 @@
DocumentHelper.setSimpleElementText(element, datestr);
// set issued date on first time publish
- Workflowable dw = WorkflowUtil.getWorkflowable(this.getLogger(), doc);
+ Workflowable dw = WorkflowUtil.getWorkflowable(doc);
Version versions[] = dw.getVersions();
boolean wasLive = false;
for (int i = 0; i < versions.length; i++) {