morrijr     2002/07/13 05:15:30

  Modified:    .        build.xml
               lib      jars.xml
               src/webapp/samples samples.xml
               src/webapp/samples/hello-world sitemap.xmap
  Added:       legal    LICENSE.jfor
               lib/optional jfor-0.7.0.jar
  Log:
  Added jfor functionality as optional.  BUG 10770
  
  Revision  Changes    Path
  1.245     +2 -2      xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.244
  retrieving revision 1.245
  diff -u -r1.244 -r1.245
  --- build.xml 12 Jul 2002 10:26:53 -0000      1.244
  +++ build.xml 13 Jul 2002 12:15:30 -0000      1.245
  @@ -1486,7 +1486,7 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation for pre JDK 1.4                       -->
     <!-- =================================================================== -->
  -  <target name="javadocs13" unless="jdbc3.present">
  +  <target name="javadocs13" depends="init" unless="jdbc3.present">
       <javadoc packagenames="${packages}.*"
                sourcepath="${build.src}"
                destdir="${build.javadocs}"
  @@ -1505,7 +1505,7 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation for JDK 1.4                           -->
     <!-- =================================================================== -->
  -  <target name="javadocs14" if="jdbc3.present">
  +  <target name="javadocs14" depends="init" if="jdbc3.present">
       <javadoc additionalparam="-subpackages ${packages}"
                sourcepath="${build.src}"
                destdir="${build.javadocs}"
  
  
  
  1.1                  xml-cocoon2/legal/LICENSE.jfor
  
  Index: LICENSE.jfor
  ===================================================================
   * ====================================================================
   * jfor Apache-Style Software License.
   * Copyright (c) 2002 by the jfor project. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   * notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   * notice, this list of conditions and the following disclaimer in
   * the documentation and/or other materials provided with the
   * distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   * if any, must include the following acknowledgment:
   * "This product includes software developed
   * by the jfor project (http://www.jfor.org)."
   * Alternately, this acknowledgment may appear in the software itself,
   * if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The name "jfor" must not be used to endorse
   * or promote products derived from this software without prior written
   * permission.  For written permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "jfor",
   * nor may "jfor" appear in their name, without prior written
   * permission of [EMAIL PROTECTED]
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE JFOR PROJECT OR ITS CONTRIBUTORS BE
   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
   * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
  
  
  
  1.19      +10 -0     xml-cocoon2/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jars.xml  12 Jul 2002 10:26:53 -0000      1.18
  +++ jars.xml  13 Jul 2002 12:15:30 -0000      1.19
  @@ -148,6 +148,16 @@
        <homepage>http://xml.apache.org/fop/</homepage>
    </file>
    <file>
  +     <title>XSL-FO to RTF converter</title>
  +     <description>jfor is a Java application that reads XSL-FO documents
  +        and converts them to RTF format, allowing them to be loaded in
  +        common wordprocessors.
  +    </description>
  +     <used-by>RTF serializer</used-by>
  +     <lib>optional/jfor-0.7.0.jar</lib>
  +     <homepage>http://www.jfor.org</homepage>
  + </file>
  + <file>
        <title>Simple SQL database</title>
        <description>hsqldb is a relational database engine written in Java, with a 
JDBC
          driver, supporting a subset of ANSI-92 SQL. It offers a small, fast
  
  
  
  1.1                  xml-cocoon2/lib/optional/jfor-0.7.0.jar
  
        <<Binary file>>
  
  
  1.16      +4 -1      xml-cocoon2/src/webapp/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/samples.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- samples.xml       4 Jul 2002 20:57:47 -0000       1.15
  +++ samples.xml       13 Jul 2002 12:15:30 -0000      1.16
  @@ -39,6 +39,9 @@
      <sample name="PS" href="hello-world/hello.ps">
       You prefer postscript? No problem, here it is!
      </sample>   
  +   <sample name="RTF" href="hello-world/hello.rtf">
  +    How about RTF? Load this one in your favorite wordprocessor!
  +   </sample>   
      <sample name="XLS" href="hello-world/hello.xls">
       Still stuck with legacy file formats? Don't worry, here is an example.
      </sample>
  
  
  
  1.4       +6 -0      xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/hello-world/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap      1 Jul 2002 18:57:46 -0000       1.3
  +++ sitemap.xmap      13 Jul 2002 12:15:30 -0000      1.4
  @@ -142,6 +142,12 @@
       <map:serialize type="fo2pdf"/>
      </map:match>
      
  +   <map:match pattern="hello.rtf">
  +    <map:generate src="content/xml/hello-page.xml"/>
  +    <map:transform src="style/xsl/simple-page2fo.xsl"/>
  +    <map:serialize type="fo2rtf"/>
  +   </map:match>
  +   
      <map:match pattern="hello.ps">
       <map:generate src="content/xml/hello-page.xml"/>
       <map:transform src="style/xsl/simple-page2fo.xsl"/>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to