Author: andreas
Date: Wed Aug 17 05:54:06 2005
New Revision: 233165
URL: http://svn.apache.org/viewcvs?rev=233165&view=rev
Log:
Update usecase configurations and handler classes (Transactionable -> Node)
Modified:
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-site-create.xconf
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-workflow-publish.xconf
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-deactivate.xconf
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-publish.xconf
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-reject.xconf
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-submit.xconf
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java
Modified:
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-site-create.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-site-create.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-site-create.xconf
(original)
+++ lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-site-create.xconf
Wed Aug 17 05:54:06 2005
@@ -21,6 +21,6 @@
<component-instance name="blog/site.create"
logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.CreateBlogEntry">
- <view template="site/create"/>
+ <view template="usecases/site/create.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-workflow-publish.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-workflow-publish.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-workflow-publish.xconf
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/blog/config/usecases-workflow-publish.xconf
Wed Aug 17 05:54:06 2005
@@ -21,6 +21,6 @@
<component-instance name="blog/workflow.publish"
logger="lenya.workflow"
class="org.apache.lenya.cms.workflow.usecases.Publish">
- <view template="workflow/publish"/>
+ <view template="usecases/workflow/publish.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-deactivate.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-deactivate.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-deactivate.xconf
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-deactivate.xconf
Wed Aug 17 05:54:06 2005
@@ -25,7 +25,7 @@
<component-instance name="default/workflow.deactivate"
logger="lenya.usecases.workflow"
class="org.apache.lenya.defaultpub.cms.usecases.Deactivate">
- <view template="workflow/deactivate"/>
+ <view template="usecases/workflow/deactivate.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-publish.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-publish.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-publish.xconf
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-publish.xconf
Wed Aug 17 05:54:06 2005
@@ -25,7 +25,7 @@
<component-instance name="default/workflow.publish"
logger="lenya.usecases.workflow"
class="org.apache.lenya.defaultpub.cms.usecases.Publish">
- <view template="workflow/publish"/>
+ <view template="usecases/workflow/publish.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-reject.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-reject.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-reject.xconf
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-reject.xconf
Wed Aug 17 05:54:06 2005
@@ -26,7 +26,7 @@
logger="lenya.usecases.workflow"
class="org.apache.lenya.cms.workflow.usecases.InvokeWorkflow">
<event id="reject"/>
- <view template="workflow/reject"/>
+ <view template="usecases/workflow/reject.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-submit.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-submit.xconf?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-submit.xconf
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/config/usecases-workflow-submit.xconf
Wed Aug 17 05:54:06 2005
@@ -26,7 +26,7 @@
logger="lenya.usecases.workflow"
class="org.apache.lenya.cms.workflow.usecases.InvokeWorkflow">
<event id="submit"/>
- <view template="workflow/submit"/>
+ <view template="usecases/workflow/submit.jx"/>
</component-instance>
</xconf>
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
Wed Aug 17 05:54:06 2005
@@ -32,7 +32,6 @@
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
-import org.apache.lenya.transaction.Transactionable;
import org.apache.lenya.workflow.WorkflowException;
/**
@@ -65,13 +64,13 @@
allowSingle = false;
addInfoMessage("The single document cannot be deactivated
because the workflow event cannot be invoked.");
}
-
+
DocumentIdentityMap map = getSourceDocument().getIdentityMap();
Document liveDoc = map.getAreaVersion(getSourceDocument(),
Publication.LIVE_AREA);
DocumentSet subSite = SiteUtil.getSubSite(this.manager, liveDoc);
Node node = NodeFactory.getNode(liveDoc);
subSite.removeAll(SiteUtil.getExistingDocuments(map, node));
-
+
if (!subSite.isEmpty()) {
allowSingle = false;
addInfoMessage("You have to deactivate the whole subtree
because descendants are live.");
@@ -81,16 +80,16 @@
}
/**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#getObjectsToLock()
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected Transactionable[] getObjectsToLock() throws UsecaseException {
+ protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws
UsecaseException {
try {
List nodes = new ArrayList();
DocumentSet set = new DocumentSet();
-
+
Document doc = getSourceDocument();
set.addAll(SiteUtil.getSubSite(this.manager, doc));
-
+
Document liveDoc = doc.getIdentityMap().getAreaVersion(doc,
Publication.LIVE_AREA);
set.addAll(SiteUtil.getSubSite(this.manager, liveDoc));
@@ -100,7 +99,7 @@
}
nodes.add(SiteUtil.getSiteStructure(this.manager,
liveDoc).getRepositoryNode());
- return (Transactionable[]) nodes.toArray(new
Transactionable[nodes.size()]);
+ return (org.apache.lenya.cms.repository.Node[]) nodes.toArray(new
org.apache.lenya.cms.repository.Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
Wed Aug 17 05:54:06 2005
@@ -42,7 +42,6 @@
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
import org.apache.lenya.cms.workflow.WorkflowUtil;
-import org.apache.lenya.transaction.Transactionable;
import org.apache.lenya.workflow.WorkflowException;
/**
@@ -70,29 +69,35 @@
}
/**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#getObjectsToLock()
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected Transactionable[] getObjectsToLock() throws UsecaseException {
+ protected org.apache.lenya.cms.repository.Node[] getNodesToLock() throws
UsecaseException {
try {
List nodes = new ArrayList();
DocumentSet set = new DocumentSet();
Document doc = getSourceDocument();
set.addAll(SiteUtil.getSubSite(this.manager, doc));
- Map targets = SiteUtil.getTransferedSubSite(this.manager, doc,
Publication.LIVE_AREA,
+ Map targets = SiteUtil.getTransferedSubSite(this.manager,
+ doc,
+ Publication.LIVE_AREA,
SiteUtil.MODE_REPLACE);
Document[] docs = set.getDocuments();
for (int i = 0; i < docs.length; i++) {
nodes.add(docs[i].getRepositoryNode());
Document target = (Document) targets.get(docs[i]);
nodes.add(target.getRepositoryNode());
- nodes.addAll(AssetUtil.getCopiedAssetNodes(docs[i], target,
this.manager,
+ nodes.addAll(AssetUtil.getCopiedAssetNodes(docs[i],
+ target,
+ this.manager,
getLogger()));
}
- nodes.add(SiteUtil.getSiteStructure(this.manager,
getDocumentIdentityMap(),
- doc.getPublication(),
Publication.LIVE_AREA).getRepositoryNode());
- return (Transactionable[]) nodes.toArray(new
Transactionable[nodes.size()]);
+ nodes.add(SiteUtil.getSiteStructure(this.manager,
+ getDocumentIdentityMap(),
+ doc.getPublication(),
+ Publication.LIVE_AREA).getRepositoryNode());
+ return (org.apache.lenya.cms.repository.Node[]) nodes.toArray(new
org.apache.lenya.cms.repository.Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
@@ -145,12 +150,13 @@
DocumentSet liveDocs = SiteUtil.getExistingDocuments(map,
requiredNodes[i]);
if (liveDocs.isEmpty()) {
Document authoringDoc =
map.get(requiredNodes[i].getPublication(),
- Publication.AUTHORING_AREA,
requiredNodes[i].getDocumentId());
+ Publication.AUTHORING_AREA,
+ requiredNodes[i].getDocumentId());
if (authoringDoc.exists()) {
missingDocuments.add(authoringDoc);
} else {
-
missingDocuments.add(map.getLanguageVersion(authoringDoc, authoringDoc
- .getPublication().getDefaultLanguage()));
+
missingDocuments.add(map.getLanguageVersion(authoringDoc,
+
authoringDoc.getPublication().getDefaultLanguage()));
}
}
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java?rev=233165&r1=233164&r2=233165&view=diff
==============================================================================
---
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java
(original)
+++
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java
Wed Aug 17 05:54:06 2005
@@ -35,11 +35,11 @@
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationFactory;
+import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.site.SiteStructure;
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.Transactionable;
import org.apache.lenya.workflow.WorkflowManager;
import org.apache.excalibur.source.Source;
import org.xml.sax.InputSource;
@@ -77,7 +77,8 @@
documentManager = (DocumentManager)
this.manager.lookup(DocumentManager.ROLE);
- DocumentIdentityMap map = (DocumentIdentityMap)
getSession().getUnitOfWork().getIdentityMap();
+ DocumentIdentityMap map = (DocumentIdentityMap)
getSession().getUnitOfWork()
+ .getIdentityMap();
Document document = map.get(getPublication(),
doc.getArea(),
doc.getId(),
@@ -162,9 +163,9 @@
}
/**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#getObjectsToLock()
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
- protected Transactionable[] getObjectsToLock() throws UsecaseException {
+ protected Node[] getNodesToLock() throws UsecaseException {
try {
List nodes = new ArrayList();
Document doc = getSourceDocument();
@@ -178,7 +179,7 @@
SiteStructure structure = SiteUtil.getSiteStructure(this.manager,
getSourceDocument());
nodes.add(structure.getRepositoryNode());
- return (Transactionable[]) nodes.toArray(new
Transactionable[nodes.size()]);
+ return (Node[]) nodes.toArray(new Node[nodes.size()]);
} catch (Exception e) {
throw new UsecaseException(e);
|
