chrisg      02/05/02 15:27:25

  Modified:    .        Tag: fop-0_20_2-maintain build.bat build.sh
                        build.xml buildtools.xml
  Removed:     lib      Tag: fop-0_20_2-maintain xalan-1.2.2.jar
                        xalanj1compat.jar
               src/org/apache/fop/tools/xslt Tag: fop-0_20_2-maintain
                        Xalan1Transform.java
  Log:
  removed xalan1 support
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.5  +1 -1      xml-fop/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.bat,v
  retrieving revision 1.14.2.4
  retrieving revision 1.14.2.5
  diff -u -r1.14.2.4 -r1.14.2.5
  --- build.bat 1 Apr 2002 23:48:28 -0000       1.14.2.4
  +++ build.bat 2 May 2002 22:27:24 -0000       1.14.2.5
  @@ -6,7 +6,7 @@
   if "%JAVA_HOME%" == "" goto error
   
   set LIBDIR=lib
  -set 
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar

  +set 
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant-1.4.1.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\bsf.jar

   set 
LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\avalon-framework-cvs-20020315.jar

   
   set ANT_HOME=%LIBDIR%
  
  
  
  1.15.2.6  +1 -1      xml-fop/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.sh,v
  retrieving revision 1.15.2.5
  retrieving revision 1.15.2.6
  diff -u -r1.15.2.5 -r1.15.2.6
  --- build.sh  25 Apr 2002 22:12:13 -0000      1.15.2.5
  +++ build.sh  2 May 2002 22:27:24 -0000       1.15.2.6
  @@ -27,7 +27,7 @@
   
   
   LIBDIR=lib
  
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/xalanj1compat.jar:$LIBDIR/bsf.jar
  
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant-1.4.1.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.2.3.jar:$LIBDIR/xalan-2.0.0.jar:$LIBDIR/bsf.jar
   
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
   
   ANT_HOME=$LIBDIR
  
  
  
  1.44.2.13 +4 -18     xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.44.2.12
  retrieving revision 1.44.2.13
  diff -u -r1.44.2.12 -r1.44.2.13
  --- build.xml 29 Apr 2002 20:15:21 -0000      1.44.2.12
  +++ build.xml 2 May 2002 22:27:24 -0000       1.44.2.13
  @@ -176,7 +176,7 @@
     <!-- =================================================================== -->
     <!-- Initialization target                                               -->
     <!-- =================================================================== -->
  -  <target name="init" depends="init-avail, init-filters-xalan1, 
init-filters-xalan2">
  +  <target name="init" depends="init-avail, init-filters-xalan2">
       <tstamp/>
       <property name="Name" value="Fop"/>
       <property name="name" value="fop"/>
  @@ -268,7 +268,6 @@
       <property name="ZapfDingbats.xml" value="${build.codegen}/ZapfDingbats.xml"/>
       <property name="Symbol.xml" value="${build.codegen}/Symbol.xml"/>
   
  -    <property name="xalan1" value="Xalan1Transform.java"/>
       <property name="trax" value="TraxTransform.java"/>
       <property name="xsltransform" value="XSLTransform.java"/>
   
  @@ -297,14 +296,9 @@
       <available property="jai.present" classname="javax.media.jai.JAI"/>
   
       <available property="trax.present" classname="javax.xml.transform.Transformer"/>
  -    <available property="xalan1.present" 
classname="org.apache.xalan.xslt.XSLTProcessor"/>
  -    <filter token="xalan1-replacestring" value="./build/src/org/apache/fop"/>
  -    <filter token="xalan2-replacestring" value="../org/apache/fop"/>
   
  -  </target>
  +    <filter token="xalan2-replacestring" value="../org/apache/fop"/>
   
  -  <target name="init-filters-xalan1" depends="init-avail" if="xalan1.present" 
unless="trax.present">
  -    <copy file="src/codegen/xalan1.filter" toFile="./build/src/codegen/filter" 
filtering="on"/>
     </target>
   
     <target name="init-filters-xalan2" depends="init-avail" if="trax.present">
  @@ -389,14 +383,6 @@
       </copy>
     </target>
   
  -
  -  <target name="prepare-xalan1" if="xalan1.present">
  -      <echo message="Xalan1 is present. Installing Xalan1 support"/>
  -    <copy todir="${build.src}">
  -      <fileset dir="${src.dir}" includes="**/${xsltransform},**/${xalan1}"/>
  -    </copy>
  -  </target>
  - 
     <target name="prepare-trax" if="trax.present">
         <echo message="JAXP1.1 transforms is present. Installing TRaX support"/>
       <copy todir="${build.src}">
  @@ -408,11 +394,11 @@
     <!-- =================================================================== -->
     <!-- Prepares the source code                                            -->
     <!-- =================================================================== -->
  -  <target name="prepare-src" depends="prepare, prepare-jimi, prepare-jai, 
prepare-xalan1, prepare-trax">
  +  <target name="prepare-src" depends="prepare, prepare-jimi, prepare-jai, 
prepare-trax">
       <!-- copy src files -->
       <copy todir="${build.src}">
         <fileset dir="${src.dir}" 
  -         excludes="**/package.html, 
**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/${xalan1},**/apps/TraxInputHandler.java"/>
  +         excludes="**/package.html, 
**/${jimi},**/${jai},**/${xsltransform},**/${trax},**/apps/TraxInputHandler.java"/>
       </copy>
     </target>
   
  
  
  
  1.3.2.1   +2 -13     xml-fop/buildtools.xml
  
  Index: buildtools.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/buildtools.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- buildtools.xml    10 May 2001 01:44:04 -0000      1.3
  +++ buildtools.xml    2 May 2002 22:27:24 -0000       1.3.2.1
  @@ -25,12 +25,9 @@
      <property name="hyph"  value="org/apache/fop/layout/hyphenation"/>
      <property name="buildtools.jar" value="./lib/buildtools.jar"/>
   
  -   <property name="xalan1" value="Xalan1Transform.java"/>
      <property name="trax" value="TraxTransform.java"/>
   
      <available property="trax.present" classname="javax.xml.transform.Transformer"/>
  -   <available property="xalan1.present" 
classname="org.apache.xalan.xslt.XSLTProcessor"/>
  -   </target>
   
      <target name="compile" depends="init,prepare.src">
        <mkdir dir="${build.dest}"/>
  @@ -46,19 +43,11 @@
          includes="${tools}/**,${hyph}/**"/>
      </target>
   
  -   <target name="prepare.src" depends="prepare.xalan1,prepare.trax">
  +   <target name="prepare.src" depends="prepare.trax">
        <copy todir="${build.src}">
          <fileset dir="${src.dir}"
                includes="${tools}/**,${hyph}/**"
  -             
excludes="${tools}/anttasks/Fop.java,${tools}/TestConverter.java,${hyph}/Hyphenator.java,**/${xalan1},**/${trax}"/>
  -     </copy>
  -   </target>
  -
  -   <target name="prepare.xalan1" if="xalan1.present">
  -     <echo message="Xalan1 is present. Installing Xalan1 support"/>
  -     <copy todir="${build.src}">
  -     <fileset dir="${src.dir}"
  -           includes="**/${xalan1}"/>
  +             
excludes="${tools}/anttasks/Fop.java,${tools}/TestConverter.java,${hyph}/Hyphenator.java,**/${trax}"/>
        </copy>
      </target>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to