forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r687398 - /forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java
Date Wed, 20 Aug 2008 17:55:27 GMT
Author: thorsten
Date: Wed Aug 20 10:55:23 2008
New Revision: 687398

URL: http://svn.apache.org/viewvc?rev=687398&view=rev
Log:
FOR-955 fixing resolver issue caused by updating excalibur source resolver.

Modified:
    forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java?rev=687398&r1=687397&r2=687398&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java
(original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/locationmap/lm/ActNode.java
Wed Aug 20 10:55:23 2008
@@ -27,6 +27,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.acting.Action;
+import org.apache.cocoon.components.CocoonComponentManager;
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
 import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
@@ -137,7 +138,7 @@
      * @see org.apache.forrest.locationmap.lm.AbstractNode#locate(java.util.Map, org.apache.cocoon.components.treeprocessor.InvokeContext)
      */
     public String locate(Map objectModel, InvokeContext context) throws Exception {
-        this.resolver = (SourceResolver)m_manager.lookup(SourceResolver.ROLE);
+        this.resolver = (SourceResolver)CocoonComponentManager.getCurrentEnvironment();
         Parameters parameters = resolveParameters(context,objectModel);
         Redirector redirector = context.getRedirector();
         m_src = m_varResolver.resolve(context,objectModel);
@@ -159,4 +160,4 @@
         return null;
     }
     
-}
\ No newline at end of file
+}



Mime
View raw message