Return-Path: 
 <cocoon-cvs-return-4428-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 89249 invoked by uid 500); 17 Dec 2001 14:29:26 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 89240 invoked by uid 500); 17 Dec 2001 14:29:26 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 17 Dec 2001 14:29:26 -0000
Message-ID: <20011217142926.3259.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit: xml-cocoon2/src/org/apache/cocoon/acting
 AbstractAction.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    01/12/17 06:29:26

  Modified:    .        Tag: cocoon_20_branch INSTALL build.xml changes.xml
               bin/src  Tag: cocoon_20_branch ClassAvailable.java
               src/org/apache/cocoon/acting Tag: cocoon_20_branch
                        AbstractAction.java
  Log:
  Minor sync with 2.1 and 2.0
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.2 +34 -21    xml-cocoon2/INSTALL
  
  Index: INSTALL
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/INSTALL,v
  retrieving revision 1.1.1.1.2.1
  retrieving revision 1.1.1.1.2.2
  diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
  --- INSTALL	2001/07/19 09:55:12	1.1.1.1.2.1
  +++ INSTALL	2001/12/17 14:29:25	1.1.1.1.2.2
  @@ -86,7 +86,7 @@
    7) Wait a few seconds (Cocoon needs to compile parts of itself when launched)
    
   
  - 8) Say hallo to Cocoon :)
  + 8) Say hello to Cocoon :)
     
   
   
  @@ -116,22 +116,44 @@
     for information on how to pre-compile the sitemap and the XSP's.
     
    
  -  3) Why is cocoon.war so big?
  +  3) Can I improve startup-time by precompiling the sitemap and XSP's?
     
  +  Sure, follow the instructions:
  +  
  +    a) Set the "work-directory" parameter in web.xml as follows:
  +     
  +        <init-param>
  +         <param-name>work-directory</param-name>
  +         <param-value>WEB-INF/classes</param-value>
  +        </init-param>
  +         
  +    b) Set the auto-reload to false in your cocoon.xconf file as follows:
  +      
  +        <parameter name="auto-reload" value="false"/>
  +        
  +    c) Use "-Dcompile.xsp=yes" in your build command line when you are
  +       building your WAR file. For example:
  +        
  +       ./build.sh -Dcompile.xsp=yes -Dinclude.webapp.libs=yes -Dinstall.war=$TOMCAT_HOME/webapps install
  +        
  +        
  +  4) Why is cocoon.war so big?
  +  
     Cocoon.war includes all the libraries that it requires to run. They are 
     several megabytes of Java classes and it also includes the JDK javac compiler
     which must be present in the war file to allow page compilation without 
     classloading problems.
   
     
  -  4) I get a java.lang.VerifyError when accessing 'http://localhost/cocoon/'.
  +
  +  5) I get a java.lang.VerifyError when accessing 'http://localhost/cocoon/'.
        What's wrong?
   
     Make sure you do not have a Cocoon 1.x jar in your servlet container lib/
     directory.
   
   
  -  5) I get an Exception when accessing Cocoon the first time. What's wrong?
  +  6) I get an Exception when accessing Cocoon the first time. What's wrong?
   
     Cocoon requires a JAXP 1.1 compliant parser. Recent servlet engines
     (like Tomcat 3.2.1) use older xml parsers. You have to replace the xml
  @@ -141,25 +163,16 @@
     it to parser.jar. Before you restart Tomcat make sure to remove the
     tomcat/work directory beforehand.
   
  +
  +  7) I'm still stuck, what do I do?
  +  
  +  Read the Cocoon documentation included in the distribution. 
  +
  +  This file is just a quick and dirty way to get you started but the docs 
  +  contain much more detailed information as well as FAQs and indications
  +  on how to contact us.
   
  -  6) I'm still stuck, what do I do?
     
  -  Well, contact the Cocoon Users mail list (cocoon-users@xml.apache.org).
  -  Please, do not contact developers directly for help since the user list are
  -  normally much more responsive and users normally have more experience in
  -  solving installation problems than developers do.
  -
  -  7) What are the steps to pre-compile the sitemap and XSP's?
  -
  -  Step #1.  Set the "work-directory" parameter in web.xml as follows:
  -      <init-param>
  -       <param-name>work-directory</param-name>
  -       <param-value>WEB-INF/classes</param-value>
  -      </init-param>
  -  Step #2. Set the auto-reload to false in your sitemap.xmap as follows:
  -      <parameter name="auto-reload" value="false"/>
  -  Step #3. Use "-Dcompile.xsp=yes" in your build command line when you are
  -       building your WAR file.
     
     Happy hacking with Apache Cocoon.
   
  
  
  
  1.8.2.79  +15 -9     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.8.2.78
  retrieving revision 1.8.2.79
  diff -u -r1.8.2.78 -r1.8.2.79
  --- build.xml	2001/11/30 09:33:49	1.8.2.78
  +++ build.xml	2001/12/17 14:29:25	1.8.2.79
  @@ -102,12 +102,6 @@
   
   <project default="package" basedir=".">
   
  -  <!-- A simple task to test for a class -->
  -  <taskdef name="ClassAvailable" classname="ClassAvailable" classpath="./bin/anttasks"/> 
  -  <!-- A task to change the sitemap. It is used to add optional components -->
  -  <taskdef name="SitemapTool" classname="SitemapTool" classpath="./bin/anttasks"/>
  -
  -
     <!--
       Give user a chance to override without editing this file
       (and without typing -D each time he compiles it)
  @@ -211,6 +205,10 @@
       <filter token="database-user" value="${database-user}"/>
       <filter token="database-password" value="${database-password}"/>
   
  +    <!-- compile the ant tasks -->
  +    <mkdir dir="bin/anttasks"/>
  +    <javac srcdir="bin/src" destdir="bin/anttasks"/>
  +
     </target>
   
     <!-- =================================================================== -->
  @@ -218,7 +216,11 @@
     <!-- =================================================================== -->
     <target name="optional-tests" depends="init"
             description="Tests for optional classes missing to the environment">
  -  
  +
  +    <!-- A simple task to test for a class -->
  +    <taskdef name="ClassAvailable" classname="ClassAvailable" 
  +        classpath="./bin/anttasks"/>
  +
       <available property="servlet.present" 
                  classname="javax.servlet.http.HttpServlet">
             <classpath refid="classpath"/>
  @@ -527,6 +529,7 @@
           <include name="**/Manifest.mf"/>
           <include name="**/*.xsl"/>
           <include name="**/*.roles"/>
  +        <include name="**/*.xconf"/>
           <include name="META-INF/**"/>
         </fileset>
       </copy>
  @@ -676,8 +679,7 @@
       <!-- copy the documentation, it's already prepared in the build context dir -->
       <mkdir dir="${build.war}/documentation"/>
       <copy todir="${build.war}/documentation" filtering="off">
  -      <fileset dir="${build.context}">
  -      </fileset>
  +      <fileset dir="${build.context}"/>
       </copy>
   
       <!-- correct the image references -->
  @@ -695,6 +697,10 @@
     <!-- Prepares the webapp directories                                     -->
     <!-- =================================================================== -->
     <target name="prepare-webapp" depends="copy-webapp">
  +      <!-- A task to change the sitemap. It is used to add optional components -->
  +      <taskdef name="SitemapTool" classname="SitemapTool" 
  +          classpath="./bin/anttasks"/>
  +
         <!-- Invoke the SitemapTool to add optional entries -->
         <SitemapTool directory="${build.src}"
                      extension="sitemap"
  
  
  
  1.2.2.53  +5 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.2.2.52
  retrieving revision 1.2.2.53
  diff -u -r1.2.2.52 -r1.2.2.53
  --- changes.xml	2001/12/13 20:50:39	1.2.2.52
  +++ changes.xml	2001/12/17 14:29:25	1.2.2.53
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.2.2.52 2001/12/13 20:50:39 vgritsenko Exp $
  +  $Id: changes.xml,v 1.2.2.53 2001/12/17 14:29:25 cziegeler Exp $
   -->
   
   <changes title="History of Changes">
  @@ -19,6 +19,7 @@
     <person name="Stefano Mazzocchi" email="stefano@apache.org" id="SM"/>
     <person name="Giacomo Pati" email="Giacomo.Pati@pwr.ch" id="GP"/>
     <person name="Ovidiu Predescu" email="ovidiu@cup.hp.com" id="OP"/>
  +  <person name="Gianugo Rabellino" email="gianugo@apache.org" id="GR"/>
     <person name="Ricardo Rocha" email="ricardo@apache.org" id="RR"/>
     <person name="Paul Russell" email="prussell@apache.org" id="PR"/>
     <person name="Davanum Srinivas" email="dims@yahoo.com" id="DM"/>
  @@ -178,6 +179,9 @@
     <action dev="VG" type="fix">
      Catch NoClassDefFoundError and throw ResourceNotFoundException
      if XSP was requested with different case.
  +  </action>
  +  <action dev="SW" type="add">
  +   New log formatter outputs the caller class and request URI in the log file. 
     </action>
     <action dev="CZ" type="add">
      Added patch by Stuart Roebuck (stuart.roebuck@adolos.com)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +4 -1      xml-cocoon2/bin/src/ClassAvailable.java
  
  Index: ClassAvailable.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/bin/src/ClassAvailable.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ClassAvailable.java	2001/10/12 13:05:07	1.1.2.2
  +++ ClassAvailable.java	2001/12/17 14:29:26	1.1.2.3
  @@ -19,8 +19,10 @@
    * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    *
    * This task searches only in the defined path but not in the parents path
  + * unless explicitly overridden by the value of ${build.sysclasspath}
    * like the original available task does.
  - * @author Carsten Ziegeler <a href="mailto:cziegeler@apache.org">cziegeler@apache.org</a>
  + * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/12/17 14:29:26 $
    */
   
   public class ClassAvailable extends Task {
  @@ -81,6 +83,7 @@
   
           if (classpath != null) {
               classpath.setProject(project);
  +            classpath = classpath.concatSystemClasspath("ignore");
           }
   
           if (!findClassInComponents(classname)) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.9   +2 -1      xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java
  
  Index: AbstractAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractAction.java,v
  retrieving revision 1.2.2.8
  retrieving revision 1.2.2.9
  diff -u -r1.2.2.8 -r1.2.2.9
  --- AbstractAction.java	2001/11/28 09:21:01	1.2.2.8
  +++ AbstractAction.java	2001/12/17 14:29:26	1.2.2.9
  @@ -19,7 +19,7 @@
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
  - * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/11/28 09:21:01 $
  + * @version CVS $Revision: 1.2.2.9 $ $Date: 2001/12/17 14:29:26 $
    */
   public abstract class AbstractAction extends AbstractLoggable
   implements Action {
  @@ -29,4 +29,5 @@
        * pre-jdk1.3 support is dropped.
        */
       protected static final Map EMPTY_MAP = Collections.unmodifiableMap(new TreeMap());
  +
   }
  
  
  

----------------------------------------------------------------------
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