You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/06/07 00:46:23 UTC
svn commit: r544979 -
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java
Author: gkossakowski
Date: Wed Jun 6 15:46:21 2007
New Revision: 544979
URL: http://svn.apache.org/viewvc?view=rev&rev=544979
Log:
COCOON-2066: Reverting temporary fix (comitted in r544460) as discussed here:
http://thread.gmane.org/gmane.text.xml.cocoon.cvs/24573/focus=73530
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java?view=diff&rev=544979&r1=544978&r2=544979
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/BlockCompletePathModule.java Wed Jun 6 15:46:21 2007
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.modules.input.InputModule;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.servletservice.DispatcherServlet;
/**
* This module provides almost exactly the same functionality as {@link BlockPathModule}. The only difference is that
@@ -48,12 +47,7 @@
* @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
*/
public Object getAttribute(String name, Configuration modeConf, Map objectModel) throws ConfigurationException {
- final String prefix = DispatcherServlet.getDispatcherMountPrefix();
- if( prefix == null || prefix.length() == 0 )
- {
- return ObjectModelHelper.getRequest(objectModel).getContextPath() + blockPathModule.getAttribute(name, modeConf, objectModel);
- }
- return DispatcherServlet.getDispatcherMountPrefix() + blockPathModule.getAttribute(name, modeConf, objectModel);
+ return ObjectModelHelper.getRequest(objectModel).getContextPath() + blockPathModule.getAttribute(name, modeConf, objectModel);
}
/* (non-Javadoc)