forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Thorsten Scherler (JIRA)" <j...@apache.org>
Subject [jira] Commented: (FOR-955) notes for experiment using Cocoon 2.1 branch in Forrest
Date Thu, 21 Aug 2008 12:22:46 GMT

    [ https://issues.apache.org/jira/browse/FOR-955?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12624353#action_12624353
] 

Thorsten Scherler commented on FOR-955:
---------------------------------------

The following patch brings back "forrest site" -> applied in cocoon.

Index: src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
===================================================================
--- src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
(revision 681296)
+++ src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
(working copy)
@@ -36,6 +36,7 @@
 import org.apache.cocoon.caching.ComponentCacheKey;
 import org.apache.cocoon.caching.PipelineCacheKey;
 import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.apache.cocoon.transformation.Transformer;
 import org.apache.cocoon.util.HashUtil;
@@ -243,6 +244,9 @@
                     }
                 } else {
                     Object lock = env.getObjectModel().get(HttpEnvironment.HTTP_REQUEST_OBJECT);
+                    if (null==lock){
+                      lock = env.getObjectModel().get(ObjectModelHelper.REQUEST_OBJECT);
+                    }
                     try {
                         transientStore.store(lockKey, lock);
                     } catch (IOException e) {

> notes for experiment using Cocoon 2.1 branch in Forrest
> -------------------------------------------------------
>
>                 Key: FOR-955
>                 URL: https://issues.apache.org/jira/browse/FOR-955
>             Project: Forrest
>          Issue Type: Task
>          Components: Core operations
>            Reporter: David Crossley
>         Attachments: 955.diff
>
>
> These are the steps to get Forrest running with Cocoon-2.1 rather than the current situation
which uses an old Cocoon trunk. Not everything yet works, but enough to give hope. See discussion
at:
>  Re: upgrade strategies for our packaged Cocoon
>  http://marc.theaimsgroup.com/?l=forrest-dev&m=116969420304386
> --------------------------
> Steps:
> Revert main/java/org/apache/forrest/util/XPathTransformer.java r111200
> Revert main/java/org/apache/forrest/util/IdGeneratorTransformer.java r111200
> Edit main/webapp/WEB-INF/cocoon.xconf
> to change version attribute to ... cocoon version="2.1"
> Move content of WEB-INF/xconf/forrest-core.xconf into WEB-INF/cocoon.xconf
> Remove the <components> wrapper.
> Build cocoon-branch-2_1_X for the blocks that we use (see our etc/cocoon_upgrade) and
replace the jars in lib/core
> --------------------------
> Some results:
> localhost:8888/samples/sample.html ... missing decoration
> localhost:8888/samples/sample.xml ... seems okay
> localhost:8888/samples/sample.pdf ... seems okay
> localhost:8888/index.html ... The requested resource "/index.html" could not be found
> localhost:8888/index.xml ... seems okay
> localhost:8888/index.pdf ... complains about linkmap-index.xml
> localhost:8888/linkmap.html ... The requested resource "/linkmap.html" could not be found

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


Mime
View raw message