You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/02/08 00:30:09 UTC
svn commit: r375773 - in /cocoon/trunk/cocoon-blocks-fw: cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/ cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/WEB-INF/ cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/coc...

Author: danielf
Date: Tue Feb  7 15:30:05 2006
New Revision: 375773

URL: http://svn.apache.org/viewcvs?rev=375773&view=rev
Log:
Moved the test case to o.a.c.blocks.servlet, moved around resource file and updated servlet class in web.xml.
The sample seem to have some kind of context problem.

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/WEB-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/WEB-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/
      - copied from r375768, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/core/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/core/META-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/core/META-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test1/
      - copied from r375768, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test1/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test1/COB-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test1/COB-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test1/META-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test1/META-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test2/
      - copied from r375768, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test2/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test2/COB-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test2/COB-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test2/META-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test2/META-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/
      - copied from r375768, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test3/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/COB-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test3/COB-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/servlet/test3/META-INF/
      - copied from r375770, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test3/META-INF/
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/WEB-INF/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/core/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test1/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test2/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/resources/org/apache/cocoon/blocks/test3/
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/web.xml

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/web.xml?rev=375773&r1=375772&r2=375773&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/src/main/webapp/WEB-INF/web.xml Tue Feb  7 15:30:05 2006
@@ -32,7 +32,7 @@
     <display-name>BlocksManager</display-name>
     <description>BlocksManager</description>
 
-    <servlet-class>org.apache.cocoon.blocks.BlocksManager</servlet-class>
+    <servlet-class>org.apache.cocoon.blocks.servlet.BlocksManager</servlet-class>
 
     <init-param>
       <param-name>work-directory</param-name>