You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/02/06 08:52:24 UTC
svn commit: r504017 - in
/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src: ./
main/java/org/apache/cocoon/maven/rcl/
main/resources/org/apache/cocoon/maven/rcl/WEB-INF/
test/java/org/apache/cocoon/maven/rcl/
Author: reinhard
Date: Mon Feb 5 23:52:23 2007
New Revision: 504017
URL: http://svn.apache.org/viewvc?view=rev&rev=504017
Log:
- switch to servlet-service-fw
- svn:ignore src/site
Modified:
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/ (props changed)
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/web.xml
cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/test/java/org/apache/cocoon/maven/rcl/RwmPropertiesTest.java
Propchange: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 5 23:52:23 2007
@@ -0,0 +1 @@
+site
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java?view=diff&rev=504017&r1=504016&r2=504017
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/java/org/apache/cocoon/maven/rcl/RwmProperties.java Mon Feb 5 23:52:23 2007
@@ -31,7 +31,7 @@
public class RwmProperties {
private static final String COB_INF_DIR = "/COB-INF";
- private static final String BLOCK_CONTEXT_URL_PARAM = "/blockContextURL";
+ private static final String BLOCK_CONTEXT_URL_PARAM = "/contextPath";
private static final String CLASSES_DIR = "%classes-dir";
private Configuration props;
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/web.xml?view=diff&rev=504017&r1=504016&r2=504017
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/web.xml (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/main/resources/org/apache/cocoon/maven/rcl/WEB-INF/web.xml Mon Feb 5 23:52:23 2007
@@ -95,7 +95,7 @@
<servlet-class>org.apache.cocoon.servlet.ReloadingServlet</servlet-class>
<init-param>
<param-name>servlet-class</param-name>
- <param-value>org.apache.cocoon.blocks.DispatcherServlet</param-value>
+ <param-value>org.apache.cocoon.servletservice.DispatcherServlet</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/test/java/org/apache/cocoon/maven/rcl/RwmPropertiesTest.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/test/java/org/apache/cocoon/maven/rcl/RwmPropertiesTest.java?view=diff&rev=504017&r1=504016&r2=504017
==============================================================================
--- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/test/java/org/apache/cocoon/maven/rcl/RwmPropertiesTest.java (original)
+++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-plugin/src/test/java/org/apache/cocoon/maven/rcl/RwmPropertiesTest.java Mon Feb 5 23:52:23 2007
@@ -36,8 +36,8 @@
// test variable interpolation
assertEquals("interpolatedValue:A", springProps.getProperty("b"));
// test setting the correct context URL if a *%classes-dir property was set
- assertTrue(springProps.containsKey("org.apache.cocoon.cocoon-rcl-plugin-demo.block/blockContextURL"));
- assertTrue(springProps.getProperty("org.apache.cocoon.cocoon-rcl-plugin-demo.block1/blockContextURL")
+ assertTrue(springProps.containsKey("org.apache.cocoon.cocoon-rcl-plugin-demo.block/contextPath"));
+ assertTrue(springProps.getProperty("org.apache.cocoon.cocoon-rcl-plugin-demo.block1/contextPath")
.indexOf("target/classes/COB-INF") > 0);
}