You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2016/02/24 18:33:37 UTC
svn commit: r1732192 - in /xmlgraphics/commons/trunk: ./ examples/java/xmp/
lib/ lib/build/ src/java/ src/main/ src/resources/ src/test/ src/tools/
test/images/ test/java/ test/resources/
Author: gadams
Date: Wed Feb 24 17:33:37 2016
New Revision: 1732192
URL: http://svn.apache.org/viewvc?rev=1732192&view=rev
Log:
Merge from ^/xmlgraphics/commons/branches/maven.
Added:
xmlgraphics/commons/trunk/pom.xml
- copied unchanged from r1732021, xmlgraphics/commons/branches/maven/pom.xml
xmlgraphics/commons/trunk/src/main/
- copied from r1732021, xmlgraphics/commons/branches/maven/src/main/
xmlgraphics/commons/trunk/src/test/
- copied from r1732021, xmlgraphics/commons/branches/maven/src/test/
xmlgraphics/commons/trunk/src/tools/
- copied from r1732021, xmlgraphics/commons/branches/maven/src/tools/
Removed:
xmlgraphics/commons/trunk/checkstyle-5.5.xml
xmlgraphics/commons/trunk/checkstyle-suppressions.xml
xmlgraphics/commons/trunk/checkstyle.header
xmlgraphics/commons/trunk/findbugs-exclude.xml
xmlgraphics/commons/trunk/src/java/
xmlgraphics/commons/trunk/src/resources/
xmlgraphics/commons/trunk/test/java/
xmlgraphics/commons/trunk/test/resources/
Modified:
xmlgraphics/commons/trunk/ (props changed)
xmlgraphics/commons/trunk/KEYS (props changed)
xmlgraphics/commons/trunk/LICENSE (props changed)
xmlgraphics/commons/trunk/NOTICE (props changed)
xmlgraphics/commons/trunk/build.xml (contents, props changed)
xmlgraphics/commons/trunk/examples/java/xmp/pdf-example.xmp (props changed)
xmlgraphics/commons/trunk/forrest.properties.xml (props changed)
xmlgraphics/commons/trunk/lib/README.txt (contents, props changed)
xmlgraphics/commons/trunk/lib/build/ (props changed)
xmlgraphics/commons/trunk/lib/commons-logging.LICENSE.txt (props changed)
xmlgraphics/commons/trunk/sign-and-deploy.pom.xml (props changed)
xmlgraphics/commons/trunk/test/images/asf-logo.png (props changed)
xmlgraphics/commons/trunk/test/images/barcode.eps (props changed)
xmlgraphics/commons/trunk/test/images/basi2c08.png (props changed)
xmlgraphics/commons/trunk/test/images/basn0g08.png (props changed)
xmlgraphics/commons/trunk/test/images/basn2c08.png (props changed)
xmlgraphics/commons/trunk/test/images/basn3p08.png (props changed)
xmlgraphics/commons/trunk/test/images/basn4a08.png (props changed)
xmlgraphics/commons/trunk/test/images/basn6a08.png (props changed)
xmlgraphics/commons/trunk/test/images/bgimg300dpi.jpg (props changed)
xmlgraphics/commons/trunk/test/images/bgimg72dpi.gif (props changed)
xmlgraphics/commons/trunk/test/images/corrupt-icc.png (props changed)
xmlgraphics/commons/trunk/test/images/dirOnly.tif (props changed)
xmlgraphics/commons/trunk/test/images/f00n2c08.png (props changed)
xmlgraphics/commons/trunk/test/images/f04n2c08.png (props changed)
xmlgraphics/commons/trunk/test/images/iccTest.jpg (props changed)
xmlgraphics/commons/trunk/test/images/iccTest.png (props changed)
xmlgraphics/commons/trunk/test/images/no-resolution.tif (props changed)
xmlgraphics/commons/trunk/test/images/pp0n6a08.png (props changed)
xmlgraphics/commons/trunk/test/images/tbbn3p08.png (props changed)
xmlgraphics/commons/trunk/test/images/tbrn2c08.png (props changed)
xmlgraphics/commons/trunk/test/images/tiff_group4.tif (props changed)
Propchange: xmlgraphics/commons/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 24 17:33:37 2016
@@ -1,15 +1,17 @@
-build
+.checkstyle
.classpath
-.project
.externalToolBuilders
+.fbprefs
+.project
+.settings
+build
build-local.properties
checkstyle-noframes.xsl
-work
dist-*
-xmlgraphics-commons*.zip
-xmlgraphics-commons*.gz
+junit-*.jar
+target
+work
xmlgraphics-commons*-bundle.jar
-.checkstyle
-.settings
-.fbprefs
+xmlgraphics-commons*.gz
+xmlgraphics-commons*.zip
Propchange: xmlgraphics/commons/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 24 17:33:37 2016
@@ -7,4 +7,5 @@
/xmlgraphics/commons/branches/commons-1_5:1395896,1397983,1398804,1398817
/xmlgraphics/commons/branches/commons-1_5rc1:1345747,1345751,1345855,1353187-1353188
/xmlgraphics/commons/branches/commons-2_0:1628213-1628667
+/xmlgraphics/commons/branches/maven:1721489-1732021
/xmlgraphics/commons/tags/commons-2_0:1628668-1629260
Propchange: xmlgraphics/commons/trunk/KEYS
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/LICENSE
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/NOTICE
('svn:keywords' removed)
Modified: xmlgraphics/commons/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/build.xml?rev=1732192&r1=1732191&r2=1732192&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/build.xml (original)
+++ xmlgraphics/commons/trunk/build.xml Wed Feb 24 17:33:37 2016
@@ -43,16 +43,23 @@
<property name="internal-codecs.disabled" value="false"/>
- <property name="src.dir" value="${basedir}/src"/>
+ <property name="src.dir" value="${basedir}/src/main"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.res.dir" value="${src.dir}/resources"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="optional.lib.dir" value="${lib.dir}/build" />
+ <property name="test.dir" value="${basedir}/src/test"/>
+ <property name="test.java.dir" value="${test.dir}/java"/>
+ <property name="test.res.dir" value="${test.dir}/resources"/>
+
+ <property name="tools.dir" value="${basedir}/src/tools"/>
+ <property name="tools.checkstyle.dir" value="${tools.dir}/resources/checkstyle"/>
+ <property name="tools.findbugs.dir" value="${tools.dir}/resources/findbugs"/>
+
<property name="build.dir" value="${basedir}/build"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
- <property name="build.unit.tests.dir" value="${basedir}/test/java"/>
<property name="dist.bin.dir" value="${basedir}/dist-bin"/>
<property name="dist.src.dir" value="${basedir}/dist-src"/>
@@ -114,7 +121,6 @@
<include name="src/**"/>
<patternset refid="dist.lib"/>
<patternset refid="dist.lib.build"/>
- <include name="test/**"/>
<include name="examples/**"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
@@ -305,7 +311,7 @@
debug="${javac.debug}" deprecation="${javac.deprecation}"
optimize="${javac.optimize}" source="${javac.source}"
target="${javac.target}" includeAntRuntime="true">
- <src path="${build.unit.tests.dir}"/>
+ <src path="${test.java.dir}"/>
<patternset refid="compile-pattern"/>
<classpath>
<path refid="libs-build-classpath"/>
@@ -315,8 +321,8 @@
</classpath>
</javac>
<copy todir="${build.dir}/test-classes" includeEmptyDirs="false">
- <fileset dir="${basedir}/test/resources"/>
- <fileset dir="${build.unit.tests.dir}">
+ <fileset dir="${test.res.dir}"/>
+ <fileset dir="${test.java.dir}">
<exclude name="**/*.java"/>
<exclude name="**/*.html"/>
</fileset>
@@ -339,7 +345,7 @@
</fileset>
</classpath>
<batchtest fork="${junit.fork}" todir="${build.dir}/test-reports">
- <fileset dir="${build.unit.tests.dir}">
+ <fileset dir="${test.java.dir}">
<include name="**/*Test*.java"/>
<exclude name="**/*TestSuite.java"/>
<exclude name="**/image/writer/internal/TIFFImageWriter*.java" if="internal-codecs.eff.disabled"/>
@@ -452,7 +458,8 @@ NOTE:
<!-- Checkstyle -->
<!-- =================================================================== -->
<property name="checkstyle.location" value="${optional.lib.dir}/checkstyle-5.5-all.jar" />
- <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
+ <property name="checkstyle.config" value="${tools.checkstyle.dir}/checkstyle.xml" />
+ <property name="checkstyle.suppressions.file" value="${tools.checkstyle.dir}/suppressions.xml" />
<path id="checkstyle-classpath">
<path refid="libs-build-classpath"/>
<pathelement location="${checkstyle.location}"/>
@@ -481,7 +488,7 @@ NOTE:
<pathelement location="${build.codegen-classes.dir}"/>
</classpath>
<fileset dir="${src.dir}" includes="**/*.java"/>
- <fileset dir="${basedir}/test" includes="**/*.java"/>
+ <fileset dir="${basedir}/src/test" includes="**/*.java"/>
<formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
<formatter type="plain"/>
</checkstyle>
@@ -697,7 +704,7 @@ NOTE:
</target>
<target name="findbugs" depends="init, findbugs-avail, compile-java" if="findbugs.home.dir">
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="libs-findbugs"/>
- <findbugs home="${findbugs.home.dir}" output="text" reportLevel="low" effort="max" excludeFilter="findbugs-exclude.xml" jvmargs="-Xmx1024m" warningsProperty="findbugs.warnings">
+ <findbugs home="${findbugs.home.dir}" output="text" reportLevel="low" effort="max" excludeFilter="${tools.findbugs.dir}/exclusions.xml" jvmargs="-Xmx1024m" warningsProperty="findbugs.warnings">
<sourcePath path="${src.java.dir}"/>
<class location="${build.classes.dir}"/>
<auxClasspath>
Propchange: xmlgraphics/commons/trunk/build.xml
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/examples/java/xmp/pdf-example.xmp
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/forrest.properties.xml
('svn:keywords' removed)
Modified: xmlgraphics/commons/trunk/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/lib/README.txt?rev=1732192&r1=1732191&r2=1732192&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/lib/README.txt (original)
+++ xmlgraphics/commons/trunk/lib/README.txt Wed Feb 24 17:33:37 2016
@@ -2,7 +2,7 @@
Information on Apache XML Graphics Commons dependencies
==========================================================
-$Id$
+$Id: README.txt 606580 2007-12-23 17:45:02Z jeremias $
The Apache Licenses can also be found here:
http://www.apache.org/licenses/
Propchange: xmlgraphics/commons/trunk/lib/README.txt
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/lib/build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 24 17:33:37 2016
@@ -0,0 +1 @@
+junit-*.jar
Propchange: xmlgraphics/commons/trunk/lib/commons-logging.LICENSE.txt
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/sign-and-deploy.pom.xml
('svn:keywords' removed)
Propchange: xmlgraphics/commons/trunk/test/images/asf-logo.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: xmlgraphics/commons/trunk/test/images/barcode.eps
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: xmlgraphics/commons/trunk/test/images/basi2c08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/basn0g08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/basn2c08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/basn3p08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/basn4a08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/basn6a08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/bgimg300dpi.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/jpeg
Propchange: xmlgraphics/commons/trunk/test/images/bgimg72dpi.gif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/gif
Propchange: xmlgraphics/commons/trunk/test/images/corrupt-icc.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: xmlgraphics/commons/trunk/test/images/dirOnly.tif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/tiff
Propchange: xmlgraphics/commons/trunk/test/images/f00n2c08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/f04n2c08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/iccTest.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/jpeg
Propchange: xmlgraphics/commons/trunk/test/images/iccTest.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: xmlgraphics/commons/trunk/test/images/no-resolution.tif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/tiff
Propchange: xmlgraphics/commons/trunk/test/images/pp0n6a08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/tbbn3p08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/tbrn2c08.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: xmlgraphics/commons/trunk/test/images/tiff_group4.tif
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Feb 24 17:33:37 2016
@@ -1 +1 @@
-application/octet-stream
+image/tiff
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org