Add conf entries to jar.

Exclude userconfig.xml.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197066 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 32b86ece8a6c0d1c77c35fcbd1d12f06ff5f11e8..4d222766e7dd6f9a3596f6e46b9dbf7610ce7991 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -103,6 +103,7 @@ list of possible build targets.
     <exclude name="dist/**"/>
     <exclude name="build/**"/>
     <exclude name="lib/**"/>
+    <exclude name="**/userconfig.xml>
   </fileset>
 
   <fileset dir="${basedir}" id="dist.bin.lib">
@@ -118,6 +119,7 @@ list of possible build targets.
     <exclude name="build/**"/>
     <include name="src/**"/>
     <include name="conf/**"/>
+    <exclude name="**/userconfig.xml"/>
     <include name="docs/**"/>
     <include name="lib/**"/>
     <include name="CHANGES"/>
@@ -561,7 +563,7 @@ list of possible build targets.
       "[${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}]"/>
 
     <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"
-                        includes="org/**">
+                        includes="org/**,conf/**">
       <manifest>
         <attribute name="Main-Class" value="${main.class}"/>
         <attribute name="Class-Path" value="${manifest-classpath}"/>