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 2003/06/30 10:53:06 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting RevisionControllerAction.java
andreas 2003/06/30 01:53:06
Modified: src/java/org/apache/lenya/cms/cocoon/acting
RevisionControllerAction.java
Log:
using factory instead of pageenvelope ctor
Revision Changes Path
1.17 +22 -13 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
Index: RevisionControllerAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RevisionControllerAction.java 20 May 2003 16:45:19 -0000 1.16
+++ RevisionControllerAction.java 30 Jun 2003 08:53:06 -0000 1.17
@@ -57,12 +57,13 @@
import org.apache.lenya.cms.rc.RCEnvironment;
import org.apache.lenya.cms.publication.PageEnvelope;
+import org.apache.lenya.cms.publication.PageEnvelopeFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationFactory;
+import java.io.File;
import java.util.Map;
-
/**
* DOCUMENT ME!
*
@@ -89,8 +90,13 @@
*
* @throws Exception DOCUMENT ME!
*/
- public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String src,
- Parameters parameters) throws Exception {
+ public Map act(
+ Redirector redirector,
+ SourceResolver resolver,
+ Map objectModel,
+ String src,
+ Parameters parameters)
+ throws Exception {
// Get request object
Request request = ObjectModelHelper.getRequest(objectModel);
@@ -106,27 +112,25 @@
try {
publication = PublicationFactory.getPublication(objectModel);
- envelope = new PageEnvelope(publication, request);
- }
- catch (Exception e) {
+ envelope = PageEnvelopeFactory.getInstance().getPageEnvelope(objectModel);
+ } catch (Exception e) {
getLogger().error("Resolving page envelope failed: ", e);
}
//get Parameters for RC
- String publicationPath = publication.getEnvironment().getPublicationPath();
+ String publicationPath = publication.getDirectory().getCanonicalPath();
String servletContextPath = publication.getServletContext().getCanonicalPath();
RCEnvironment rcEnvironment = new RCEnvironment(servletContextPath);
rcmlDirectory = rcEnvironment.getRCMLDirectory();
- rcmlDirectory=publicationPath+rcmlDirectory;
+ rcmlDirectory = publicationPath + rcmlDirectory;
backupDirectory = rcEnvironment.getBackupDirectory();
- backupDirectory=publicationPath+backupDirectory;
+ backupDirectory = publicationPath + backupDirectory;
// Initialize Revision Controller
rc = new RevisionController(rcmlDirectory, backupDirectory, publicationPath);
getLogger().debug("revision controller" + rc);
// /Initialize Revision Controller
-
// Get session
Session session = request.getSession(false);
@@ -140,8 +144,13 @@
getLogger().debug(".act(): Identity: " + identity);
String docId = request.getParameter("documentid");
- filename =publication.getEnvironment().getAuthoringPath() + "/" +docId ;
- getLogger().debug(".act(): publicationAuthPath + docId : " + publication.getEnvironment().getAuthoringPath() +" : " +docId );
+ String authoringPath =
+ new File(
+ publication.getDirectory().getCanonicalPath(),
+ "content" + File.separator + Publication.AUTHORING_AREA)
+ .getCanonicalPath();
+ filename = authoringPath + "/" + docId;
+ getLogger().debug(".act(): publicationAuthPath + docId : " + authoringPath + " : " + docId);
username = null;
if (identity != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org