cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From step...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/webapp/samples/slide README description2html4content.xsl sitemap.xmap web.xml
Date Fri, 31 Jan 2003 14:12:50 GMT
stephan     2003/01/31 06:12:50

  Modified:    src/scratchpad/lib LICENSE.jakarta-slide
               src/scratchpad/src/org/apache/cocoon/acting
                        SourceMultiAction.java
               src/scratchpad/src/org/apache/cocoon/generation
                        SourceDescriptionGenerator.java
               src/scratchpad/webapp/samples/slide README
                        description2html4content.xsl sitemap.xmap web.xml
  Log:
  Add bugfixes for the bug, which Alexander Peters mentioned in
  http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=103772837304431&w=2
  
  Update description to use the WebDAV servlet.
  
  Revision  Changes    Path
  1.2       +0 -5      xml-cocoon2/src/scratchpad/lib/LICENSE.jakarta-slide
  
  Index: LICENSE.jakarta-slide
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/lib/LICENSE.jakarta-slide,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LICENSE.jakarta-slide	22 May 2002 15:31:58 -0000	1.1
  +++ LICENSE.jakarta-slide	31 Jan 2003 14:12:50 -0000	1.2
  @@ -54,8 +54,3 @@
    * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
    *                                                                           *
    * ========================================================================= */
  -
  -/* CVS information: $Revision$ $Date$
  - * $Source$
  - * $Author$
  - */
  
  
  
  1.15      +3 -3      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceMultiAction.java
  
  Index: SourceMultiAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SourceMultiAction.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SourceMultiAction.java	7 Jan 2003 23:56:12 -0000	1.14
  +++ SourceMultiAction.java	31 Jan 2003 14:12:50 -0000	1.15
  @@ -95,8 +95,8 @@
       public final static String SOURCE_PERMISSION_PRIVILEGE = "cocoon-source-permission-privilege";
       public final static String SOURCE_PERMISSION_INHERITABLE = "cocoon-source-permission-inheritable";
       public final static String SOURCE_PERMISSION_NEGATIVE = "cocoon-source-permission-negative";
  -    public final static String PRINCIPAL = "cocoon-principal";
  -    public final static String PASSWORD = "cocoon-password";
  +    public final static String PRINCIPAL = "cocoon-source-principal";
  +    public final static String PASSWORD = "cocoon-source-password";
       public final static String UPLOAD_FILE = "cocoon-upload-file";
       public final static String SOURCE_NAME = "cocoon-source-name";
   
  
  
  
  1.20      +4 -6      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java
  
  Index: SourceDescriptionGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SourceDescriptionGenerator.java	30 Jan 2003 20:01:08 -0000	1.19
  +++ SourceDescriptionGenerator.java	31 Jan 2003 14:12:50 -0000	1.20
  @@ -364,11 +364,9 @@
   
               if ((source.getMimeType()!=null) &&
                   (source.getMimeType().length()>0)) {
  -                ;
  -            }
  -            attributes.addAttribute(SOURCE_NS, MIMETYPE_ATTR_NAME,
  -                                    MIMETYPE_ATTR_NAME, "CDATA",
  -                                    source.getMimeType());
  +                attributes.addAttribute(SOURCE_NS, MIMETYPE_ATTR_NAME,
  +                                        MIMETYPE_ATTR_NAME, "CDATA",
  +                                        source.getMimeType());
   
               if (source.getContentLength()>=0) {
                   attributes.addAttribute(SOURCE_NS, CONTENTLENGTH_ATTR_NAME,
  
  
  
  1.2       +22 -5     xml-cocoon2/src/scratchpad/webapp/samples/slide/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README	1 Jul 2002 15:09:21 -0000	1.1
  +++ README	31 Jan 2003 14:12:50 -0000	1.2
  @@ -5,7 +5,7 @@
   
   1. Install the Web Application via in Tomcat
   
  - ./build.sh  -Dinclude.webapp.libs=yes -Dinstall.war=$TOMCAT_HOME/webapps -Dinclude.scratchpad.libs=yes
install
  + ./build.sh -Dinclude.webapp.libs=yes -Dinstall.war=$TOMCAT_HOME/webapps -Dinclude.scratchpad.libs=yes
install
   
   2. Start Tomcat
   
  @@ -13,21 +13,38 @@
   
   3. Access the slide repository via Cocoon
   
  - http://vernjava:8080/cocoon/samples/slide/browse/myrepository/ 
  + http://localhost:8080/cocoon/samples/slide/
   
   [OPTIONAL]
   
   4. If you want an access via WebDAV copy the web.xml into WEB-INF/
      This file includes the WebDAV Servlet from Slide.
   
  -5. Access WebDAV via MS WebFolders, Cadaver or what ever
  +5. Add users to tomcat-users.xml for the MemoryRealm
  +
  + <role rolename="user"/>
  + <role rolename="root"/>
  + <user username="john" password="john" roles="user"/>
  + <user username="root" password="root" roles="root,user"/>
  +
  +   You can use the SlideRealm instead of the MemoryRealm.
  +
  +5. Access WebDAV via MS WebFolders, Cadaver or whatever
   
    http://localhost:8080/cocoon/webdav/
   
  -Have fun, Stephan Michels <stephan@vern.chem.tu-berlin.de>
  +(The Slide initialization will take the configuration, which
  + the web.xml file specify)
  +
  +Have fun, Stephan Michels <stephan@apache.org>
   
   
   Some things must be fixed:
   
  -* The base directory for the content stores should be set, but don't know how.
  +* The base directory for the content stores should be set. At the moment
  +  there isn't a way to respect the context path.
  +
  +* The links of directory browsing doesn't work properly, because of the
  +  servlet mapping.
   
  +* The support of the locking mechanism within the sources is in a alpha state.
  
  
  
  1.8       +4 -2      xml-cocoon2/src/scratchpad/webapp/samples/slide/description2html4content.xsl
  
  Index: description2html4content.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/description2html4content.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- description2html4content.xsl	30 Jan 2003 20:01:08 -0000	1.7
  +++ description2html4content.xsl	31 Jan 2003 14:12:50 -0000	1.8
  @@ -7,6 +7,8 @@
   
    <xsl:output indent="yes"/>
   
  + <xsl:param name="cocoon-source-principal">guest</xsl:param> 
  +
    <xsl:template match="/">
     <html>
      <head>
  @@ -209,13 +211,13 @@
   
                <xsl:when test="@source:mime-type='text/plain'">
                 <pre>
  -               <xi:include href="{@source:uri}" parse="text"/>
  +               <xi:include href="{@source:uri}?cocoon-source-principal={$cocoon-source-principal}"
parse="text"/>
                 </pre>
                </xsl:when>
   
                <xsl:when test="@source:mime-type='text/xml'">
                 <pre>
  -               <xi:include href="{@source:uri}" parse="text"/>
  +               <xi:include href="{@source:uri}?cocoon-source-principal={$cocoon-source-principal}"
parse="text"/>
                 </pre>
                </xsl:when>
   
  
  
  
  1.19      +8 -6      xml-cocoon2/src/scratchpad/webapp/samples/slide/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/sitemap.xmap,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- sitemap.xmap	31 Oct 2002 14:08:16 -0000	1.18
  +++ sitemap.xmap	31 Jan 2003 14:12:50 -0000	1.19
  @@ -194,11 +194,13 @@
        <map:match pattern="content/**">
         <map:act type="source-actions">
          <map:parameter name="method" value="{request-param:method}"/>
  -       <map:parameter name="cocoon-principal" value="{../ID}"/>
  +       <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
         <map:generate src="cocoon:/description/{../ID}/{1}"/>
  -      <map:transform src="description2html4content.xsl"/>
  +      <map:transform src="description2html4content.xsl">
  +       <map:parameter name="cocoon-source-principal" value="{../ID}"/>
  +      </map:transform>
         <map:transform type="xinclude"/>
         <map:serialize type="html"/>
        </map:match>
  @@ -207,7 +209,7 @@
        <map:match pattern="properties/**">
         <map:act type="source-actions">
          <map:parameter name="method" value="{request-param:method}"/>
  -       <map:parameter name="cocoon-principal" value="{../ID}"/>
  +       <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
         <map:generate src="cocoon:/description/{../ID}/{1}"/>
  @@ -219,7 +221,7 @@
        <map:match pattern="permissions/**">
         <map:act type="source-actions">
          <map:parameter name="method" value="{request-param:method}"/>
  -       <map:parameter name="cocoon-principal" value="{../ID}"/>
  +       <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
         <map:aggregate element="document">
  @@ -235,7 +237,7 @@
        <map:match pattern="locks/**">
         <map:act type="source-actions">
          <map:parameter name="method" value="{request-param:method}"/>
  -       <map:parameter name="cocoon-principal" value="{../ID}"/>
  +       <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:act>
   
         <map:generate src="cocoon:/description/{../ID}/{1}"/>
  @@ -246,7 +248,7 @@
        <!-- ============= Source direct ================== -->
   
        <map:match pattern="view/**">
  -      <map:read src="slide://{1}?cocoon-principal={../ID}"/>
  +      <map:read src="slide://{1}?cocoon-source-principal={../ID}"/>
        </map:match>
   
        <!-- ============= Repository users =============== -->
  
  
  
  1.4       +1 -1      xml-cocoon2/src/scratchpad/webapp/samples/slide/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/web.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- web.xml	30 Jan 2003 20:01:08 -0000	1.3
  +++ web.xml	31 Jan 2003 14:12:50 -0000	1.4
  @@ -397,7 +397,7 @@
   
       <init-param>
         <param-name>directory-browsing</param-name>
  -      <param-value>false</param-value>
  +      <param-value>true</param-value>
         <description>
            Use the 'directory-browsing' init-parameter to turn off generation of
            HTML index pages that enable browsing of collections.
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message