removed unneeded filter

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195029 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 7ce3778a9ca54673820c0fe6b045f5697ddad828..5ad5718a74be17cfe619d91ee9f15c1136a1994e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -171,7 +171,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
   <!-- =================================================================== -->
-  <target name="init" depends="init-avail, init-filters-xalan2">
+  <target name="init" depends="init-avail">
     <tstamp/>
     <property name="Name" value="Fop"/>
     <property name="name" value="fop"/>
@@ -215,7 +215,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
        <property name="viewer.resources.dest.dir" value="${build.dest}/org/apache/fop/viewer/resources"/>
        <property name="viewer.images.dest.dir" value="${build.dest}/org/apache/fop/viewer/Images"/>
 
-       <!-- <property name="dist.dir" value="./dist"/> -->
     <property name="dist.bin.dir" value="./dist-bin"/>
     <property name="dist.src.dir" value="./dist-src"/>
     <property name="dist.bin.result.dir" value="${dist.bin.dir}/${Name}-${version}"/>
@@ -267,8 +266,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="main.class" value="org.apache.fop.apps.Fop"/>
     <property name="runtime.classpath" value="lib/xerces-1.4.3.jar lib/xalan-2.2D11.jar lib/batik.jar lib/jimi-1.0.jar lib/avalon-framework-cvs-20020315.jar"/>
    
-    <filter filtersfile="${build.src}/codegen/filter"/>
-
   </target>
 
   <target name="init-avail">
@@ -276,15 +273,9 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <available property="jai.present" classname="javax.media.jai.JAI"/>
 
     <available property="trax.present" classname="javax.xml.transform.Transformer"/>
-    <filter token="xalan2-replacestring" value="../../"/>
-
-  </target>
 
-  <target name="init-filters-xalan2" depends="init-avail" if="trax.present">
-    <copy file="src/codegen/xalan2.filter" toFile="./build/src/codegen/filter" filtering="on"/>
   </target>
 
-
   <!-- =================================================================== -->
   <!-- Help on usage                                                       -->
   <!-- =================================================================== -->
@@ -501,7 +492,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <fileset dir="${build.dest}" includes="org/apache/fop/svg/**"/>
     <fileset dir="${build.dest}" includes="org/apache/fop/render/pdf/**"
              excludes="org/apache/fop/render/pdf/PDFRenderer.class,org/apache/fop/render/pdf/PDFXMLHandler*"/>
-    <fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/apps/FOPException.class,org/apache/fop/apps/Version.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/configuration/**,org/apache/fop/util/StreamUtilities.class"/>
+    <fileset dir="${build.dest}" includes="org/apache/fop/layout/Font*.class,org/apache/fop/apps/Version.class,org/apache/fop/image/FopImag*.class,org/apache/fop/image/Jpeg*,org/apache/fop/image/Abstract*,org/apache/fop/configuration/**,org/apache/fop/util/StreamUtilities.class"/>
     <manifest>
         <attribute name="Implementation-Title" value="${pdf-transcoder.name}"/>
         <attribute name="Implementation-Version" value="${pdf-transcoder.version}"/>

diff --git a/src/codegen/enumgen.xsl b/src/codegen/enumgen.xsl
index 80c8db4fdaa6c70b6804c6b7487f66ead7bc7ba8..6a538e590461c4efa2c3938daa71af348549b689 100644 (file)
--- a/src/codegen/enumgen.xsl
+++ b/src/codegen/enumgen.xsl
@@ -32,7 +32,7 @@
    </xsl:variable>
 
    <xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
-<redirect:write select="concat('@org/apache/fop@/fo/properties/', $classname, '.java')">
+<redirect:write select="concat($classname, '.java')">
 package org.apache.fop.fo.properties;
 
 <!-- Handle enumeration values -->

diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index 83875597ef40c3a6a7c9227d63da23149c0f4250..62d2440c9bec3bd7927766a924974cc9b9d93641 100644 (file)
--- a/src/codegen/properties.xsl
+++ b/src/codegen/properties.xsl
@@ -204,7 +204,7 @@
   <xsl:text> implements </xsl:text><xsl:value-of select="$eclassname"/></xsl:if>
 </xsl:variable>
 
-<redirect:write select="concat('@org/apache/fop@/fo/properties/', $classname, '.java')">
+<redirect:write select="concat($classname, '.java')">
 package org.apache.fop.fo.properties;
 
 import java.util.Hashtable;

diff --git a/src/codegen/xalan2.filter b/src/codegen/xalan2.filter
deleted file mode 100644 (file)
index 0bab5bb..0000000
--- a/src/codegen/xalan2.filter
+++ /dev/null
@@ -1,2 +0,0 @@
-org/apache/fop = @xalan2-replacestring@
-