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 2005/02/24 17:25:59 UTC
svn commit: r155199 -
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Author: andreas
Date: Thu Feb 24 08:25:58 2005
New Revision: 155199
URL: http://svn.apache.org/viewcvs?view=rev&rev=155199
Log:
after finishing usecase, go to same area (e.g., index-...)
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?view=diff&r1=155198&r2=155199
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Thu Feb 24 08:25:58 2005
@@ -17,9 +17,16 @@
package org.apache.lenya.cms.usecase;
+import java.util.Map;
+
+import org.apache.cocoon.components.ContextHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentFactory;
+import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.util.ServletHelper;
/**
* <p>
@@ -35,6 +42,7 @@
public class DocumentUsecase extends WorkflowUsecase {
protected static final String DOCUMENT = "document";
+ private String completeArea;
/**
* Ctor.
@@ -63,6 +71,13 @@
if (factory.isDocument(getSourceURL())) {
this.sourceDocument = factory.getFromURL(getSourceURL());
}
+
+ Map objectModel = ContextHelper.getObjectModel(getContext());
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ String webappUri = ServletHelper.getWebappURI(request);
+
+ URLInformation info = new URLInformation(webappUri);
+ this.completeArea = info.getCompleteArea();
} catch (DocumentBuildException e) {
throw new RuntimeException(e);
}
@@ -111,7 +126,10 @@
* @see org.apache.lenya.cms.usecase.Usecase#getTargetURL(boolean)
*/
public String getTargetURL(boolean success) {
- return getTargetDocument(success).getCanonicalWebappURL();
+ Document document = getTargetDocument(success);
+ String documentUrl = document.getCanonicalDocumentURL();
+ String url = "/" + document.getPublication().getId() + "/" + this.completeArea + documentUrl;
+ return url;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org