You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/21 19:58:34 UTC
svn commit: r510149 - in
/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases:
MoveSubsite.java Restore.java
Author: andreas
Date: Wed Feb 21 10:58:34 2007
New Revision: 510149
URL: http://svn.apache.org/viewvc?view=rev&rev=510149
Log:
Added check+debug code to MoveSubsite usecases
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Restore.java
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java?view=diff&rev=510149&r1=510148&r2=510149
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/MoveSubsite.java Wed Feb 21 10:58:34 2007
@@ -40,6 +40,7 @@
import org.apache.lenya.cms.workflow.WorkflowUtil;
import org.apache.lenya.cms.workflow.usecases.UsecaseWorkflowHelper;
import org.apache.lenya.util.Assert;
+import org.apache.lenya.workflow.Workflowable;
/**
* Usecase to move a subsite to another area.
@@ -137,6 +138,16 @@
for (int i = 0; i < sources.length; i++) {
WorkflowUtil.invoke(this.manager, getSession(), getLogger(), sources[i], getEvent(),
true);
+
+ if (this.getClass().getName().equals(Restore.class.getName())) {
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
+ getLogger(), sources[i]);
+ String state = workflowable.getLatestVersion().getState();
+ if (!state.equals("authoring")) {
+ addErrorMessage("The state is [" + state + "] instead of [authoring]!");
+ }
+ }
+
}
DocumentManager docManager = null;
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Restore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Restore.java?view=diff&rev=510149&r1=510148&r2=510149
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Restore.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Restore.java Wed Feb 21 10:58:34 2007
@@ -17,7 +17,10 @@
*/
package org.apache.lenya.cms.site.usecases;
+import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.workflow.WorkflowUtil;
+import org.apache.lenya.workflow.Workflowable;
/**
* Restore usecase handler.
@@ -45,6 +48,19 @@
*/
protected String getEvent() {
return "restore";
+ }
+
+ protected void doCheckPostconditions() throws Exception {
+ super.doCheckPostconditions();
+
+ Document doc = getTargetDocument(true);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
+ getLogger(), doc);
+ String state = workflowable.getLatestVersion().getState();
+ if (!state.equals("authoring")) {
+ addErrorMessage("The state is [" + state + "] instead of [authoring]!");
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org