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/12 06:39:55 UTC
svn commit: r1734671 [1/2] - in /xmlgraphics/fop/branches/maven: ./
fop-core/ fop-core/conf/ fop-core/examples/ fop-core/hyph/ fop-core/lib/
fop-core/src/conf/ fop-core/src/documentation/ fop-core/src/foschema/
fop-core/src/main/java/org/apache/fop/com...
Author: gadams
Date: Sat Mar 12 05:39:53 2016
New Revision: 1734671
URL: http://svn.apache.org/viewvc?rev=1734671&view=rev
Log:
Configure fop-{sandbox,servlet,transcoder}, checkstyle, findbugs; fixups for ant targets.
Added:
xmlgraphics/fop/branches/maven/fop/ (with props)
xmlgraphics/fop/branches/maven/fop-core/ (props changed)
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/
xmlgraphics/fop/branches/maven/fop-core/pom.xml
- copied, changed from r1734040, xmlgraphics/fop/branches/maven/fop/pom.xml
xmlgraphics/fop/branches/maven/fop-events/ (with props)
xmlgraphics/fop/branches/maven/fop-events/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-events/src/
xmlgraphics/fop/branches/maven/fop-events/src/main/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/CompositeEventListener.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/CompositeEventListener.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/DefaultEventBroadcaster.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/DefaultEventBroadcaster.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/Event.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/Event.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/EventBroadcaster.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventBroadcaster.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/EventExceptionManager.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventExceptionManager.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/EventFormatter.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventFormatter.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/EventListener.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventListener.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/EventProducer.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/EventProducer.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/events/model/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/events/model/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventConventionException.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventConventionException.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollector.java
xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
- copied, changed from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/apache/
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/apache/fop/
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/apache/fop/tools/
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/apache/fop/tools/merge-translation.xsl
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/merge-translation.xsl
xmlgraphics/fop/branches/maven/fop-events/src/main/resources/org/apache/fop/tools/model2translation.xsl
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/resources/org/apache/fop/tools/model2translation.xsl
xmlgraphics/fop/branches/maven/fop-events/src/test/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/apache/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/apache/fop/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/apache/fop/events/
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/events/BasicEventTestCase.java
xmlgraphics/fop/branches/maven/fop-events/src/test/java/org/apache/fop/events/TestEventProducer.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/test/java/org/apache/fop/events/TestEventProducer.java
xmlgraphics/fop/branches/maven/fop-sandbox/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-sandbox/src/
xmlgraphics/fop/branches/maven/fop-sandbox/src/main/
xmlgraphics/fop/branches/maven/fop-sandbox/src/main/java/
xmlgraphics/fop/branches/maven/fop-sandbox/src/main/java/org/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/sandbox/org/
xmlgraphics/fop/branches/maven/fop-sandbox/src/main/resources/
xmlgraphics/fop/branches/maven/fop-sandbox/src/main/resources/META-INF/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/sandbox/META-INF/
xmlgraphics/fop/branches/maven/fop-sandbox/src/test/
xmlgraphics/fop/branches/maven/fop-sandbox/src/test/java/
xmlgraphics/fop/branches/maven/fop-sandbox/src/test/resources/
xmlgraphics/fop/branches/maven/fop-servlet/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-servlet/src/
xmlgraphics/fop/branches/maven/fop-servlet/src/main/
xmlgraphics/fop/branches/maven/fop-servlet/src/main/webapp/
xmlgraphics/fop/branches/maven/fop-servlet/src/main/webapp/WEB-INF/
xmlgraphics/fop/branches/maven/fop-servlet/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/conf/web.xml
xmlgraphics/fop/branches/maven/fop-servlet/src/tools/
xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/
xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/
xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml (with props)
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/
xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml (with props)
xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-transcoder/src/
xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/
xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/
xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/
xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml (with props)
xmlgraphics/fop/branches/maven/fop-util/ (with props)
xmlgraphics/fop/branches/maven/fop-util/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop-util/src/
xmlgraphics/fop/branches/maven/fop-util/src/main/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/util/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/util/DefaultErrorListener.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/util/DefaultErrorListener.java
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/util/XMLResourceBundle.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/util/XMLResourceBundle.java
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/util/text/
xmlgraphics/fop/branches/maven/fop-util/src/main/java/org/apache/fop/util/text/AdvancedMessageFormat.java
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/util/text/AdvancedMessageFormat.java
xmlgraphics/fop/branches/maven/fop/build.properties
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/build.properties
xmlgraphics/fop/branches/maven/fop/build.xml
- copied, changed from r1734038, xmlgraphics/fop/branches/maven/fop/build.xml
xmlgraphics/fop/branches/maven/fop/conf/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/conf/
xmlgraphics/fop/branches/maven/fop/examples/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/examples/
xmlgraphics/fop/branches/maven/fop/fop.bat
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/fop.bat
xmlgraphics/fop/branches/maven/fop/fop.cmd
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/fop.cmd
xmlgraphics/fop/branches/maven/fop/fop.js
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/fop.js
xmlgraphics/fop/branches/maven/fop/fop.sh
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/fop.sh
xmlgraphics/fop/branches/maven/fop/hyph/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/hyph/
xmlgraphics/fop/branches/maven/fop/jacoco.xml
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/jacoco.xml
xmlgraphics/fop/branches/maven/fop/known-issues.xml
- copied unchanged from r1734038, xmlgraphics/fop/branches/maven/fop/known-issues.xml
xmlgraphics/fop/branches/maven/fop/lib/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/lib/
xmlgraphics/fop/branches/maven/fop/pom.xml (with props)
xmlgraphics/fop/branches/maven/fop/src/
xmlgraphics/fop/branches/maven/fop/src/conf/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/conf/
xmlgraphics/fop/branches/maven/fop/src/documentation/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/documentation/
xmlgraphics/fop/branches/maven/fop/src/foschema/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/src/foschema/
xmlgraphics/fop/branches/maven/fop/src/tools/
xmlgraphics/fop/branches/maven/fop/src/tools/resources/
xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/
xmlgraphics/fop/branches/maven/fop/src/tools/resources/assembly/assembly.xml (with props)
xmlgraphics/fop/branches/maven/fop/test/
- copied from r1734038, xmlgraphics/fop/branches/maven/fop/test/
Removed:
xmlgraphics/fop/branches/maven/fop-core/build.properties
xmlgraphics/fop/branches/maven/fop-core/build.xml
xmlgraphics/fop/branches/maven/fop-core/conf/
xmlgraphics/fop/branches/maven/fop-core/examples/
xmlgraphics/fop/branches/maven/fop-core/fop.bat
xmlgraphics/fop/branches/maven/fop-core/fop.cmd
xmlgraphics/fop/branches/maven/fop-core/fop.js
xmlgraphics/fop/branches/maven/fop-core/fop.sh
xmlgraphics/fop/branches/maven/fop-core/hyph/
xmlgraphics/fop/branches/maven/fop-core/jacoco.xml
xmlgraphics/fop/branches/maven/fop-core/known-issues.xml
xmlgraphics/fop/branches/maven/fop-core/lib/
xmlgraphics/fop/branches/maven/fop-core/src/conf/
xmlgraphics/fop/branches/maven/fop-core/src/documentation/
xmlgraphics/fop/branches/maven/fop-core/src/foschema/
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/CompositeEventListener.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/DefaultEventBroadcaster.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/Event.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/EventBroadcaster.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/EventExceptionManager.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/EventFormatter.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/EventListener.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/EventProducer.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/events/model/
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/tools/EventConventionException.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/tools/EventProducerCollector.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/util/DefaultErrorListener.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/util/XMLResourceBundle.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/util/text/AdvancedMessageFormat.java
xmlgraphics/fop/branches/maven/fop-core/src/main/resources/org/apache/fop/tools/merge-translation.xsl
xmlgraphics/fop/branches/maven/fop-core/src/main/resources/org/apache/fop/tools/model2translation.xsl
xmlgraphics/fop/branches/maven/fop-core/src/sandbox/
xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/events/BasicEventTestCase.java
xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/events/TestEventProducer.java
xmlgraphics/fop/branches/maven/fop-core/test/
xmlgraphics/fop/branches/maven/fop/src/conf/web.xml
Modified:
xmlgraphics/fop/branches/maven/ (props changed)
xmlgraphics/fop/branches/maven/NOTICE
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/UtilityCodeTestSuite.java
xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/checkstyle/checkstyle.xml
xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/findbugs/exclusions.xml
xmlgraphics/fop/branches/maven/fop-sandbox/ (props changed)
xmlgraphics/fop/branches/maven/fop-servlet/ (props changed)
xmlgraphics/fop/branches/maven/fop-transcoder/ (props changed)
xmlgraphics/fop/branches/maven/fop/test/layoutengine/standard-testcases/color_1.xml
xmlgraphics/fop/branches/maven/pom.xml
Propchange: xmlgraphics/fop/branches/maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -1,19 +1 @@
-build
-jpfop-0.17.0
-build-local.properties
-build-local.targets.xml
-checkstyle-noframes.xsl
-.classpath
-.project
-.externalToolBuilders
-.checkstyle
-.settings
-.cache
-dist-bin
-dist-src
-work
-.fbprefs
-fop*.zip
-fop*.gz
-fop*-bundle.jar
-
+target
Modified: xmlgraphics/fop/branches/maven/NOTICE
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/NOTICE?rev=1734671&r1=1734670&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/NOTICE (original)
+++ xmlgraphics/fop/branches/maven/NOTICE Sat Mar 12 05:39:53 2016
@@ -3,8 +3,3 @@ Copyright 1999-2016 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-This software consists of voluntary contributions made by many individuals
-on behalf of The Apache Software Foundation and was originally created by
-James Tauber <jt...@jtauber.com>.
-
Propchange: xmlgraphics/fop/branches/maven/fop/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1,3 @@
+build
+build-local.properties
+target
Propchange: xmlgraphics/fop/branches/maven/fop-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Copied: xmlgraphics/fop/branches/maven/fop-core/pom.xml (from r1734040, xmlgraphics/fop/branches/maven/fop/pom.xml)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/pom.xml?p2=xmlgraphics/fop/branches/maven/fop-core/pom.xml&p1=xmlgraphics/fop/branches/maven/fop/pom.xml&r1=1734040&r2=1734671&rev=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/pom.xml (original)
+++ xmlgraphics/fop/branches/maven/fop-core/pom.xml Sat Mar 12 05:39:53 2016
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <name>${project.groupId}:${project.artifactId}</name>
+ <artifactId>fop-core</artifactId>
+ <name>Apache FOP Core</name>
<description>XML Graphics Format Object Processor</description>
<parent>
@@ -18,42 +18,7 @@
</properties>
<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>
+ <!-- batik deps -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>batik-anim</artifactId>
@@ -84,17 +49,58 @@
<artifactId>batik-transcoder</artifactId>
<version>${batik.version}</version>
</dependency>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-events</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- xgc deps -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>xmlgraphics-commons</artifactId>
<version>${xmlgraphics.commons.version}</version>
</dependency>
- <!-- provided deps -->
+ <!-- xmlgraphics external deps -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</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>${avalon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>${avalon.version}</version>
+ </dependency>
<dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.12</version>
- <scope>provided</scope>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>fontbox</artifactId>
+ <version>1.8.5</version>
</dependency>
<!-- test deps -->
<dependency>
@@ -218,6 +224,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
+ <!-- [TBD] - temporarily exclude JAI support -->
<exclude>org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java</exclude>
</excludes>
</configuration>
@@ -261,28 +268,6 @@
</target>
</configuration>
</execution>
- <execution>
- <id>codegen-test-events</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask">
- <classpath>
- <path refid="maven.compile.classpath"/>
- <path refid="maven.test.classpath"/>
- </classpath>
- </taskdef>
- <collectEvents destdir="${project.build.testOutputDirectory}">
- <fileset dir="${project.basedir}/src/test/java">
- <include name="**/events/TestEventProducer.java"/>
- </fileset>
- </collectEvents>
- </target>
- </configuration>
- </execution>
</executions>
</plugin>
<!-- junit testing -->
@@ -294,18 +279,7 @@
<include>**/*TestCase.java</include>
</includes>
<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>
+ <workingDirectory>../fop</workingDirectory>
</configuration>
</plugin>
<!-- code analysis - checkstyle -->
Modified: xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java Sat Mar 12 05:39:53 2016
@@ -97,9 +97,21 @@ public class GlyphProcessingState {
this.indexLast = gs.getGlyphCount();
this.sct = sct;
this.gct = (sct != null) ? sct.getTester(feature) : null;
- this.ignoreBase = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredBase(gi, flags); } };
- this.ignoreLigature = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredLigature(gi, flags); } };
- this.ignoreMark = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredMark(gi, flags); } };
+ this.ignoreBase = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredBase(gi, flags);
+ }
+ };
+ this.ignoreLigature = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredLigature(gi, flags);
+ }
+ };
+ this.ignoreMark = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredMark(gi, flags);
+ }
+ };
}
/**
@@ -134,9 +146,21 @@ public class GlyphProcessingState {
this.classMatchSet = 0; // @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
this.sct = sct;
this.gct = (sct != null) ? sct.getTester(feature) : null;
- this.ignoreBase = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredBase(gi, flags); } };
- this.ignoreLigature = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredLigature(gi, flags); } };
- this.ignoreMark = new GlyphTester() { public boolean test(int gi, int flags) { return isIgnoredMark(gi, flags); } };
+ this.ignoreBase = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredBase(gi, flags);
+ }
+ };
+ this.ignoreLigature = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredLigature(gi, flags);
+ }
+ };
+ this.ignoreMark = new GlyphTester() {
+ public boolean test(int gi, int flags) {
+ return isIgnoredMark(gi, flags);
+ }
+ };
this.ignoreDefault = null;
this.subtable = null;
return this;
Modified: xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/pdf/PDFPattern.java Sat Mar 12 05:39:53 2016
@@ -329,7 +329,9 @@ public class PDFPattern extends PDFPathP
* Output PDF bytes, not used.
* @return returns null
*/
- public byte[] toPDF() { return null; }
+ public byte[] toPDF() {
+ return null;
+ }
/** {@inheritDoc} */
protected boolean contentEquals(PDFObject obj) {
Modified: xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java Sat Mar 12 05:39:53 2016
@@ -402,12 +402,16 @@ public class RtfTableCell
/**
* @param mergeStatus vertical cell merging status to set
*/
- public void setVMerge(int mergeStatus) { this.vMerge = mergeStatus; }
+ public void setVMerge(int mergeStatus) {
+ this.vMerge = mergeStatus;
+ }
/**
* @return vertical cell merging status
*/
- public int getVMerge() { return this.vMerge; }
+ public int getVMerge() {
+ return this.vMerge;
+ }
/**
* Set horizontal cell merging status
@@ -425,7 +429,9 @@ public class RtfTableCell
}
/** get cell width */
- int getCellWidth() { return this.cellWidth; }
+ int getCellWidth() {
+ return this.cellWidth;
+ }
/**
* Overridden so that nested tables cause extra rows to be added after the row
Modified: xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/UtilityCodeTestSuite.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/UtilityCodeTestSuite.java Sat Mar 12 05:39:53 2016
@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.fop.events.BasicEventTestCase;
import org.apache.fop.pdf.FileIDGeneratorTestCase;
import org.apache.fop.pdf.PDFDocumentGraphics2DTestCase;
import org.apache.fop.pdf.PDFEncryptionJCETestCase;
@@ -45,7 +44,6 @@ import org.apache.fop.util.XMLResourceBu
ColorUtilTestCase.class,
BorderPropsTestCase.class,
ElementListUtilsTestCase.class,
- BasicEventTestCase.class,
XMLResourceBundleTestCase.class,
URIResolutionTestCase.class,
FileIDGeneratorTestCase.class,
Modified: xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java Sat Mar 12 05:39:53 2016
@@ -137,14 +137,17 @@ public class PDFVTTestCase {
Fop fop = fopFactory.newFop(mimeFopIf, userAgent, out);
Transformer transformer = TransformerFactory.newInstance().newTransformer();
- Source src = new StreamSource(new FileInputStream("src/test/resources/org/apache/fop/pdf/PDFVT.fo"));
+ // [TBD] FIXME - use getResource() to access FO file [GA]
+ Source src = new StreamSource(
+ new FileInputStream("../fop-core/src/test/resources/org/apache/fop/pdf/PDFVT.fo"));
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
}
private FopFactory getFopFactory() throws IOException, SAXException {
+ // [TBD] FIXME - use getResource() to access conf file [GA]
return FopFactory.newInstance(new File(".").toURI(),
- new FileInputStream("src/test/resources/org/apache/fop/pdf/PDFVT.xconf"));
+ new FileInputStream("../fop-core/src/test/resources/org/apache/fop/pdf/PDFVT.xconf"));
}
private void iFToPDF(InputStream is) throws IOException, SAXException, TransformerException, IFException {
Modified: xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java Sat Mar 12 05:39:53 2016
@@ -128,7 +128,8 @@ public class ColorUtilTestCase {
@Test
public void testRGBICC() throws Exception {
FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
- URI sRGBLoc = new URI("src/main/resources/org/apache/fop/pdf/sRGB%20Color%20Space%20Profile.icm");
+ // [TBD] FIXME - use getResource() to access profile [GA]
+ URI sRGBLoc = new URI("../fop-core/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-core/src/tools/resources/checkstyle/checkstyle.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/checkstyle/checkstyle.xml?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/checkstyle/checkstyle.xml (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/checkstyle/checkstyle.xml Sat Mar 12 05:39:53 2016
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="severity" value="warning"/>
@@ -44,7 +44,7 @@
<!-- ===================================================================================================== -->
<module name="SuppressionFilter">
- <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+ <property name="file" value="${checkstyle.suppressions.file}" default="suppressions.xml"/>
</module>
<!-- ===================================================================================================== -->
Modified: xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/findbugs/exclusions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/findbugs/exclusions.xml?rev=1734671&r1=1734038&r2=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/findbugs/exclusions.xml (original)
+++ xmlgraphics/fop/branches/maven/fop-core/src/tools/resources/findbugs/exclusions.xml Sat Mar 12 05:39:53 2016
@@ -396,6 +396,10 @@
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
</Match>
<Match>
+ <!-- 1 warning -->
+ <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE"/>
+ </Match>
+ <Match>
<!-- 12 warnings -->
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>
Propchange: xmlgraphics/fop/branches/maven/fop-events/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Added: xmlgraphics/fop/branches/maven/fop-events/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-events/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-events/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-events/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,147 @@
+<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-events</artifactId>
+ <name>Apache FOP Events</name>
+ <description>XML Graphics Format Object Processor Events</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- external deps -->
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>${xmlgraphics.commons.version}</version>
+ </dependency>
+ <!-- test-only deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- 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-test-events</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask">
+ <classpath>
+ <path refid="maven.compile.classpath"/>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </taskdef>
+ <collectEvents destdir="${project.build.testOutputDirectory}">
+ <fileset dir="${project.basedir}/src/test/java">
+ <include name="**/events/TestEventProducer.java"/>
+ </fileset>
+ </collectEvents>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- junit testing -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </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}../fop-core/src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <linkXRef>false</linkXRef>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <suppressionsLocation>${project.baseUri}../fop-core/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>../fop-core/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-events/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java (from r1734038, xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java?p2=xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java&p1=xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java&r1=1734038&r2=1734671&rev=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java (original)
+++ xmlgraphics/fop/branches/maven/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java Sat Mar 12 05:39:53 2016
@@ -278,7 +278,7 @@ public class EventProducerCollectorTask
File targetDir = new File("build/codegen1");
targetDir.mkdirs();
- generator.setTranslationFile(new File("D:/out1.xml"));
+ generator.setTranslationFile(new File("out1.xml"));
generator.execute();
} catch (Exception e) {
e.printStackTrace();
Propchange: xmlgraphics/fop/branches/maven/fop-sandbox/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Added: xmlgraphics/fop/branches/maven/fop-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-sandbox/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-sandbox/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-sandbox/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,142 @@
+<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-sandbox</artifactId>
+ <name>Apache FOP Sandbox</name>
+ <description>XML Graphics Format Object Processor Sandbox</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- compile deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- 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"/>
+ </fileset>
+ </collectEvents>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <!-- junit testing -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <!-- jar packaging -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.apache.fop.cli.Main</mainClass>
+ </manifest>
+ <manifestEntries>
+ <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
+ <SpecificationVersion>1.1</SpecificationVersion>
+ <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>
+ <SpecificationURL>http://www.w3.org/TR/xsl</SpecificationURL>
+ </manifestEntries>
+ </archive>
+ </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}../fop-core/src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <linkXRef>false</linkXRef>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <suppressionsLocation>${project.baseUri}../fop-core/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>../fop-core/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-sandbox/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/maven/fop-servlet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Added: xmlgraphics/fop/branches/maven/fop-servlet/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-servlet/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-servlet/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-servlet/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,82 @@
+<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-servlet</artifactId>
+ <name>Apache FOP Servlet</name>
+ <description>XML Graphics Format Object Processor Servlet</description>
+ <packaging>war</packaging>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- batik deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-all</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+ <!-- xgc deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>${xmlgraphics.commons.version}</version>
+ </dependency>
+ <!-- external deps -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>${avalon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>${avalon.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>${war.plugin.version}</version>
+ <configuration>
+ <packagingIncludes>
+ WEB-INF/lib/avalon-framework-api-${avalon.version}.jar,
+ WEB-INF/lib/avalon-framework-impl-${avalon.version}.jar,
+ WEB-INF/lib/batik-all-*.jar,
+ WEB-INF/lib/commons-io-${commons.io.version}.jar,
+ WEB-INF/lib/commons-logging-${commons.logging.version}.jar,
+ WEB-INF/lib/fop-${project.version}.jar,
+ WEB-INF/lib/xmlgraphics-commons-*.jar
+ </packagingIncludes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: xmlgraphics/fop/branches/maven/fop-servlet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>all</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>../LICENSE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/maven</exclude>
+ <exclude>META-INF/maven/**/*</exclude>
+ </excludes>
+ </unpackOptions>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: xmlgraphics/fop/branches/maven/fop-servlet/src/tools/resources/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/maven/fop-transcoder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Added: xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,93 @@
+<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-transcoder-allinone</artifactId>
+ <name>Apache FOP Transcoder All-In-One</name>
+ <description>XML Graphics Format Object Processor Transcoder All-In-One</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-events</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- external deps -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>${avalon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>${avalon.version}</version>
+ </dependency>
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-all</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ <descriptors>
+ <descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: xmlgraphics/fop/branches/maven/fop-transcoder-allinone/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>all</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>../LICENSE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/apache/avalon/framework/*</include>
+ <include>org/apache/avalon/framework/activity/*</include>
+ <include>org/apache/avalon/framework/configuration/*</include>
+ <include>org/apache/avalon/framework/container/*</include>
+ <include>org/apache/commons/io/*.class</include>
+ <include>org/apache/commons/io/filefilter/*.class</include>
+ <include>org/apache/commons/io/output/*.class</include>
+ <include>org/apache/commons/logging/**</include>
+ <include>org/apache/fop/Version.class</include>
+ <include>org/apache/fop/accessibility/StructureTreeElement.class</include>
+ <include>org/apache/fop/apps/FOPException.class</include>
+ <include>org/apache/fop/apps/Fop.class</include>
+ <include>org/apache/fop/apps/io/**</include>
+ <include>org/apache/fop/area/AreaTreeControl*</include>
+ <include>org/apache/fop/complexscripts/bidi/BidiClass.class</include>
+ <include>org/apache/fop/complexscripts/bidi/BidiConstants.class</include>
+ <include>org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.class</include>
+ <include>org/apache/fop/complexscripts/fonts/*.class</include>
+ <include>org/apache/fop/complexscripts/util/GlyphTester.class</include>
+ <include>org/apache/fop/events/EventProducer.class</include>
+ <include>org/apache/fop/fo/Constants.class</include>
+ <include>org/apache/fop/fo/FOTreeBuilder.class</include>
+ <include>org/apache/fop/fonts/**</include>
+ <include>org/apache/fop/image/loader/batik/BatikImageFlavors*.class</include>
+ <include>org/apache/fop/pdf/**</include>
+ <include>org/apache/fop/render/**Config**</include>
+ <include>org/apache/fop/render/gradient/**</include>
+ <include>org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class</include>
+ <include>org/apache/fop/render/pdf/**</include>
+ <include>org/apache/fop/render/ps/**</include>
+ <include>org/apache/fop/svg/**</include>
+ <include>org/apache/fop/traits/Direction.class</include>
+ <include>org/apache/fop/traits/MinOptMax.class</include>
+ <include>org/apache/fop/traits/TraitEnum.class</include>
+ <include>org/apache/fop/util/*OutputStream.class</include>
+ <include>org/apache/fop/util/ASCII*.class</include>
+ <include>org/apache/fop/util/AbstractPaintingState**</include>
+ <include>org/apache/fop/util/CMYKColorSpace*.class</include>
+ <include>org/apache/fop/util/CharUtilities.class</include>
+ <include>org/apache/fop/util/Color*.class</include>
+ <include>org/apache/fop/util/DecimalFormatCache*.class</include>
+ <include>org/apache/fop/util/Finalizable.class</include>
+ <include>org/apache/fop/util/ImageObject.class</include>
+ <include>org/apache/fop/util/SubInputStream.class</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/fop/render/pdf/PSRenderer.class</exclude>
+ <exclude>org/apache/fop/render/pdf/PSXMLHandler*</exclude>
+ </excludes>
+ </unpackOptions>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: xmlgraphics/fop/branches/maven/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,72 @@
+<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-transcoder</artifactId>
+ <name>Apache FOP Transcoder</name>
+ <description>XML Graphics Format Object Processor Transcoder</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-events</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-all</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ <descriptors>
+ <descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: xmlgraphics/fop/branches/maven/fop-transcoder/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>all</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>../LICENSE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ <outputDirectory>META-INF</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>org/apache/fop/Version.class</include>
+ <include>org/apache/fop/accessibility/StructureTreeElement.class</include>
+ <include>org/apache/fop/apps/FOPException.class</include>
+ <include>org/apache/fop/apps/Fop.class</include>
+ <include>org/apache/fop/apps/io/**</include>
+ <include>org/apache/fop/area/AreaTreeControl*</include>
+ <include>org/apache/fop/complexscripts/bidi/BidiClass.class</include>
+ <include>org/apache/fop/complexscripts/bidi/BidiConstants.class</include>
+ <include>org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.class</include>
+ <include>org/apache/fop/complexscripts/fonts/*.class</include>
+ <include>org/apache/fop/complexscripts/util/GlyphTester.class</include>
+ <include>org/apache/fop/events/EventProducer.class</include>
+ <include>org/apache/fop/fo/Constants.class</include>
+ <include>org/apache/fop/fo/FOTreeBuilder.class</include>
+ <include>org/apache/fop/fonts/**</include>
+ <include>org/apache/fop/image/loader/batik/BatikImageFlavors*.class</include>
+ <include>org/apache/fop/pdf/**</include>
+ <include>org/apache/fop/render/**Config**</include>
+ <include>org/apache/fop/render/gradient/**</include>
+ <include>org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class</include>
+ <include>org/apache/fop/render/pdf/**</include>
+ <include>org/apache/fop/render/ps/**</include>
+ <include>org/apache/fop/svg/**</include>
+ <include>org/apache/fop/traits/Direction.class</include>
+ <include>org/apache/fop/traits/MinOptMax.class</include>
+ <include>org/apache/fop/traits/TraitEnum.class</include>
+ <include>org/apache/fop/util/*OutputStream.class</include>
+ <include>org/apache/fop/util/ASCII*.class</include>
+ <include>org/apache/fop/util/AbstractPaintingState**</include>
+ <include>org/apache/fop/util/CMYKColorSpace*.class</include>
+ <include>org/apache/fop/util/CharUtilities.class</include>
+ <include>org/apache/fop/util/Color*.class</include>
+ <include>org/apache/fop/util/DecimalFormatCache*.class</include>
+ <include>org/apache/fop/util/Finalizable.class</include>
+ <include>org/apache/fop/util/ImageObject.class</include>
+ <include>org/apache/fop/util/SubInputStream.class</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/fop/render/pdf/PSRenderer.class</exclude>
+ <exclude>org/apache/fop/render/pdf/PSXMLHandler*</exclude>
+ </excludes>
+ </unpackOptions>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Propchange: xmlgraphics/fop/branches/maven/fop-transcoder/src/tools/resources/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/maven/fop-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 12 05:39:53 2016
@@ -0,0 +1 @@
+target
Added: xmlgraphics/fop/branches/maven/fop-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop-util/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop-util/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop-util/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,96 @@
+<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-util</artifactId>
+ <name>Apache FOP Utilities</name>
+ <description>XML Graphics Format Object Processor Utilities</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- compile deps -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>${xmlgraphics.commons.version}</version>
+ </dependency>
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- junit testing -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </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}../fop-core/src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <linkXRef>false</linkXRef>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <suppressionsLocation>${project.baseUri}../fop-core/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>../fop-core/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-util/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: xmlgraphics/fop/branches/maven/fop/build.xml (from r1734038, xmlgraphics/fop/branches/maven/fop/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/fop/build.xml&r1=1734038&r2=1734671&rev=1734671&view=diff
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/build.xml (original)
+++ xmlgraphics/fop/branches/maven/fop/build.xml Sat Mar 12 05:39:53 2016
@@ -167,12 +167,33 @@ list of possible build targets.
<property name="junit.printsummary" value="off"/>
<property name="junit.formatter.brief" value="on"/>
<property name="javadoc.packages" value="org.apache.fop.*"/>
- <property name="src.dir" value="${basedir}/src"/>
+ <property name="core.dir" value="${basedir}/../fop-core"/>
+ <property name="core.src.dir" value="${core.dir}/src"/>
+ <property name="core.src.java.dir" value="${core.src.dir}/main/java"/>
+ <property name="core.checkstyle.dir" value="${core.src.dir}/tools/resources/checkstyle"/>
+ <property name="core.findbugs.dir" value="${core.src.dir}/tools/resources/findbugs"/>
+ <property name="events.dir" value="${basedir}/../fop-events"/>
+ <property name="events.src.dir" value="${events.dir}/src"/>
+ <property name="events.src.java.dir" value="${events.src.dir}/main/java"/>
+ <property name="events.checkstyle.dir" value="${events.src.dir}/tools/resources/checkstyle"/>
+ <property name="events.findbugs.dir" value="${events.src.dir}/tools/resources/findbugs"/>
+ <property name="sandbox.dir" value="${basedir}/../fop-sandbox"/>
+ <property name="sandbox.src.dir" value="${sandbox.dir}/src"/>
+ <property name="sandbox.src.java.dir" value="${sandbox.src.dir}/main/java"/>
+ <property name="servlet.dir" value="${basedir}/../fop-servlet"/>
+ <property name="servlet.src.dir" value="${servlet.dir}/src"/>
+ <property name="servlet.src.java.dir" value="${servlet.src.dir}/main/java"/>
+ <property name="util.dir" value="${basedir}/../fop-util"/>
+ <property name="util.src.dir" value="${util.dir}/src"/>
+ <property name="util.src.java.dir" value="${util.src.dir}/main/java"/>
+ <property name="util.checkstyle.dir" value="${util.src.dir}/tools/resources/checkstyle"/>
+ <property name="util.findbugs.dir" value="${util.src.dir}/tools/resources/findbugs"/>
+ <property name="src.dir" value="${core.src.dir}"/>
<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}/main/java"/>
<property name="src.resources.dir" value="${src.dir}/main/resources"/>
- <property name="src.sandbox.dir" value="${src.dir}/sandbox"/>
+ <property name="src.sandbox.dir" value="${sandbox.src.dir}"/>
<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"/>
<property name="fo.examples.dir" value="${basedir}/examples/fo/basic"/>
@@ -328,7 +349,9 @@ list of possible build targets.
<mkdir dir="${build.classes.dir}"/>
<javac destdir="${build.classes.dir}" includeAntRuntime="true">
<src path="${build.gensrc.dir}"/>
- <src path="${src.java.dir}"/>
+ <src path="${core.src.java.dir}"/>
+ <src path="${events.src.java.dir}"/>
+ <src path="${util.src.java.dir}"/>
<patternset includes="**/*.java"/>
<patternset refid="exclude-jce-dependencies"/>
<patternset refid="exclude-jai"/>
@@ -350,7 +373,7 @@ list of possible build targets.
</target>
<target name="resourcegen" depends="compile-java">
<javac destdir="${build.classes.dir}" includeAntRuntime="true">
- <src path="${src.java.dir}"/>
+ <src path="${events.src.java.dir}"/>
<patternset includes="**/tools/Event*.java"/>
<classpath>
<path refid="libs-tools-build-classpath"/>
@@ -555,7 +578,7 @@ list of possible build targets.
<target name="package" depends="jar-main,jar-hyphenation,jar-sandbox" description="Generates the jar files"/>
<target name="servlet" depends="package" description="Generates the WAR with the sample FOP servlet">
<echo message="Creating the WAR file"/>
- <war warfile="${build.dir}/fop.war" webxml="${src.dir}/conf/web.xml">
+ <war warfile="${build.dir}/fop.war" webxml="${servlet.src.dir}/main/webapp/WEB-INF/web.xml">
<lib dir="${lib.dir}">
<include name="avalon-framework*.jar"/>
<include name="commons-logging*.jar"/>
@@ -1058,7 +1081,8 @@ NOTE:
<!-- Checkstyle -->
<!-- =================================================================== -->
<property name="checkstyle.location" value="${lib-tools}/checkstyle-5.5-all.jar" />
- <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
+ <property name="checkstyle.config" value="${core.checkstyle.dir}/checkstyle.xml" />
+ <property name="checkstyle.suppressions.file" value="${core.checkstyle.dir}/suppressions.xml" />
<path id="checkstyle-classpath">
<pathelement location="${checkstyle.location}"/>
</path>
@@ -1160,11 +1184,12 @@ NOTE:
</classpath>
</taskdef>
<findbugs home="${findbugs.home.dir}" output="${findbugs.output.format}" reportLevel="low" effort="max"
- outputFile="${build.dir}/report_findbugs.${findbugs.output.extension}" excludeFilter="findbugs-exclude.xml" jvmargs="-Xmx1024m" warningsProperty="findbugs.warnings">
+ outputFile="${build.dir}/report_findbugs.${findbugs.output.extension}" excludeFilter="${core.findbugs.dir}/exclusions.xml" jvmargs="-Xmx1024m" warningsProperty="findbugs.warnings">
<sourcePath path="${src.java.dir}"/>
<class location="${build.classes.dir}"/>
<auxClasspath>
<path refid="libs-build-classpath"/>
+ <path refid="libs-tools-build-classpath"/>
<path>
<fileset dir="${ant.library.dir}">
<include name="ant.jar"/>
@@ -1197,7 +1222,7 @@ NOTE:
<!-- Creates the distribution -->
<!-- =================================================================== -->
<!-- It would be better to make dist depend on distclean. But as long as the forrest projectInfo plugin depends on a higher Java version (1.5) than we use for the compilation (1.4), leaving it out enables a workaround -->
- <target name="dist" depends="dist-prereq,dist-src,dist-bin,maven-artifacts" description="Generates the distribution package"/>
+ <target name="dist" depends="dist-prereq,dist-src,dist-bin" description="Generates the distribution package"/>
<target name="dist-prereq" depends="init,dist-get-jai">
<fail message="A complete binary build requires JAI" unless="jai.present"/>
<fail message="A complete binary build requires JCE" unless="jce.present"/>
@@ -1310,67 +1335,6 @@ NOTE:
</exec>
</target>
<!-- =================================================================== -->
-<!-- Maven artifacts -->
-<!-- =================================================================== -->
- <target name="maven-artifacts" depends="jar-main, jar-sources, jar-javadocs" description="Builds a Maven artifact that can be uploaded to a Maven repository">
- <filter token="version" value="${version}"/>
- <mkdir dir="${build.dir}/maven"/>
- <copy file="${basedir}/xmlgraphics-fop-pom-template.pom" tofile="${build.dir}/maven/pom.xml" filtering="true"/>
- <copy file="${build.dir}/${name}.jar" tofile="${build.dir}/${name}-${version}.jar"/>
- <fileset id="bundle-files" dir="${build.dir}">
- <patternset>
- <include name="${name}-${version}.jar"/>
- <include name="${name}-${version}-sources.jar"/>
- <include name="${name}-${version}-javadoc.jar"/>
- </patternset>
- <patternset>
- <include name="maven/pom.xml"/>
- </patternset>
- </fileset>
- <checksum algorithm="md5">
- <fileset refid="bundle-files"/>
- </checksum>
- <checksum algorithm="sha1">
- <fileset refid="bundle-files"/>
- </checksum>
- <input message="Passphrase for your default private key (attention: passphrase will be echoed in clear text on the display!)" addproperty="pwd"/>
- <antcall target="sign-file">
- <param name="sign.archive" value="${build.dir}/${name}-${version}.jar"/>
- <param name="pwd" value="${pwd}"/>
- </antcall>
- <antcall target="sign-file">
- <param name="sign.archive" value="${build.dir}/${name}-${version}-sources.jar"/>
- <param name="pwd" value="${pwd}"/>
- </antcall>
- <antcall target="sign-file">
- <param name="sign.archive" value="${build.dir}/${name}-${version}-javadoc.jar"/>
- <param name="pwd" value="${pwd}"/>
- </antcall>
- <antcall target="sign-file">
- <param name="sign.archive" value="${build.dir}/maven/pom.xml"/>
- <param name="pwd" value="${pwd}"/>
- </antcall>
- <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
- <manifest>
- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
- </manifest>
- <fileset dir="${build.dir}">
- <patternset>
- <include name="${name}-${version}.jar*"/>
- <include name="${name}-${version}-sources.jar*"/>
- <include name="${name}-${version}-javadoc.jar*"/>
- </patternset>
- </fileset>
- <fileset dir="${build.dir}/maven">
- <patternset>
- <include name="pom.xml*"/>
- </patternset>
- </fileset>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
- </jar>
- <move file="${build.dir}/${name}-${version}-bundle.jar" todir="${basedir}"/>
- </target>
-<!-- =================================================================== -->
<!-- Nightly builds -->
<!-- =================================================================== -->
<target name="junit-nightly-build" depends="junit-userconfig,junit-text-linebreak,junit-fotree">
Added: xmlgraphics/fop/branches/maven/fop/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/maven/fop/pom.xml?rev=1734671&view=auto
==============================================================================
--- xmlgraphics/fop/branches/maven/fop/pom.xml (added)
+++ xmlgraphics/fop/branches/maven/fop/pom.xml Sat Mar 12 05:39:53 2016
@@ -0,0 +1,79 @@
+<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>Apache FOP All-In-One</name>
+ <description>XML Graphics Format Object Processor All-In-One</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop-parent</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <!-- fop deps -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-events</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fop-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- test deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-all</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <mainClass>org.apache.fop.cli.Main</mainClass>
+ </manifest>
+ <manifestEntries>
+ <SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
+ <SpecificationVersion>1.1</SpecificationVersion>
+ <SpecificationVendor>World Wide Web Consortium</SpecificationVendor>
+ <SpecificationURL>http://www.w3.org/TR/xsl</SpecificationURL>
+ </manifestEntries>
+ </archive>
+ <descriptors>
+ <descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org