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/22 09:28:55 UTC
svn commit: r1731596 - in /xmlgraphics/commons/branches/maven: ./ src/
src/main/java/org/apache/xmlgraphics/image/codec/png/
src/main/java/org/apache/xmlgraphics/image/codec/tiff/
src/main/java/org/apache/xmlgraphics/image/loader/impl/ src/main/java/or...
Author: gadams
Date: Mon Feb 22 08:28:54 2016
New Revision: 1731596
URL: http://svn.apache.org/viewvc?rev=1731596&view=rev
Log:
Eliminate symlinks (which won't work on win32); (re)configure checkstyle/findbugs for Java 6.
Added:
xmlgraphics/commons/branches/maven/src/tools/
xmlgraphics/commons/branches/maven/src/tools/resources/
xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/
xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/LICENSE.txt
xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.header
- copied unchanged from r1731510, xmlgraphics/commons/branches/maven/checkstyle.header
xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.xml
- copied, changed from r1731510, xmlgraphics/commons/branches/maven/checkstyle-5.5.xml
xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/suppressions.xml
- copied unchanged from r1731510, xmlgraphics/commons/branches/maven/checkstyle-suppressions.xml
xmlgraphics/commons/branches/maven/src/tools/resources/findbugs/
xmlgraphics/commons/branches/maven/src/tools/resources/findbugs/exclusions.xml
- copied unchanged from r1731510, xmlgraphics/commons/branches/maven/findbugs-exclude.xml
Removed:
xmlgraphics/commons/branches/maven/checkstyle-5.5.xml
xmlgraphics/commons/branches/maven/checkstyle-suppressions.xml
xmlgraphics/commons/branches/maven/checkstyle.header
xmlgraphics/commons/branches/maven/findbugs-exclude.xml
xmlgraphics/commons/branches/maven/src/java
xmlgraphics/commons/branches/maven/src/resources
xmlgraphics/commons/branches/maven/test/images
xmlgraphics/commons/branches/maven/test/java
xmlgraphics/commons/branches/maven/test/resources
Modified:
xmlgraphics/commons/branches/maven/build.xml
xmlgraphics/commons/branches/maven/pom.xml
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/impl/PNGFile.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java
xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/xmp/XMPProperty.java
xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/codec/Messages.properties
xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/io/URIResolverAdapterTestCase.java
xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java
Modified: xmlgraphics/commons/branches/maven/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/build.xml?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/build.xml (original)
+++ xmlgraphics/commons/branches/maven/build.xml Mon Feb 22 08:28:54 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>
Modified: xmlgraphics/commons/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/pom.xml?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/pom.xml (original)
+++ xmlgraphics/commons/branches/maven/pom.xml Mon Feb 22 08:28:54 2016
@@ -11,8 +11,8 @@
<properties>
<checkstyle.version>2.15</checkstyle.version>
<exec.version>1.4.0</exec.version>
- <findbugs.version>3.0.1</findbugs.version>
- <java.version>1.7</java.version>
+ <findbugs.version>2.5.5</findbugs.version>
+ <java.version>1.6</java.version>
<junit.version>4.11</junit.version>
<project.info.reports.version>2.8</project.info.reports.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,6 +65,65 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${project.info.reports.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.version}</version>
+ <configuration>
+ <configLocation>${project.baseUri}src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${project.baseUri}src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <linkXRef>false</linkXRef>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <suppressionsLocation>${project.baseUri}src/tools/resources/checkstyle/suppressions.xml</suppressionsLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version><!--$NO-MVN-MAN-VER$-->
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*TestCases.java</include>
+ </includes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
<testResources>
<testResource>
<!-- TBD - move following *.{png,tiff,txt,xmp} into test/resources, then remove these rules -->
@@ -85,4 +144,31 @@
</testResources>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.version}</version>
+ <configuration>
+ <configLocation>${project.baseUri}src/tools/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${project.baseUri}src/tools/resources/checkstyle/LICENSE.txt</headerLocation>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <linkXRef>false</linkXRef>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
+ <effort>Max</effort>
+ <threshold>Low</threshold>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGImageDecoder.java Mon Feb 22 08:28:54 2016
@@ -1298,7 +1298,9 @@ class PNGImage extends SimpleRenderedIma
while ((b = chunk.getByte(textIndex++)) != 0) {
key.append((char)b);
}
- /* int method = */ chunk.getByte(textIndex++);
+
+ // skip method
+ textIndex++;
StringBuffer value = new StringBuffer();
try {
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/png/PNGRed.java Mon Feb 22 08:28:54 2016
@@ -1344,7 +1344,9 @@ public class PNGRed extends AbstractRed
while ((b = chunk.getByte(textIndex++)) != 0) {
key.append((char)b);
}
- /* int method = */ chunk.getByte(textIndex++);
+
+ // skip method
+ textIndex++;
try {
int length = chunk.getLength() - textIndex;
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFEncodeParam.java Mon Feb 22 08:28:54 2016
@@ -197,9 +197,7 @@ public class TIFFEncodeParam implements
* setting is ignored if the compression type is not DEFLATE.
*/
public void setDeflateLevel(int deflateLevel) {
- if (deflateLevel < 1
- && deflateLevel > 9
- && deflateLevel != Deflater.DEFAULT_COMPRESSION) {
+ if (deflateLevel != Deflater.DEFAULT_COMPRESSION) {
throw new RuntimeException(PropertyUtil.getString("TIFFEncodeParam1"));
}
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java Mon Feb 22 08:28:54 2016
@@ -966,8 +966,7 @@ public class TIFFImageEncoder extends Im
// Retrieve and verify data type.
switch (dataType) {
case DataBuffer.TYPE_BYTE:
- if (dataTypeSize != 1 && dataTypeSize == 4 && // todo does this make sense??
- dataTypeSize != 8) { // we get error only for 4
+ if (dataTypeSize == 4) {
throw new RuntimeException(PropertyUtil.getString("TIFFImageEncoder2"));
}
break;
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/impl/PNGFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/impl/PNGFile.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/impl/PNGFile.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/impl/PNGFile.java Mon Feb 22 08:28:54 2016
@@ -189,8 +189,6 @@ class PNGFile implements PNGConstants {
}
private void parse_IHDR_chunk(PNGChunk chunk) {
- chunk.getInt4(0);
- chunk.getInt4(4);
bitDepth = chunk.getInt1(8);
if (bitDepth != 8) {
// this is a limitation of the current implementation
@@ -265,7 +263,7 @@ class PNGFile implements PNGConstants {
while (chunk.getByte(textIndex++) != 0) {
//NOP
}
- chunk.getByte(textIndex++);
+ textIndex++;
byte[] profile = new byte[length - textIndex];
System.arraycopy(chunk.getData(), textIndex, profile, 0, length - textIndex);
ByteArrayInputStream bais = new ByteArrayInputStream(profile);
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java Mon Feb 22 08:28:54 2016
@@ -95,7 +95,7 @@ public abstract class AbstractResourcesD
/**
* Defines the known resource types (font, procset, file, pattern etc.).
*/
- protected static final Set RESOURCE_TYPES = new java.util.HashSet();
+ static final Set RESOURCE_TYPES = new java.util.HashSet();
static {
RESOURCE_TYPES.add(PSResource.TYPE_FONT);
Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/xmp/XMPProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/xmp/XMPProperty.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/xmp/XMPProperty.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/xmp/XMPProperty.java Mon Feb 22 08:28:54 2016
@@ -169,6 +169,7 @@ public class XMPProperty implements XMLi
prop.setPropertyQualifier(name, props.getProperty(name));
}
}
+ props.setProperty(prop);
}
}
}
Modified: xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/codec/Messages.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/codec/Messages.properties?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/codec/Messages.properties (original)
+++ xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/codec/Messages.properties Mon Feb 22 08:28:54 2016
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
FileCacheSeekableStream0=pos < 0.
FileSeekableStream0=pos < 0.
FloatDoubleColorModel0=transferType must be DataBuffer.TYPE_FLOAT or DataBuffer.TYPE_DOUBLE.
Modified: xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties (original)
+++ xmlgraphics/commons/branches/maven/src/main/resources/org/apache/xmlgraphics/image/writer/default-preferred-order.properties Mon Feb 22 08:28:54 2016
@@ -1,2 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
org.apache.xmlgraphics.image.writer.internal=-2000
org.apache.xmlgraphics.image.writer.imageio=-1000
\ No newline at end of file
Modified: xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/io/URIResolverAdapterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/io/URIResolverAdapterTestCase.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/io/URIResolverAdapterTestCase.java (original)
+++ xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/io/URIResolverAdapterTestCase.java Mon Feb 22 08:28:54 2016
@@ -40,7 +40,7 @@ public class URIResolverAdapterTestCase
private final URI textFileURI = URI.create("test:catalog:resolver:testResource.txt");
private final URI httpURL = URI.create("test:http:protocol:test.html");
- private final String pathOfTestFile = "test/resources/org/apache/xmlgraphics/io/test-catalog.xml";
+ private final String pathOfTestFile = "src/test/resources/org/apache/xmlgraphics/io/test-catalog.xml";
@Before
public void setUp() {
Modified: xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java?rev=1731596&r1=1731595&r2=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java (original)
+++ xmlgraphics/commons/branches/maven/src/test/java/org/apache/xmlgraphics/util/io/Base64TestCase.java Mon Feb 22 08:28:54 2016
@@ -75,7 +75,7 @@ public class Base64TestCase {
}
private void innerBase64Test(String action, String in, String ref) throws Exception {
- final String baseURL = "file:test/resources/org/apache/xmlgraphics/util/io/";
+ final String baseURL = "file:src/test/resources/org/apache/xmlgraphics/util/io/";
innerBase64Test(action, new URL(baseURL + in), new URL(baseURL + ref));
}
Added: xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/LICENSE.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/LICENSE.txt?rev=1731596&view=auto
==============================================================================
--- xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/LICENSE.txt (added)
+++ xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/LICENSE.txt Mon Feb 22 08:28:54 2016
@@ -0,0 +1,14 @@
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
Copied: xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.xml (from r1731510, xmlgraphics/commons/branches/maven/checkstyle-5.5.xml)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.xml?p2=xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.xml&p1=xmlgraphics/commons/branches/maven/checkstyle-5.5.xml&r1=1731510&r2=1731596&rev=1731596&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/checkstyle-5.5.xml (original)
+++ xmlgraphics/commons/branches/maven/src/tools/resources/checkstyle/checkstyle.xml Mon Feb 22 08:28:54 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>
<!-- ===================================================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org