You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ga...@apache.org on 2016/03/06 07:14:44 UTC

svn commit: r1733788 - in /xmlgraphics/fop/branches/maven: ./ conf/ examples/ fop-servlet/ fop-transcoder/ fop/ fop/conf/ fop/examples/ fop/hyph/ fop/lib/ fop/src/ fop/src/codegen/ fop/src/main/codegen/ fop/src/main/codegen/fonts/ fop/src/main/codegen/...

Author: gadams
Date: Sun Mar  6 06:14:41 2016
New Revision: 1733788

URL: http://svn.apache.org/viewvc?rev=1733788&view=rev
Log:
Configure maven build.

Added:
    xmlgraphics/fop/branches/maven/fop/   (with props)
    xmlgraphics/fop/branches/maven/fop-servlet/
    xmlgraphics/fop/branches/maven/fop-transcoder/
    xmlgraphics/fop/branches/maven/fop/build.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/build.properties
    xmlgraphics/fop/branches/maven/fop/build.xml
      - copied, changed from r1733433, xmlgraphics/fop/branches/maven/build.xml
    xmlgraphics/fop/branches/maven/fop/conf/
      - copied from r1733433, xmlgraphics/fop/branches/maven/conf/
    xmlgraphics/fop/branches/maven/fop/examples/
      - copied from r1733433, xmlgraphics/fop/branches/maven/examples/
    xmlgraphics/fop/branches/maven/fop/fop.bat
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/fop.bat
    xmlgraphics/fop/branches/maven/fop/fop.cmd
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/fop.cmd
    xmlgraphics/fop/branches/maven/fop/fop.js
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/fop.js
    xmlgraphics/fop/branches/maven/fop/fop.sh
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/fop
    xmlgraphics/fop/branches/maven/fop/hyph/
      - copied from r1733433, xmlgraphics/fop/branches/maven/hyph/
    xmlgraphics/fop/branches/maven/fop/jacoco.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/jacoco.xml
    xmlgraphics/fop/branches/maven/fop/known-issues.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/known-issues.xml
    xmlgraphics/fop/branches/maven/fop/lib/
      - copied from r1733433, xmlgraphics/fop/branches/maven/lib/
    xmlgraphics/fop/branches/maven/fop/pom.xml   (with props)
    xmlgraphics/fop/branches/maven/fop/src/
      - copied from r1733433, xmlgraphics/fop/branches/maven/src/
    xmlgraphics/fop/branches/maven/fop/src/main/codegen/
      - copied from r1733433, xmlgraphics/fop/branches/maven/src/codegen/
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/apps/FOPException.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/apps/FOPException.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventProducer.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/events/EventProducer.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/model/
      - copied from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/events/model/
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/fo/expr/PropertyException.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/fo/expr/PropertyException.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventConventionException.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/codegen/java/org/apache/fop/tools/EventConventionException.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollector.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/util/DefaultErrorListener.java
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/util/DefaultErrorListener.java
    xmlgraphics/fop/branches/maven/fop/src/main/resources/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/META-INF/
      - copied from r1733433, xmlgraphics/fop/branches/maven/src/main/java/META-INF/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/ResourceEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/ResourceEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/accessibility/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/accessibility/AccessibilityEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/afp/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/afp/AFPEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/afp/AFPEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/area/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/area/AreaEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/area/AreaEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/cli/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/cli/image2fo.xsl
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/cli/image2fo.xsl
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/FOValidationEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/fo/FOValidationEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/FOValidationEventProducer_de.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/flow/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/flow/table/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fo/flow/table/TableEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fonts/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/fonts/FontEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/fonts/FontEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/hyphenation/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/hyphenation/classes.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/hyphenation/classes.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/layoutmgr/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/layoutmgr/inline/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/pdf/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/pdf/sRGB Color Space Profile.icm
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/RendererEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/RendererEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/afp/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/afp/AFPEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/afp/AFPEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/Print.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/Print.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/debug.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/debug.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/firstpg.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/firstpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/fop.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/fop.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/fopLogo.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/fopLogo.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/lastpg.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/lastpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/nextpg.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/nextpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/prevpg.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/prevpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/images/reload.gif
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/images/reload.gif
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_cs.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_cs.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_fi.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_fi.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_ja.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_ja.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_pl.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_pl.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_ru.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_ru.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/awt/viewer/resources/Viewer_tr.properties
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_tr.properties
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/bitmap/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pcl/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pcl/PCLEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/pcl/PCLEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pdf/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pdf/PDFEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/pdf/PDFEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pdf/extensions/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/pdf/extensions/PDFExtensionEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/pdf/extensions/PDFExtensionEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/ps/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/ps/PSEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/ps/PSEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/rtf/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/render/rtf/RTFEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/render/rtf/RTFEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/svg/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/svg/SVGEventProducer.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/svg/SVGEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/fontlist/
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/fontlist/fonts2fo.xsl
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/main/java/org/apache/fop/tools/fontlist/fonts2fo.xsl
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/merge-translation.xsl
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/codegen/java/org/apache/fop/tools/merge-translation.xsl
    xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/model2translation.xsl
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/src/codegen/java/org/apache/fop/tools/model2translation.xsl
    xmlgraphics/fop/branches/maven/fop/src/tools/
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/checkstyle/
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/checkstyle/checkstyle.header
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/checkstyle.header
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/checkstyle/checkstyle.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/checkstyle-5.5.xml
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/checkstyle/suppressions.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/checkstyle-suppressions.xml
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/findbugs/
    xmlgraphics/fop/branches/maven/fop/src/tools/resources/findbugs/exclusions.xml
      - copied unchanged from r1733433, xmlgraphics/fop/branches/maven/findbugs-exclude.xml
    xmlgraphics/fop/branches/maven/fop/test/
      - copied from r1733433, xmlgraphics/fop/branches/maven/test/
    xmlgraphics/fop/branches/maven/pom.xml   (with props)
Removed:
    xmlgraphics/fop/branches/maven/build.properties
    xmlgraphics/fop/branches/maven/build.xml
    xmlgraphics/fop/branches/maven/checkstyle-5.5.xml
    xmlgraphics/fop/branches/maven/checkstyle-suppressions.xml
    xmlgraphics/fop/branches/maven/checkstyle.header
    xmlgraphics/fop/branches/maven/conf/
    xmlgraphics/fop/branches/maven/examples/
    xmlgraphics/fop/branches/maven/findbugs-exclude.xml
    xmlgraphics/fop/branches/maven/fixsvnprops.sh
    xmlgraphics/fop/branches/maven/fop.bat
    xmlgraphics/fop/branches/maven/fop.cmd
    xmlgraphics/fop/branches/maven/fop.js
    xmlgraphics/fop/branches/maven/fop/src/codegen/
    xmlgraphics/fop/branches/maven/fop/src/main/codegen/java/
    xmlgraphics/fop/branches/maven/fop/src/main/java/META-INF/
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/ResourceEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/accessibility/AccessibilityEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/afp/AFPEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/area/AreaEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/cli/image2fo.xsl
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/fo/FOValidationEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/fo/FOValidationEventProducer_de.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/fo/flow/table/TableEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/fonts/FontEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/hyphenation/classes.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/pdf/sRGB Color Space Profile.icm
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/RendererEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/afp/AFPEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/Print.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/debug.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/firstpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/fop.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/fopLogo.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/lastpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/nextpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/prevpg.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/images/reload.gif
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_cs.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_fi.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_ja.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_pl.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_ru.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/awt/viewer/resources/Viewer_tr.properties
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/pcl/PCLEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/pdf/PDFEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/pdf/extensions/PDFExtensionEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/ps/PSEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/render/rtf/RTFEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/svg/SVGEventProducer.xml
    xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/fontlist/fonts2fo.xsl
    xmlgraphics/fop/branches/maven/hyph/
    xmlgraphics/fop/branches/maven/jacoco.xml
    xmlgraphics/fop/branches/maven/known-issues.xml
    xmlgraphics/fop/branches/maven/lib/
    xmlgraphics/fop/branches/maven/src/
    xmlgraphics/fop/branches/maven/test/
    xmlgraphics/fop/branches/maven/xmlgraphics-fop-pom-template.pom
Modified:
    xmlgraphics/fop/branches/maven/   (props changed)
    xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/code-point-mapping.xsl
    xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/font-file.xsl
    xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java
    xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
    xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
    xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml

Propchange: xmlgraphics/fop/branches/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  6 06:14:41 2016
@@ -15,4 +15,4 @@
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
 /xmlgraphics/fop/branches/fop-1_0:959975-964707
 /xmlgraphics/fop/branches/fop-1_1:1357766-1400689,1400697
-/xmlgraphics/fop/trunk:1721689-1733430
+/xmlgraphics/fop/trunk:1721689-1733494

Propchange: xmlgraphics/fop/branches/maven/fop/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar  6 06:14:41 2016
@@ -0,0 +1,3 @@
+build
+build-local.properties
+target

Copied: xmlgraphics/fop/branches/maven/fop/build.xml (from r1733433, xmlgraphics/fop/branches/maven/build.xml)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/build.xml?p2=xmlgraphics/fop/branches/maven/fop/build.xml&p1=xmlgraphics/fop/branches/maven/build.xml&r1=1733433&r2=1733788&rev=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/build.xml (original)
+++ xmlgraphics/fop/branches/maven/fop/build.xml Sun Mar  6 06:14:41 2016
@@ -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}"/>

Added: xmlgraphics/fop/branches/maven/fop/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/pom.xml?rev=1733788&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop/pom.xml Sun Mar  6 06:14:41 2016
@@ -0,0 +1,329 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.xmlgraphics</groupId>
+  <artifactId>fop</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>XML Graphics Format Object Processor</description>
+
+  <parent>
+    <groupId>org.apache.xmlgraphics</groupId>
+    <artifactId>fop-parent</artifactId>
+    <version>2.2.0-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <!-- compile deps -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.8.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>fontbox</artifactId>
+      <version>1.8.5</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-anim</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-awt-util</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-bridge</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-extension</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-gvt</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>batik-transcoder</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>xmlgraphics-commons</artifactId>
+      <version>${xmlgraphics.commons.version}</version>
+    </dependency>
+    <!-- provided deps -->
+    <dependency>
+      <groupId>com.thoughtworks.qdox</groupId>
+      <artifactId>qdox</artifactId>
+      <version>1.12</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- test deps -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.8.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>${xmlunit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- generate base14 font class sources -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <version>${xml.plugin.version}</version>
+        <executions>
+          <execution>
+            <id>generate-base14-fonts</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+            <configuration>
+              <transformationSets>
+                <transformationSet>
+                  <dir>${project.basedir}/src/main/codegen/fonts</dir>
+                  <fileMappers>
+                    <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                      <targetExtension>.java</targetExtension>
+                    </fileMapper>
+                  </fileMappers>
+                  <includes>
+                    <include>Courier*.xml</include>
+                    <include>Helvetica*.xml</include>
+                    <include>Symbol.xml</include>
+                    <include>Times*.xml</include>
+                    <include>ZapfDingbats.xml</include>
+                  </includes>
+                  <outputDir>${project.build.directory}/generated-sources/main/java/org/apache/fop/fonts/base14</outputDir>
+                  <stylesheet>${project.basedir}/src/main/codegen/fonts/font-file.xsl</stylesheet>
+                </transformationSet>
+              </transformationSets>
+            </configuration>
+          </execution>
+          <execution>
+            <id>codegen-fonts-encodings</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+            <configuration>
+              <transformationSets>
+                <transformationSet>
+                  <dir>${project.basedir}/src/main/codegen/fonts</dir>
+                  <fileMappers>
+                    <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+                      <targetName>CodePointMapping.java</targetName>
+                    </fileMapper>
+                  </fileMappers>
+                  <includes>
+                    <include>encodings.xml</include>
+                  </includes>
+                  <outputDir>${project.build.directory}/generated-sources/main/java/org/apache/fop/fonts</outputDir>
+                  <stylesheet>${project.basedir}/src/main/codegen/fonts/code-point-mapping.xsl</stylesheet>
+                </transformationSet>
+              </transformationSets>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>saxon</artifactId>
+            <version>8.7</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <!-- add generate base14 font class sources to source set -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>${build.helper.plugin.version}</version>
+        <executions>
+          <execution>
+            <id>add-generated-sources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- generate event collector models -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${antrun.plugin.version}</version>
+        <executions>
+          <execution>
+            <id>codegen-events</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask" classpathref="maven.compile.classpath"/>
+                <collectEvents destdir="${project.build.outputDirectory}">
+                  <fileset dir="${project.basedir}/src/main/java">
+                    <include name="**/accessibility/AccessibilityEventProducer.java"/>
+                    <include name="**/afp/AFPEventProducer.java"/>
+                    <include name="**/area/AreaEventProducer.java"/>
+                    <include name="**/fo/flow/table/TableEventProducer.java"/>
+                    <include name="**/fo/FOValidationEventProducer.java"/>
+                    <include name="**/fonts/FontEventProducer.java"/>
+                    <include name="**/layoutmgr/BlockLevelEventProducer.java"/>
+                    <include name="**/layoutmgr/inline/InlineLevelEventProducer.java"/>
+                    <include name="**/render/bitmap/BitmapRendererEventProducer.java"/>
+                    <include name="**/render/pcl/PCLEventProducer.java"/>
+                    <include name="**/render/pdf/extensions/PDFExtensionEventProducer.java"/>
+                    <include name="**/render/pdf/PDFEventProducer.java"/>
+                    <include name="**/render/ps/PSEventProducer.java"/>
+                    <include name="**/render/RendererEventProducer.java"/>
+                    <include name="**/render/rtf/RTFEventProducer.java"/>
+                    <include name="**/ResourceEventProducer.java"/>
+                    <include name="**/svg/SVGEventProducer.java"/>
+                  </fileset>
+                </collectEvents>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- junit testing -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.plugin.version}</version><!--$NO-MVN-MAN-VER$-->
+        <configuration>
+          <!--
+          <includes>
+            <include>**/*TestCase.java</include>
+            <include>**/*TestCases.java</include>
+          </includes>
+          -->
+          <excludes>
+            <exclude>**/*Test.java</exclude>
+            <exclude>**/*TestCase.java</exclude>
+            <exclude>**/*TestCases.java</exclude>
+            <exclude>**/*TestSuite.java</exclude>
+          </excludes>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+      <!-- jar packaging -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${jar.plugin.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>**/tools/Event*.class</exclude>
+            <exclude>**/tools/*.xsl</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <!-- code analysis - checkstyle -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.plugin.version}</version>
+        <configuration>
+          <configLocation>${project.baseUri}src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+          <headerLocation>${project.baseUri}src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+          <includeResources>false</includeResources>
+          <includeTestResources>false</includeTestResources>
+          <linkXRef>false</linkXRef>
+          <logViolationsToConsole>true</logViolationsToConsole>
+          <suppressionsLocation>${project.baseUri}src/tools/resources/checkstyle/suppressions.xml</suppressionsLocation>
+          <violationSeverity>warning</violationSeverity>
+        </configuration>
+      </plugin>
+      <!-- code analysis - findbugs -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>${findbugs.plugin.version}</version>
+        <configuration>
+          <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
+          <effort>Max</effort>
+          <threshold>Low</threshold>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${basedir}/..</directory>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+        <targetPath>META-INF</targetPath>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </testResource>
+    </testResources>
+  </build>
+
+</project>

Propchange: xmlgraphics/fop/branches/maven/fop/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/code-point-mapping.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/code-point-mapping.xsl?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/code-point-mapping.xsl (original)
+++ xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/code-point-mapping.xsl Sun Mar  6 06:14:41 2016
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="text"/>
   <xsl:variable name='glyphlists'

Modified: xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/font-file.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/font-file.xsl?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/font-file.xsl (original)
+++ xmlgraphics/fop/branches/maven/fop/src/main/codegen/fonts/font-file.xsl Sun Mar  6 06:14:41 2016
@@ -24,7 +24,7 @@
      To resolve this name and to find the code for this character it looks
      up the adobe name in the file encodings.xml and extracts the appropriate
      code. -->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:output method="text"/>

Modified: xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java (original)
+++ xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java Sun Mar  6 06:14:41 2016
@@ -169,7 +169,7 @@ public abstract class AbstractIntermedia
             testAssistant.saveDOM(doc, tgtFile);
         }
 
-        XMLAssert.assertXMLEqual(intermediate, doc);
+        XMLAssert.assertXMLEqual(testFile.toString(), intermediate, doc);
     }
 
     /**

Modified: xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java (original)
+++ xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java Sun Mar  6 06:14:41 2016
@@ -137,14 +137,14 @@ public class PDFVTTestCase {
 
         Fop fop = fopFactory.newFop(mimeFopIf, userAgent, out);
         Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        Source src = new StreamSource(new FileInputStream("test/java/org/apache/fop/pdf/PDFVT.fo"));
+        Source src = new StreamSource(new FileInputStream("src/test/java/org/apache/fop/pdf/PDFVT.fo"));
         Result res = new SAXResult(fop.getDefaultHandler());
         transformer.transform(src, res);
     }
 
     private FopFactory getFopFactory() throws IOException, SAXException {
         return FopFactory.newInstance(new File(".").toURI(),
-                new FileInputStream("test/java/org/apache/fop/pdf/PDFVT.xconf"));
+                new FileInputStream("src/test/java/org/apache/fop/pdf/PDFVT.xconf"));
     }
 
     private void iFToPDF(InputStream is) throws IOException, SAXException, TransformerException, IFException {

Modified: xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/util/ColorUtilTestCase.java (original)
+++ xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/util/ColorUtilTestCase.java Sun Mar  6 06:14:41 2016
@@ -128,7 +128,7 @@ public class ColorUtilTestCase {
     @Test
     public void testRGBICC() throws Exception {
         FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
-        URI sRGBLoc = new URI("src/java/org/apache/fop/pdf/sRGB%20Color%20Space%20Profile.icm");
+        URI sRGBLoc = new URI("src/main/resources/org/apache/fop/pdf/sRGB%20Color%20Space%20Profile.icm");
         ColorSpace cs = fopFactory.getColorSpaceCache().get(
                 "sRGBAlt", sRGBLoc.toASCIIString(), RenderingIntent.AUTO);
         assertNotNull("Color profile not found", cs);

Modified: xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml?rev=1733788&r1=1733433&r2=1733788&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml (original)
+++ xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml Sun Mar  6 06:14:41 2016
@@ -30,7 +30,7 @@
         </fo:simple-page-master>
       </fo:layout-master-set>
       <fo:declarations>
-        <fo:color-profile src="../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/>
+        <fo:color-profile src="../../src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm" color-profile-name="sRGB"/>
         <fo:color-profile src="nonexistent.icc" color-profile-name="unknown"/>
       </fo:declarations>
       <fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -54,7 +54,7 @@
     <eval expected="#ff0000" xpath="//block[1]//text/@color"/>
     <eval expected="#ff8000" xpath="//block[2]//text/@color"/>
     <eval expected="#ff8000" xpath="//block[3]//text/@color"/>
-    <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,&quot;../../src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm&quot;,1.0,0.5,0.0)" xpath="//block[4]//text/@color"/>
+    <eval expected="fop-rgb-icc(1.0,0.5,0.0,sRGB,&quot;../../src/main/resources/org/apache/fop/pdf/sRGB Color Space Profile.icm&quot;,1.0,0.5,0.0)" xpath="//block[4]//text/@color"/>
     <eval expected="#00ff00" xpath="//block[5]//text/@color"/>
     <eval expected="fop-rgb-icc(0.6,0.6,0.48000002,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[6]//text/@color"/>
     <eval expected="fop-rgb-icc(0.6,0.6,0.4,#CMYK,,0.0,0.0,0.2,0.4)" xpath="//block[7]//text/@color"/>

Added: xmlgraphics/fop/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/pom.xml?rev=1733788&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/pom.xml Sun Mar  6 06:14:41 2016
@@ -0,0 +1,99 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.xmlgraphics</groupId>
+  <artifactId>fop-parent</artifactId>
+  <version>2.2.0-SNAPSHOT</version>
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>XML Graphics Format Object Processor</description>
+  <packaging>pom</packaging>
+
+  <properties>
+    <antrun.plugin.version>1.8</antrun.plugin.version>
+    <batik.version>1.9.0-SNAPSHOT</batik.version>
+    <build.helper.plugin.version>1.10</build.helper.plugin.version>
+    <checkstyle.plugin.version>2.15</checkstyle.plugin.version>
+    <exec.plugin.version>1.4.0</exec.plugin.version>
+    <findbugs.plugin.version>3.0.1</findbugs.plugin.version>
+    <jar.plugin.version>2.6</jar.plugin.version>
+    <java.version>1.7</java.version>
+    <junit.version>4.11</junit.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>
+    <release.plugin.version>2.5.2</release.plugin.version>
+    <surefire.plugin.version>2.18.1</surefire.plugin.version>
+    <xml.plugin.version>1.0.1</xml.plugin.version>
+    <xmlgraphics.commons.version>2.2.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlunit.version>1.2</xmlunit.version>
+  </properties>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <modules>
+    <module>fop</module>
+    <!-- <module>fop-servlet</module> -->
+    <!-- <module>fop-transcoder</module> -->
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>${project.info.reports.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</connection>
+    <url>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</url>
+    <developerConnection></developerConnection>
+  </scm>
+
+  <repositories>
+    <repository>
+      <id>apache.snapshots.https</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <distributionManagement>
+    <site>
+      <id>${project.artifactId}-site</id>
+      <url>${project.baseUri}</url>
+    </site>
+  </distributionManagement>
+
+</project>

Propchange: xmlgraphics/fop/branches/maven/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org