cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/webapp/WEB-INF web.xml
Date Wed, 19 Sep 2001 08:28:28 GMT
cziegeler    01/09/19 01:28:28

  Modified:    .        Tag: cocoon_20_branch build.xml
               webapp   Tag: cocoon_20_branch sitemap.xmap
               webapp/WEB-INF Tag: cocoon_20_branch web.xml
  Log:
  ParentCM is now optional, javax.naming package is not required anymore, making C2 jdk1.2
compilable
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.36  +11 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.8.2.35
  retrieving revision 1.8.2.36
  diff -u -r1.8.2.35 -r1.8.2.36
  --- build.xml	2001/09/10 14:50:57	1.8.2.35
  +++ build.xml	2001/09/19 08:28:28	1.8.2.36
  @@ -100,7 +100,10 @@
         
   - HTML Generator : Requires the JTidy package (included in the dist)
                      <map:generator  name="html" src="org.apache.cocoon.generation.HTMLGenerator"
label="content"/>
  -                  
  +
  +- ParentCM Generator : Requires the jndi package (not included in the dist)
  +                   <map:generator  name="parentcm"    src="org.apache.cocoon.samples.parentcm.Generator"/>
  +   
   Transformers
   
   - XT transformer : Requires the XT package (included in the dist)
  @@ -304,6 +307,7 @@
           <exclude name="**/LDAPTransformer*.java" unless="naming.present"/>
           <exclude name="**/JSPEngineImplWLS.java" unless="weblogic.present"/>
           <exclude name="**/browser/*.x*"/>
  +        <exclude name="**/samples/parentcm/*.java" unless="naming.present"/>
         </fileset>
       </copy>
     </target>
  @@ -555,6 +559,12 @@
     <target name="prepare-webapp-naming" depends="copy-webapp" if="naming.present">
       <java classname="st">
           <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a transformers
ldap org.apache.cocoon.transformation.LDAPTransformer"/>
  +        <classpath>
  +          <pathelement location="${bin.dir}"/>
  +        </classpath>
  +    </java>
  +    <java classname="st">
  +        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a generators
parentcm org.apache.cocoon.samples.parentcm.Generator"/>
           <classpath>
             <pathelement location="${bin.dir}"/>
           </classpath>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.35 +0 -1      xml-cocoon2/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
  retrieving revision 1.11.2.34
  retrieving revision 1.11.2.35
  diff -u -r1.11.2.34 -r1.11.2.35
  --- sitemap.xmap	2001/09/18 14:51:59	1.11.2.34
  +++ sitemap.xmap	2001/09/19 08:28:28	1.11.2.35
  @@ -19,7 +19,6 @@
      <map:generator  name="velocity"    src="org.apache.cocoon.generation.VelocityGenerator"/>
      <map:generator  name="jsp"         src="org.apache.cocoon.generation.JspGenerator"/>
      <map:generator  name="stream"      src="org.apache.cocoon.generation.StreamGenerator"/>
  -   <map:generator  name="parentcm"    src="org.apache.cocoon.samples.parentcm.Generator"/>
     </map:generators>
   
     <map:transformers default="xslt">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.10 +7 -6      xml-cocoon2/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/WEB-INF/web.xml,v
  retrieving revision 1.1.1.1.2.9
  retrieving revision 1.1.1.1.2.10
  diff -u -r1.1.1.1.2.9 -r1.1.1.1.2.10
  --- web.xml	2001/09/06 20:56:33	1.1.1.1.2.9
  +++ web.xml	2001/09/19 08:28:28	1.1.1.1.2.10
  @@ -116,8 +116,9 @@
           <!-- For Database Driver: -->
           @database-driver@
           
  -        <!-- For parent ComponentManager sample: -->
  +        <!-- For parent ComponentManager sample:
           org.apache.cocoon.samples.parentcm.Configurator
  +        -->
         </param-value>
       </init-param>
     
  @@ -180,14 +181,14 @@
         Cocoon honors the Loggable and Initializable interfaces for this class,
         if it implements them.
       
  -      Currently the parent CM is set to the Parent CM sample, which will look up 
  +      If you uncomment the following lines the parent CM is set to the Parent CM sample,
which will look up 
         a configuration via JNDI at org/apache/cocoon/samples/parentcm/ParentCMConfiguration
         and use it.
  +       <init-param>
  +         <param-name>parent-component-manager</param-name>
  +         <param-value>org.apache.cocoon.samples.parentcm.ParentComponentManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
  +       </init-param>
       -->
  -    <init-param>
  -      <param-name>parent-component-manager</param-name>
  -      <param-value>org.apache.cocoon.samples.parentcm.ParentComponentManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
  -    </init-param>
   
       <!--
         This parameter allows you to startup Cocoon2 immediately after startup
  
  
  

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