Configure maven build.

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

fixsvnprops.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-for i in $(find . -name \*.java)
-do
-  svn pg svn:keywords $i | grep Id > /dev/null || svn ps svn:keywords "Id" $i
-done
-
-for i in $(find . -name \*.xml)
-do
-  svn pg svn:keywords $i | grep "Revision Id" > /dev/null || svn ps svn:keywords "Revision Id" $i
-done
-find . -name \*.java -exec svn ps svn:eol-style native '{}' \;
-find . -name \*.xml -exec svn ps svn:eol-style native '{}' \;
-

build.xml → fop/build.xml

@@ -58,10 +58,10 @@ list of possible build targets.
   <property file="${basedir}/build-local.properties"/>
   <property file="${basedir}/build.properties"/>
   <fileset dir="${basedir}" id="dist.bin">
-    <include name="KEYS"/>
-    <include name="LICENSE"/>
-    <include name="NOTICE"/>
-    <include name="README"/>
+    <include name="../KEYS"/>
+    <include name="../LICENSE"/>
+    <include name="../NOTICE"/>
+    <include name="../README"/>
     <include name="conf/**"/>
     <include name="examples/**"/>
     <include name="fop"/>
@@ -96,10 +96,10 @@ list of possible build targets.
     <include name="lib/build/xmlunit*"/>
   </patternset>
   <fileset dir="${basedir}" id="dist.src">
-    <include name="KEYS"/>
-    <include name="LICENSE"/>
-    <include name="NOTICE"/>
-    <include name="README"/>
+    <include name="../KEYS"/>
+    <include name="../LICENSE"/>
+    <include name="../NOTICE"/>
+    <include name="../README"/>
     <include name="build.*"/>
     <include name="checkstyle*"/>
     <exclude name="checkstyle-noframes.xsl"/>
@@ -165,9 +165,10 @@ list of possible build targets.
   <property name="junit.formatter.brief" value="on"/>
   <property name="javadoc.packages" value="org.apache.fop.*"/>
   <property name="src.dir" value="${basedir}/src"/>
-  <property name="src.codegen.dir" value="${src.dir}/codegen"/>
+  <property name="src.codegen.dir" value="${src.dir}/main/codegen"/>
   <property name="src.codegen.fonts.dir" value="${src.codegen.dir}/fonts"/>
-  <property name="src.java.dir" value="${src.dir}/java"/>
+  <property name="src.java.dir" value="${src.dir}/main/java"/>
+  <property name="src.resources.dir" value="${src.dir}/main/resources"/>
   <property name="src.sandbox.dir" value="${src.dir}/sandbox"/>
   <property name="src.viewer.resources.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/resources"/>
   <property name="src.viewer.images.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/images"/>
@@ -183,6 +184,7 @@ list of possible build targets.
   <property name="unidata.dir" value="${basedir}/UNIDATA"/>
   <property name="hyph.stacksize" value="512k"/>
   <property name="test.dir" value="${basedir}/test"/>
+  <property name="test.java.dir" value="${src.dir}/test/java"/>
   <property name="build.dir" value="${basedir}/build"/>
   <property name="build.gensrc.dir" value="${build.dir}/gensrc"/>
   <property name="build.classes.dir" value="${build.dir}/classes"/>
@@ -370,7 +372,7 @@ list of possible build targets.
   </target>
   <target name="compile-copy-resources" depends="resourcegen">
     <copy todir="${build.classes.dir}">
-      <fileset dir="${src.java.dir}">
+      <fileset dir="${src.resources.dir}">
         <include name="META-INF/**"/>
         <include name="**/*.icm"/>
         <include name="**/*.xml"/>
@@ -410,7 +412,7 @@ list of possible build targets.
       <src path="${src.codegen.dir}/unicode/java"/>
     </javac>
     <java classname="org.apache.fop.hyphenation.UnicodeClasses" resultproperty="classes.result" classpath="${build.codegen-classes.dir}">
-      <arg value="${src.dir}/java/org/apache/fop/hyphenation/classes.xml"/>
+      <arg value="${src.java.dir}/org/apache/fop/hyphenation/classes.xml"/>
     </java>
     <condition property="classes.result.message" value="Generation of classes successful">
       <not>
@@ -493,7 +495,7 @@ list of possible build targets.
           <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
         </section>
       </manifest>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
   </target>
   <target name="uptodate-jar-sandbox" depends="compile">
@@ -509,7 +511,7 @@ list of possible build targets.
       <manifest>
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
       </manifest>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
   </target>
   <target name="uptodate-jar-sources" depends="codegen">
@@ -533,8 +535,8 @@ list of possible build targets.
         <patternset refid="java-only"/>
       </fileset>
       <fileset dir="${basedir}">
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
+        <include name="../LICENSE"/>
+        <include name="../NOTICE"/>
       </fileset>
     </jar>
   </target>
@@ -639,7 +641,7 @@ list of possible build targets.
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
       </manifest>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
 <!-- all-in-one transcoder jar -->
     <property name="transcoder-deps" value="${build.dir}/transcoder-dependencies"/>
@@ -674,7 +676,7 @@ list of possible build targets.
         <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
       </manifest>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
   </target>
   <target name="all" depends="package, servlet, transcoder-pkg, junit"/>
@@ -700,7 +702,7 @@ list of possible build targets.
     <mkdir dir="${build.dir}/test-gensrc"/>
     <mkdir dir="${junit.reports.dir}"/>
     <javac destdir="${build.unit.tests.dir}" includeAntRuntime="true">
-      <src path="${test.dir}/java"/>
+      <src path="${test.java.dir}"/>
       <patternset refid="test-sources"/>
       <classpath>
         <path refid="libs-tools-build-classpath"/>
@@ -710,7 +712,7 @@ list of possible build targets.
       </classpath>
     </javac>
     <copy todir="${build.unit.tests.dir}">
-      <fileset dir="${test.dir}/java">
+      <fileset dir="${test.java.dir}">
         <include name="**/*.xsl"/>
         <include name="**/*.txt"/>
         <include name="**/*.afm"/>
@@ -722,12 +724,12 @@ list of possible build targets.
   <target name="junit-compile-copy-resources" if="junit.present">
     <eventResourceGenerator 
       destdir="${build.dir}/test-gensrc">
-      <fileset dir="${test.dir}/java">
+      <fileset dir="${test.java.dir}">
         <include name="**/*.java"/>
       </fileset>
     </eventResourceGenerator>
     <copy todir="${build.unit.tests.dir}">
-      <fileset dir="${test.dir}/java">
+      <fileset dir="${test.java.dir}">
         <include name="META-INF/**"/>
         <include name="**/*.xml"/>
         <include name="**/*.fo"/>
@@ -962,7 +964,7 @@ NOTE:
       windowtitle="${Name} ${version} API"
       doctitle="Apache Formatting Objects Processor (FOP)"
       bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved."
-      overview="${src.dir}/java/org/apache/fop/overview.html"
+      overview="${src.java.dir}/org/apache/fop/overview.html"
       maxmemory="256M">
       <header><![CDATA[${name} ${version}]]></header>
       <footer><![CDATA[${name} ${version}]]></footer>
@@ -1046,7 +1048,7 @@ NOTE:
         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
       </manifest>
       <fileset dir="${build.javadocs.dir}"/>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
   </target>
 <!-- =================================================================== -->
@@ -1361,7 +1363,7 @@ NOTE:
           <include name="pom.xml*"/>
         </patternset>
       </fileset>
-      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
     </jar>
     <move file="${build.dir}/${name}-${version}-bundle.jar" todir="${basedir}"/>
   </target>
@@ -1464,7 +1466,7 @@ NOTE:
       </classpath>
     </javac>
     <java classname="org.apache.fop.text.linebreak.GenerateLineBreakUtils" classpath="${build.codegen-classes.dir}">
-      <arg line="-o ${src.dir}/java/org/apache/fop/text/linebreak/LineBreakUtils.java"/>
+      <arg line="-o ${src.java.dir}/org/apache/fop/text/linebreak/LineBreakUtils.java"/>
     </java>
   </target>
   <target name="codegen-unicode-bidi" depends="compile-java">
@@ -1479,10 +1481,10 @@ NOTE:
     </javac>
     <java classname="org.apache.fop.complexscripts.bidi.GenerateBidiClass" classpath="${build.codegen-classes.dir}">
       <arg line="-b http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBidiClass.txt"/>
-      <arg line="-o ${src.dir}/java/org/apache/fop/complexscripts/bidi/BidiClass.java"/>
+      <arg line="-o ${src.java.dir}/org/apache/fop/complexscripts/bidi/BidiClass.java"/>
     </java>
     <delete>
-      <fileset dir="${test.dir}/java/org/apache/fop/complexscripts/bidi">
+      <fileset dir="${test.java.dir}/org/apache/fop/complexscripts/bidi">
         <include name="**/BidiTestData*.ser"/>
       </fileset>
     </delete>
@@ -1491,13 +1493,13 @@ NOTE:
       <arg line="-i"/>
       <arg line="-b http://www.unicode.org/Public/6.0.0/ucd/BidiTest.txt"/>
       <arg line="-d http://www.unicode.org/Public/6.0.0/ucd/UnicodeData.txt"/>
-      <arg line="-o ${test.dir}/java/org/apache/fop/complexscripts/bidi/BidiTestData.java"/>
+      <arg line="-o ${test.java.dir}/org/apache/fop/complexscripts/bidi/BidiTestData.java"/>
     </java>
   </target>
   <target name="resgen-complexscripts" depends="compile-java">
     <mkdir dir="${build.unit.tests.dir}"/>
     <javac destdir="${build.unit.tests.dir}" includeAntRuntime="true" memoryMaximumSize="1024m">
-      <src path="${test.dir}/java/org/apache/fop/complexscripts/"/>
+      <src path="${test.java.dir}/org/apache/fop/complexscripts/"/>
       <classpath>
         <path refid="libs-build-classpath"/>
         <pathelement location="${build.classes.dir}"/>