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/src/org/apache/cocoon/transformation naming.sitemap xt.sitemap
Date Fri, 23 Nov 2001 10:11:39 GMT
cziegeler    01/11/23 02:11:39

  Modified:    .        Tag: cocoon_20_branch build.xml changes.xml
  Added:       bin/anttasks Tag: cocoon_20_branch SitemapTool.class
               bin/src  Tag: cocoon_20_branch SitemapTool.java
               src/org/apache/cocoon/generation Tag: cocoon_20_branch
                        naming.sitemap php.sitemap tidy.sitemap
               src/org/apache/cocoon/serialization Tag: cocoon_20_branch
                        fop.sitemap
               src/org/apache/cocoon/transformation Tag: cocoon_20_branch
                        naming.sitemap xt.sitemap
  Removed:     bin      Tag: cocoon_20_branch st.class
               bin/src  Tag: cocoon_20_branch st.java
  Log:
  Updated to new build system - synced with 2.1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.62  +72 -137   xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.8.2.61
  retrieving revision 1.8.2.62
  diff -u -r1.8.2.61 -r1.8.2.62
  --- build.xml	2001/11/22 15:53:23	1.8.2.61
  +++ build.xml	2001/11/23 10:11:38	1.8.2.62
  @@ -91,47 +91,21 @@
   Some components are optional and require special jar files to be compiled
   and added to the web application. Some if these jars are already included
   in the distribution while others not.
  +For each optional package which is not available, a warning is
  +printed. If you don't like these warnings, specify the property "omit.opt.warnings"
  +(build -Domit.opt.warnings).
   
  -Here is a list of the optional components:
   
  -Generators
  +                              Happy hacking from the Apache Cocoon Dev Team :)
   
  -- Php Generator : Requires the php package (not included in the dist)
  -                  <map:generate name="php" src="org.apache.cocoon.generation.PhpGenerator"/>
  -      
  -- 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)
  -                   <map:transformer name="xt" src="org.apache.cocoon.transformation.XTTransformer"/>
  -
  -- LDAP transformer: Requires the jndi package (not included in the dist)
  -                   <map:transformer name="ldap" src="org.apache.cocoon.transformation.LDAPTransformer"/>
  -
  -
  -Serializers
  -
  -- fo2pdf serializer : Requires the FOP package (included in the dist)
  -                    <map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf"/>
  -- fo2ps serializer : Requires the FOP package (included in the dist)
  -                    <map:serializer name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/postscript"/>
  -- fo2pcl serializer : Requires the FOP package (included in the dist)
  -                    <map:serializer name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/vnd.hp-PCL"/>
  -
  -
  -                              Happy hacking from the Apache Cocoon 2 Dev Team :)
  -
   ============================================================================ -->
   
   <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"/>
   
   
     <!--
  @@ -250,16 +224,6 @@
             <classpath refid="classpath"/>
       </available>
       
  -    <available property="php.present" 
  -               classname="net.php.servlet">
  -          <classpath refid="classpath"/>
  -    </available>
  -
  -    <available property="xt.present" 
  -               classname="com.jclark.xsl.sax.XMLProcessorImpl">
  -          <classpath refid="classpath"/>
  -    </available>
  -
       <available property="rhino.present" 
                  classname="org.mozilla.javascript.tools.jsc.Main">
             <classpath refid="classpath"/>
  @@ -290,16 +254,24 @@
             <classpath refid="classpath"/>
       </available>
   
  -    <ClassAvailable classpathref="classpath" 
  -                    property="naming.present" 
  -                    classname="javax.naming.Context"/>
  -
       <available property="weblogic.present" 
                  classname="weblogic.servlet.internal.ServletContextImpl">
             <classpath refid="classpath"/>
       </available>
   
       <ClassAvailable classpathref="classpath" 
  +                    property="php.present" 
  +                    classname="net.php.servlet"/>
  +
  +    <ClassAvailable classpathref="classpath" 
  +                    property="xt.present" 
  +                    classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
  +
  +    <ClassAvailable classpathref="classpath" 
  +                    property="naming.present" 
  +                    classname="javax.naming.Context"/>
  +
  +    <ClassAvailable classpathref="classpath" 
                       property="svg.present" 
                       classname="org.apache.batik.transcoder.Transcoder"/>
   
  @@ -320,7 +292,7 @@
     <!-- =================================================================== -->
     <!-- Macro for optional warnings                                         -->
     <!-- =================================================================== -->
  -  <target name="op-warning" description="General waring target (used by other targets)">
             
  +  <target name="op-warning" description="General waring target (used by other targets)"
unless="omit.opt.warning">              
       <echo>**********************************************</echo>
       <echo>*</echo>
       <echo>*  Classes of the optional package ${thing} are not </echo>
  @@ -338,6 +310,36 @@
     <!-- =================================================================== -->
     <!-- Warnings                                                            -->
     <!-- =================================================================== -->
  +  <target name="xt-warn" unless="xt.present" 
  +      description="Outputs a warning if com.jclark.xsl.* classes are missing during compilation">
  +    <antcall target="op-warning">
  +      <param name="thing" value="XT"/>
  +      <param name="recovery" 
  +        value="Get the xt package and place the jar in the lib dir"/>
  +      <param name="message"
  +             value="XT is required for the xt transformer."/>
  +    </antcall>
  +  </target>  
  +  <target name="php-warn" unless="php.present" 
  +      description="Outputs a warning if net.php.* classes are missing during compilation">
  +    <antcall target="op-warning">
  +      <param name="thing" value="Php"/>
  +      <param name="recovery" 
  +        value="Get the php servlet and place the jar in the lib dir"/>
  +      <param name="message"
  +             value="Php is required for the php generator."/>
  +    </antcall>
  +  </target>  
  +  <target name="naming-warn" unless="naming.present" 
  +      description="Outputs a warning if javax.naming.* classes are missing during compilation">
  +    <antcall target="op-warning">
  +      <param name="thing" value="JDNI"/>
  +      <param name="recovery" 
  +        value="Get the jndi.jar from Sun and place the jar in the lib dir"/>
  +      <param name="message"
  +             value="JNDI is required for the ldap generator and the parentcm generator."/>
  +    </antcall>
  +  </target>  
     <target name="svg-warn" unless="svg.present" 
         description="Outputs a warning if org.apache.batik.* classes are missing during compilation">
       <antcall target="op-warning">
  @@ -382,7 +384,8 @@
     <!-- =================================================================== -->
     <!-- Print out warnings for optional components                          -->
     <!-- =================================================================== -->
  -  <target name="optional-warnings" depends="svg-warn, fop-warn, tidy-warn, maybeupload-warn"

  +  <target name="optional-warnings" 
  +          depends="xt-warn, php-warn, naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn"

         description="Outputs warnings if some optional jars are missing from the environment">
     </target>  
   
  @@ -403,11 +406,14 @@
       <copy todir="${build.src}" filtering="on">
         <fileset dir="${src.dir}">
           <exclude name="**/HTMLGenerator.java"  unless="tidy.present"/>
  +        <exclude name="**/tidy.sitemap"        unless="tidy.present"/>
   
           <exclude name="**/FOP*"                unless="fop.present"/>
           <exclude name="**/renderer/*"          unless="fop.present"/>
  +        <exclude name="**/fop.sitemap"         unless="fop.present"/>
   
           <exclude name="**/XT*.java"            unless="xt.present"/>
  +        <exclude name="**/xt.sitemap"          unless="xt.present"/>
   
           <exclude name="**/SVG*.java"           unless="svg.present"/>
   
  @@ -416,13 +422,17 @@
           <exclude name="**/Jstyle*"             unless="jstyle.present"/>
   
           <exclude name="**/Php*"                unless="php.present"/>
  +        <exclude name="**/php.sitemap"         unless="php.present"/>
   
           <exclude name="**/Ora*.java"           unless="ora.driver.present"/>
   
  +        <exclude name="**/Ifx*.java"           unless="ifx.driver.present"/>
  +
           <exclude name="**/Sendmail*.java"      unless="mail.present"/>
   
           <exclude name="**/LDAPTransformer*.java"   unless="naming.present"/>
           <exclude name="**/samples/parentcm/*.java" unless="naming.present"/>
  +        <exclude name="**/naming.sitemap"          unless="naming.present"/>
   
           <exclude name="**/JSPEngineImplWLS.java"   unless="weblogic.present"/>
   
  @@ -610,7 +620,7 @@
     <target name="docs" 
             depends="package, prepare-docs, docs_check, docs_done"
             unless="docs.notrequired"
  -          description="Generates the documentation">
  +          description="* Generates the documentation">
   
       <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}">
         <arg value="-c."/>
  @@ -679,88 +689,13 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Prepares the webapp sitemap if php is available                     -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-php" depends="copy-webapp" if="php.present">
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a generators
php org.apache.cocoon.generation.PhpGenerator"/>
  -        <classpath>
  -        <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the webapp sitemap if xt is available                     -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-xt" depends="copy-webapp" if="xt.present">
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a transformers
xt org.apache.cocoon.transformation.XTTransformer"/>
  -        <classpath>
  -        <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the webapp sitemap if fop is available                     -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-fop" depends="copy-webapp" if="fop.present">
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -m application/pdf
        -a serializers fo2pdf org.apache.cocoon.serialization.FOPSerializer"/>
  -        <classpath>
  -          <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -m application/postscript
         -a serializers fo2ps  org.apache.cocoon.serialization.FOPSerializer"/>
  -        <classpath>
  -          <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -m 'application/vnd.hp-PCL'
-a serializers fo2pcl org.apache.cocoon.serialization.FOPSerializer"/>
  -        <classpath>
  -          <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>    
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the webapp sitemap if jtidy is available                     -->
  -  <!-- =================================================================== -->
  -  <target name="prepare-webapp-tidy" depends="copy-webapp" if="tidy.present">
  -    <java classname="st">
  -        <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -l content
-a generators html org.apache.cocoon.generation.HTMLGenerator"/>
  -        <classpath>
  -          <pathelement location="${bin.dir}"/>
  -        </classpath>
  -    </java>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the webapp sitemap if jndi is available                   -->
  -  <!-- =================================================================== -->
  -  <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>
  -    </java>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Prepares the webapp directories                                     -->
     <!-- =================================================================== -->
  -  <target name="prepare-webapp" depends="copy-webapp, prepare-webapp-php, prepare-webapp-xt,
prepare-webapp-fop, prepare-webapp-tidy, prepare-webapp-naming">
  -      <!-- Simply do nothing, just invoke all dependencies -->
  +  <target name="prepare-webapp" depends="copy-webapp">
  +      <!-- Invoke the SitemapTool to add optional entries -->
  +      <SitemapTool directory="${build.src}"
  +                   extension="sitemap"
  +                   sitemap="${build.war}/sitemap.xmap"/>
     </target>
   
    <!-- =================================================================== -->
  @@ -814,7 +749,7 @@
     <!-- =================================================================== -->
     <!-- Creates the war file                                                -->
     <!-- =================================================================== -->
  -  <target name="webapp" depends="prepare-webapp, prepare-webapp-libs, prepare-xsp" description="Generates
the war package">
  +  <target name="webapp" depends="prepare-webapp, prepare-webapp-libs, prepare-xsp" description="*
Generates the war package">
       <jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"/>
     </target>
   
  @@ -839,7 +774,7 @@
     <!-- =================================================================== -->
     <!-- Installs Cocoon file                                                -->
     <!-- =================================================================== -->
  -  <target name="install" depends="package, webapp, remove-webapp" if="install.war" description="Installs
the war package">
  +  <target name="install" depends="package, webapp, remove-webapp" if="install.war" description="*
Installs the war package">
       <copy file="${build.dir}/${name}.war" tofile="${install.war}/${name}.war"/>
     </target>
   
  @@ -903,7 +838,7 @@
     <!-- =================================================================== -->
     <target name="printer-docs" depends="package, prepare-printer-docs, printer-docs_check,
printer-docs_done"
         unless="printer-docs.notrequired"
  -      description="Generates printer-friendly documentation">
  +      description="* Generates printer-friendly documentation">
       <mkdir dir="${build.docs.printer}"/>
       
       <java classname="org.apache.cocoon.Main" fork="true" dir="${build.dir}/printer_documentation">
  @@ -964,7 +899,7 @@
     <!-- =================================================================== -->
     <target name="javadocs" depends="prepare-src, javadocs_check, javadocs_done"
         unless="javadocs.notrequired"
  -      description="Generates the API documentation">
  +      description="* Generates the API documentation">
       <mkdir dir="${build.javadocs}"/>
       <javadoc packagenames="${packages}"
                sourcepath="${build.src}"
  @@ -1067,7 +1002,7 @@
     <!-- Packages the source distribution as .zip                            -->
     <!-- =================================================================== -->
     <target name="dist-src-zip" depends="dist-src" 
  -          description="* Generates the source distribution as a .zip file">
  +          description="Generates the source distribution as a .zip file">
       <zip zipfile="${dist.target}/${dist.name}-src.zip"
            basedir="${dist.root}/source"/>
     </target>
  @@ -1076,7 +1011,7 @@
     <!-- Packages the source distribution with .tar.gzip                     -->
     <!-- =================================================================== -->
     <target name="dist-src-tgz" depends="dist-src" 
  -          description="* Generates the source distribution as a .tar.gz file">
  +          description="Generates the source distribution as a .tar.gz file">
       <tar tarfile="${dist.target}/${dist.name}-src.tar"
            basedir="${dist.root}/source"
            longfile="gnu"/>
  @@ -1142,7 +1077,7 @@
     <!-- Packages the binary distribution as .zip                            -->
     <!-- =================================================================== -->
     <target name="dist-bin-zip" depends="dist-bin" 
  -          description="* Generates the binary distribution as a .zip file">
  +          description="Generates the binary distribution as a .zip file">
       <zip zipfile="${dist.target}/${dist.name}-bin.zip"
            basedir="${dist.root}/bin"/>
     </target>
  @@ -1151,7 +1086,7 @@
     <!-- Packages the binary distribution with .tar.gzip                     -->
     <!-- =================================================================== -->
     <target name="dist-bin-tgz" depends="dist-bin" 
  -          description="* Generates the binary distribution as a .tar.gz file">
  +          description="Generates the binary distribution as a .tar.gz file">
       <tar tarfile="${dist.target}/${dist.name}-bin.tar"
            basedir="${dist.root}/bin"
            longfile="gnu"/>
  
  
  
  1.2.2.48  +6 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.2.2.47
  retrieving revision 1.2.2.48
  diff -u -r1.2.2.47 -r1.2.2.48
  --- changes.xml	2001/11/16 14:11:03	1.2.2.47
  +++ changes.xml	2001/11/23 10:11:38	1.2.2.48
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.2.2.47 2001/11/16 14:11:03 giacomo Exp $
  +  $Id: changes.xml,v 1.2.2.48 2001/11/23 10:11:38 cziegeler Exp $
   -->
   
   <changes title="History of Changes">
  @@ -27,6 +27,11 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="CZ" type="update">
  +    Restructured build system. A new ant task (SitemapTool) adds entries
  +    of optional components to the sitemap. Warnings for not available
  +    optional components are printed out.
  +  </action>
     <action dev="GP" type="update">
       Made the concept of views work as proposed in the original proposal. There
       is now the possibility to attach a label attribute with multiple values separated
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +0 -0      xml-cocoon2/bin/anttasks/SitemapTool.class
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +1 -1      xml-cocoon2/bin/src/SitemapTool.java
  
  Index: SitemapTool.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/bin/src/SitemapTool.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- SitemapTool.java	2001/11/23 09:26:56	1.3
  +++ SitemapTool.java	2001/11/23 10:11:39	1.3.2.1
  @@ -15,7 +15,7 @@
    * Add components to the sitemap
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/11/23 09:26:56 $
  + * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/11/23 10:11:39 $
    */
   
   public final class SitemapTool extends Task {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/generation/naming.sitemap
  
  Index: naming.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/naming.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/generation/php.sitemap
  
  Index: php.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/php.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/generation/tidy.sitemap
  
  Index: tidy.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/tidy.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/serialization/fop.sitemap
  
  Index: fop.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/fop.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/transformation/naming.sitemap
  
  Index: naming.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/naming.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      xml-cocoon2/src/org/apache/cocoon/transformation/xt.sitemap
  
  Index: xt.sitemap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/xt.sitemap,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  

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