You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ga...@apache.org on 2016/02/25 07:33:36 UTC
svn commit: r1732251 - in /xmlgraphics/batik/branches/maven: ./ batik-all/
batik-all/src/ batik-all/src/tools/ batik-all/src/tools/resources/
batik-all/src/tools/resources/assembly/ batik-anim/ batik-awt-util/
batik-awt-util/src/main/resources/org/apac...
Author: gadams
Date: Thu Feb 25 06:33:35 2016
New Revision: 1732251
URL: http://svn.apache.org/viewvc?rev=1732251&view=rev
Log:
Initial junit tests (partial); add batik-all module to create aggregate artifact; ensure ant all-jar target functions.
Added:
xmlgraphics/batik/branches/maven/batik-all/ (with props)
xmlgraphics/batik/branches/maven/batik-all/pom.xml (with props)
xmlgraphics/batik/branches/maven/batik-all/src/
xmlgraphics/batik/branches/maven/batik-all/src/tools/
xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/
xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/
xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml (with props)
xmlgraphics/batik/branches/maven/batik-awt-util/src/main/resources/org/apache/batik/ext/awt/image/spi/
xmlgraphics/batik/branches/maven/batik-awt-util/src/main/resources/org/apache/batik/ext/awt/image/spi/resources/
- copied from r1721872, xmlgraphics/batik/branches/maven/batik-awt-util/src/main/resources/org/apache/batik/ext/awt/image/resources/
xmlgraphics/batik/branches/maven/batik-constants/ (with props)
xmlgraphics/batik/branches/maven/batik-constants/pom.xml
xmlgraphics/batik/branches/maven/batik-constants/src/
xmlgraphics/batik/branches/maven/batik-constants/src/main/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/org/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/org/apache/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/org/apache/batik/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/org/apache/batik/util/
xmlgraphics/batik/branches/maven/batik-constants/src/main/java/org/apache/batik/util/XMLConstants.java
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/util/XMLConstants.java
xmlgraphics/batik/branches/maven/batik-extension/src/main/resources/org/apache/batik/extensions/
- copied from r1721872, xmlgraphics/batik/branches/maven/batik-extension/src/main/resources/org/apache/batik/extension/
xmlgraphics/batik/branches/maven/batik-i18n/ (with props)
xmlgraphics/batik/branches/maven/batik-i18n/pom.xml
xmlgraphics/batik/branches/maven/batik-i18n/src/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/ExtendedLocalizable.java
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/ExtendedLocalizable.java
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/LocaleGroup.java
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/LocaleGroup.java
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/Localizable.java
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/Localizable.java
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/LocalizableSupport.java
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/LocalizableSupport.java
xmlgraphics/batik/branches/maven/batik-i18n/src/main/java/org/apache/batik/i18n/package.html
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/package.html
xmlgraphics/batik/branches/maven/batik-parser/src/main/resources/org/apache/batik/parser/style/
- copied from r1721872, xmlgraphics/batik/branches/maven/batik-parser/src/main/java/org/apache/batik/parser/style/
xmlgraphics/batik/branches/maven/batik-svgbrowser/src/main/resources/META-INF/
xmlgraphics/batik/branches/maven/batik-svgbrowser/src/main/resources/META-INF/services/
xmlgraphics/batik/branches/maven/batik-svgbrowser/src/main/resources/META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/resources/META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/fourByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/fourByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/fourByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/fourByte.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/large
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/large
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/medium
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/medium.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/medium.pc.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium.pc.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/oneByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/oneByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/oneByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/oneByte.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/small
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/small
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/small.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/small.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/tenByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/tenByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/tenByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/tenByte.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/threeByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/threeByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/threeByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/threeByte.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/twoByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/twoByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/twoByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/twoByte.64
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/zeroByte
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/zeroByte
xmlgraphics/batik/branches/maven/batik-util/src/test/resources/org/apache/batik/util/zeroByte.64
- copied unchanged from r1721872, xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/zeroByte.64
Removed:
xmlgraphics/batik/branches/maven/batik-awt-util/src/main/resources/org/apache/batik/ext/awt/image/resources/
xmlgraphics/batik/branches/maven/batik-awt-util/src/main/resources/org/apache/batik/ext/image/
xmlgraphics/batik/branches/maven/batik-extension/src/main/resources/org/apache/batik/extension/
xmlgraphics/batik/branches/maven/batik-parser/src/main/java/org/apache/batik/parser/style/
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/ExtendedLocalizable.java
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/LocaleGroup.java
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/Localizable.java
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/LocalizableSupport.java
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/i18n/package.html
xmlgraphics/batik/branches/maven/batik-util/src/main/java/org/apache/batik/util/XMLConstants.java
xmlgraphics/batik/branches/maven/resources/
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/fourByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/fourByte.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/large
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/medium.pc.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/oneByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/oneByte.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/small
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/small.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/tenByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/tenByte.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/threeByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/threeByte.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/twoByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/twoByte.64
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/zeroByte
xmlgraphics/batik/branches/maven/test-references/org/apache/batik/util/zeroByte.64
Modified:
xmlgraphics/batik/branches/maven/ (props changed)
xmlgraphics/batik/branches/maven/batik-anim/ (props changed)
xmlgraphics/batik/branches/maven/batik-awt-util/ (props changed)
xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml
xmlgraphics/batik/branches/maven/batik-bridge/ (props changed)
xmlgraphics/batik/branches/maven/batik-bridge/pom.xml
xmlgraphics/batik/branches/maven/batik-codec/ (props changed)
xmlgraphics/batik/branches/maven/batik-css/ (props changed)
xmlgraphics/batik/branches/maven/batik-css/pom.xml
xmlgraphics/batik/branches/maven/batik-dom/ (props changed)
xmlgraphics/batik/branches/maven/batik-ext/ (props changed)
xmlgraphics/batik/branches/maven/batik-extension/ (props changed)
xmlgraphics/batik/branches/maven/batik-gui-util/ (props changed)
xmlgraphics/batik/branches/maven/batik-gvt/ (props changed)
xmlgraphics/batik/branches/maven/batik-parser/ (props changed)
xmlgraphics/batik/branches/maven/batik-rasterizer/ (props changed)
xmlgraphics/batik/branches/maven/batik-rasterizer-ext/ (props changed)
xmlgraphics/batik/branches/maven/batik-script/ (props changed)
xmlgraphics/batik/branches/maven/batik-slideshow/ (props changed)
xmlgraphics/batik/branches/maven/batik-squiggle/ (props changed)
xmlgraphics/batik/branches/maven/batik-squiggle-ext/ (props changed)
xmlgraphics/batik/branches/maven/batik-svg-dom/ (props changed)
xmlgraphics/batik/branches/maven/batik-svgbrowser/ (props changed)
xmlgraphics/batik/branches/maven/batik-svggen/ (props changed)
xmlgraphics/batik/branches/maven/batik-svgpp/ (props changed)
xmlgraphics/batik/branches/maven/batik-svgrasterizer/ (props changed)
xmlgraphics/batik/branches/maven/batik-swing/ (props changed)
xmlgraphics/batik/branches/maven/batik-test/ (props changed)
xmlgraphics/batik/branches/maven/batik-test-svg/ (props changed)
xmlgraphics/batik/branches/maven/batik-test-swing/ (props changed)
xmlgraphics/batik/branches/maven/batik-test-util/ (props changed)
xmlgraphics/batik/branches/maven/batik-test/pom.xml
xmlgraphics/batik/branches/maven/batik-transcoder/ (props changed)
xmlgraphics/batik/branches/maven/batik-ttf2svg/ (props changed)
xmlgraphics/batik/branches/maven/batik-util/ (props changed)
xmlgraphics/batik/branches/maven/batik-util/pom.xml
xmlgraphics/batik/branches/maven/batik-util/src/test/java/org/apache/batik/util/Base64TestCases.java
xmlgraphics/batik/branches/maven/batik-xml/ (props changed)
xmlgraphics/batik/branches/maven/build.xml
xmlgraphics/batik/branches/maven/pom.xml
Propchange: xmlgraphics/batik/branches/maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -1,5 +1,9 @@
-classes
-build.properties
-test-reports
+.classpath
+.project
+.settings
batik-[0-9].[0-9]*
+build.properties
+classes
site
+target
+test-reports
Propchange: xmlgraphics/batik/branches/maven/batik-all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: xmlgraphics/batik/branches/maven/batik-all/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-all/pom.xml?rev=1732251&view=auto
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-all/pom.xml (added)
+++ xmlgraphics/batik/branches/maven/batik-all/pom.xml Thu Feb 25 06:33:35 2016
@@ -0,0 +1,216 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+<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>
+
+ <artifactId>batik-all</artifactId>
+ <name>${project.groupId}:${project.artifactId}</name>
+ <description>Batik aggregate artifact</description>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-anim</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-codec</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-constants</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-dom</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-extension</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-gui-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-i18n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-parser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-rasterizer-ext</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-rasterizer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-script</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-slideshow</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-squiggle-ext</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-squiggle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-svgbrowser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-svgpp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-svgrasterizer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-swing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-ttf2svg</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>${project.version}</version>
+ </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/batik/branches/maven/batik-all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml?rev=1732251&view=auto
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml (added)
+++ xmlgraphics/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml Thu Feb 25 06:33:35 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/batik/branches/maven/batik-all/src/tools/resources/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/batik/branches/maven/batik-anim/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-awt-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-awt-util/pom.xml Thu Feb 25 06:33:35 2016
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>xmlgraphics-commons</artifactId>
<version>${xmlgraphics.commons.version}</version>
</dependency>
</dependencies>
Propchange: xmlgraphics/batik/branches/maven/batik-bridge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/batik-bridge/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-bridge/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-bridge/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-bridge/pom.xml Thu Feb 25 06:33:35 2016
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>xmlgraphics-commons</artifactId>
<version>${xmlgraphics.commons.version}</version>
</dependency>
<dependency>
Propchange: xmlgraphics/batik/branches/maven/batik-codec/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-constants/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: xmlgraphics/batik/branches/maven/batik-constants/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-constants/pom.xml?rev=1732251&view=auto
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-constants/pom.xml (added)
+++ xmlgraphics/batik/branches/maven/batik-constants/pom.xml Thu Feb 25 06:33:35 2016
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+<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>
+
+ <artifactId>batik-constants</artifactId>
+ <name>${project.groupId}:${project.artifactId}</name>
+ <description>Batik constants library</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </parent>
+
+</project>
Propchange: xmlgraphics/batik/branches/maven/batik-css/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/batik-css/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-css/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-css/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-css/pom.xml Thu Feb 25 06:33:35 2016
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>xmlgraphics-commons</artifactId>
<version>${xmlgraphics.commons.version}</version>
</dependency>
<dependency>
Propchange: xmlgraphics/batik/branches/maven/batik-dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-ext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-extension/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-gui-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-gvt/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-i18n/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: xmlgraphics/batik/branches/maven/batik-i18n/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-i18n/pom.xml?rev=1732251&view=auto
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-i18n/pom.xml (added)
+++ xmlgraphics/batik/branches/maven/batik-i18n/pom.xml Thu Feb 25 06:33:35 2016
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+<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>
+
+ <artifactId>batik-i18n</artifactId>
+ <name>${project.groupId}:${project.artifactId}</name>
+ <description>Batik i18n library</description>
+
+ <parent>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </parent>
+
+</project>
Propchange: xmlgraphics/batik/branches/maven/batik-parser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-rasterizer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-rasterizer-ext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-script/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-slideshow/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-squiggle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-squiggle-ext/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-svg-dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-svgbrowser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-svggen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-svgpp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-svgrasterizer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-swing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-test-svg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-test-swing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-test-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/batik-test/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-test/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-test/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-test/pom.xml Thu Feb 25 06:33:35 2016
@@ -37,9 +37,29 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>batik-util</artifactId>
+ <artifactId>batik-constants</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-i18n</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/MemoryLeakTest*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
Propchange: xmlgraphics/batik/branches/maven/batik-transcoder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-ttf2svg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: xmlgraphics/batik/branches/maven/batik-util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/batik-util/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-util/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-util/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/batik-util/pom.xml Thu Feb 25 06:33:35 2016
@@ -34,4 +34,45 @@
<version>1.9.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-constants</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-i18n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>batik-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <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>
+ </build>
+
</project>
Modified: xmlgraphics/batik/branches/maven/batik-util/src/test/java/org/apache/batik/util/Base64TestCases.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/batik-util/src/test/java/org/apache/batik/util/Base64TestCases.java?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/batik-util/src/test/java/org/apache/batik/util/Base64TestCases.java (original)
+++ xmlgraphics/batik/branches/maven/batik-util/src/test/java/org/apache/batik/util/Base64TestCases.java Thu Feb 25 06:33:35 2016
@@ -1,21 +1,154 @@
package org.apache.batik.util;
+import java.net.URL;
+
import org.junit.Test;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
public class Base64TestCases {
@Test
- public void testZeroByteEncode() throws Exception {
- performTest("ENCODE", "zeroByte", "zeroByte.64");
+ public void testB64_1() throws Exception {
+ performTest("B64.1", "ENCODE", "zeroByte", "zeroByte.64");
+ }
+
+ @Test
+ public void testB64_2() throws Exception {
+ performTest("B64.2", "DECODE", "zeroByte.64", "zeroByte");
+ }
+
+ @Test
+ public void testB64_3() throws Exception {
+ performTest("B64.3", "ROUND", "zeroByte", null);
+ }
+
+ @Test
+ public void testB64_4() throws Exception {
+ performTest("B64.4", "ENCODE", "oneByte", "oneByte.64");
}
@Test
- public void testZeroByteDecode() throws Exception {
- performTest("DECODE", "zeroByte.64", "zeroByte");
+ public void testB64_5() throws Exception {
+ performTest("B64.5", "DECODE", "oneByte.64", "oneByte");
+ }
+
+ @Test
+ public void testB64_6() throws Exception {
+ performTest("B64.6", "ROUND", "oneByte", null);
+ }
+
+ @Test
+ public void testB64_7() throws Exception {
+ performTest("B64.4", "ENCODE", "twoByte", "twoByte.64");
+ }
+
+ @Test
+ public void testB64_8() throws Exception {
+ performTest("B64.4", "DECODE", "twoByte.64", "twoByte");
+ }
+
+ @Test
+ public void testB64_9() throws Exception {
+ performTest("B64.9", "ROUND", "twoByte", null);
+ }
+
+ @Test
+ public void testB64_10() throws Exception {
+ performTest("B64.10", "ENCODE", "threeByte", "threeByte.64");
+ }
+
+ @Test
+ public void testB64_11() throws Exception {
+ performTest("B64.11", "DECODE", "threeByte.64", "threeByte");
+ }
+
+ @Test
+ public void testB64_12() throws Exception {
+ performTest("B64.12", "ROUND", "threeByte", null);
+ }
+
+ @Test
+ public void testB64_13() throws Exception {
+ performTest("B64.13", "ENCODE", "fourByte", "fourByte.64");
+ }
+
+ @Test
+ public void testB64_14() throws Exception {
+ performTest("B64.14", "DECODE", "fourByte.64", "fourByte");
+ }
+
+ @Test
+ public void testB64_15() throws Exception {
+ performTest("B64.15", "ROUND", "fourByte", null);
+ }
+
+ @Test
+ public void testB64_16() throws Exception {
+ performTest("B64.16", "ENCODE", "tenByte", "tenByte.64");
+ }
+
+ @Test
+ public void testB64_17() throws Exception {
+ performTest("B64.17", "DECODE", "tenByte.64", "tenByte");
+ }
+
+ @Test
+ public void testB64_18() throws Exception {
+ performTest("B64.18", "ROUND", "tenByte", null);
+ }
+
+ @Test
+ public void testB64_19() throws Exception {
+ performTest("B64.19", "ENCODE", "small", "small.64");
+ }
+
+ @Test
+ public void testB64_20() throws Exception {
+ performTest("B64.20", "DECODE", "small.64", "small");
+ }
+
+ @Test
+ public void testB64_21() throws Exception {
+ performTest("B64.21", "ROUND", "small", null);
+ }
+
+ @Test
+ public void testB64_22() throws Exception {
+ performTest("B64.22", "ENCODE", "medium", "medium.64");
+ }
+
+ @Test
+ public void testB64_23() throws Exception {
+ performTest("B64.23", "DECODE", "medium.64", "medium");
+ }
+
+ @Test
+ public void testB64_24() throws Exception {
+ performTest("B64.24", "DECODE", "medium.pc.64", "medium");
+ }
+
+ @Test
+ public void testB64_25() throws Exception {
+ performTest("B64.25", "ROUND", "medium", null);
+ }
+
+ @Test
+ public void testB64_26() throws Exception {
+ performTest("B64.26", "ROUND", "large", null);
+ }
+
+ private void performTest(String id, String action, String in, String ref) {
+ performTestCont(id, action, in != null ? getResource(in) : null, ref != null ? getResource(ref) : null);
+ }
+
+ private void performTestCont(String id, String action, URL in, URL ref) {
+ Base64Test t = new Base64Test(action, in, ref);
+ t.setId(id);
+ assertTrue(t.run().hasPassed());
}
- private void performTest(String action, String ifName, String ofName) {
+ private URL getResource(String name) {
+ return getClass().getResource(name);
}
}
Propchange: xmlgraphics/batik/branches/maven/batik-xml/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 06:33:35 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: xmlgraphics/batik/branches/maven/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/build.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/build.xml (original)
+++ xmlgraphics/batik/branches/maven/build.xml Thu Feb 25 06:33:35 2016
@@ -889,8 +889,35 @@ JAVA=/usr/bin/java
determine-svn-revision-set"/>
<target name="determine-svn-revision-svn-info" depends="init">
- <dirset id="dirs" dir="${src}/${package-prefix}">
- <include name="**"/>
+ <dirset id="dirs" dir="${basedir}">
+ <include name="batik-anim/src/main/java/${package-prefix}/**"/>
+ <include name="batik-awt-util/src/main/java/${package-prefix}/**"/>
+ <include name="batik-bridge/src/main/java/${package-prefix}/**"/>
+ <include name="batik-codec/src/main/java/${package-prefix}/**"/>
+ <include name="batik-constants/src/main/java/${package-prefix}/**"/>
+ <include name="batik-css/src/main/java/${package-prefix}/**"/>
+ <include name="batik-dom/src/main/java/${package-prefix}/**"/>
+ <include name="batik-ext/src/main/java/${package-prefix}/**"/>
+ <include name="batik-extension/src/main/java/${package-prefix}/**"/>
+ <include name="batik-gui-util/src/main/java/${package-prefix}/**"/>
+ <include name="batik-gvt/src/main/java/${package-prefix}/**"/>
+ <include name="batik-i18n/src/main/java/${package-prefix}/**"/>
+ <include name="batik-parser/src/main/java/${package-prefix}/**"/>
+ <include name="batik-rasterizer/src/main/java/${package-prefix}/**"/>
+ <include name="batik-rasterizer-ext/src/main/java/${package-prefix}/**"/>
+ <include name="batik-script/src/main/java/${package-prefix}/**"/>
+ <include name="batik-slideshow/src/main/java/${package-prefix}/**"/>
+ <include name="batik-squiggle/src/main/java/${package-prefix}/**"/>
+ <include name="batik-svg-dom/src/main/java/${package-prefix}/**"/>
+ <include name="batik-svgbrowser/src/main/java/${package-prefix}/**"/>
+ <include name="batik-svggen/src/main/java/${package-prefix}/**"/>
+ <include name="batik-svgpp/src/main/java/${package-prefix}/**"/>
+ <include name="batik-svgrasterizer/src/main/java/${package-prefix}/**"/>
+ <include name="batik-swing/src/main/java/${package-prefix}/**"/>
+ <include name="batik-transcoder/src/main/java/${package-prefix}/**"/>
+ <include name="batik-ttf2svg/src/main/java/${package-prefix}/**"/>
+ <include name="batik-util/src/main/java/${package-prefix}/**"/>
+ <include name="batik-xml/src/main/java/${package-prefix}/**"/>
</dirset>
<pathconvert refid="dirs" pathsep=" " property="svn-info-dirs"/>
<exec executable="svn" output="svn-info.xml"
@@ -946,7 +973,34 @@ JAVA=/usr/bin/java
<javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8"
includeAntRuntime="true">
- <src path="${src}"/>
+ <src path="batik-anim/src/main/java"/>
+ <src path="batik-awt-util/src/main/java"/>
+ <src path="batik-bridge/src/main/java"/>
+ <src path="batik-codec/src/main/java"/>
+ <src path="batik-constants/src/main/java"/>
+ <src path="batik-css/src/main/java"/>
+ <src path="batik-dom/src/main/java"/>
+ <src path="batik-ext/src/main/java"/>
+ <src path="batik-extension/src/main/java"/>
+ <src path="batik-gui-util/src/main/java"/>
+ <src path="batik-gvt/src/main/java"/>
+ <src path="batik-i18n/src/main/java"/>
+ <src path="batik-parser/src/main/java"/>
+ <src path="batik-rasterizer/src/main/java"/>
+ <src path="batik-rasterizer-ext/src/main/java"/>
+ <src path="batik-script/src/main/java"/>
+ <src path="batik-slideshow/src/main/java"/>
+ <src path="batik-squiggle/src/main/java"/>
+ <src path="batik-svg-dom/src/main/java"/>
+ <src path="batik-svgbrowser/src/main/java"/>
+ <src path="batik-svggen/src/main/java"/>
+ <src path="batik-svgpp/src/main/java"/>
+ <src path="batik-svgrasterizer/src/main/java"/>
+ <src path="batik-swing/src/main/java"/>
+ <src path="batik-transcoder/src/main/java"/>
+ <src path="batik-ttf2svg/src/main/java"/>
+ <src path="batik-util/src/main/java"/>
+ <src path="batik-xml/src/main/java"/>
<classpath refid="libs-classpath"/>
<exclude name="**/*.html"/>
<exclude name="**/rhino/*" unless="rhino.present"/>
@@ -1043,7 +1097,82 @@ JAVA=/usr/bin/java
<fileset dir="${dest}" excludes="**/.svn/">
<include name="**"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-anim/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-awt-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-bridge/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-codec/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-css/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-dom/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-ext/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-extension/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-gui-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-gvt/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-parser/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-rasterizer/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-rasterizer-ext/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-script/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-slideshow/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-squiggle/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svg-dom/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svggen/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgpp/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgrasterizer/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-swing/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-transcoder/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-ttf2svg/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-xml/src/main/resources" excludes="**/.svn/">
<include name="**"/>
</fileset>
</jar>
@@ -1064,7 +1193,82 @@ JAVA=/usr/bin/java
<include name="org/apache/batik/**"/>
<include name="org/w3c/**"/>
</fileset>
- <fileset dir="${resources}" excludes="**/.svn/">
+ <fileset dir="batik-anim/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-awt-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-bridge/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-codec/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-css/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-dom/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-ext/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-extension/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-gui-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-gvt/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-parser/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-rasterizer/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-rasterizer-ext/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-script/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-slideshow/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-squiggle/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svg-dom/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svggen/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgpp/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-svgrasterizer/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-swing/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-transcoder/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-ttf2svg/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-util/src/main/resources" excludes="**/.svn/">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="batik-xml/src/main/resources" excludes="**/.svn/">
<include name="**"/>
</fileset>
</jar>
Modified: xmlgraphics/batik/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/maven/pom.xml?rev=1732251&r1=1732250&r2=1732251&view=diff
==============================================================================
--- xmlgraphics/batik/branches/maven/pom.xml (original)
+++ xmlgraphics/batik/branches/maven/pom.xml Thu Feb 25 06:33:35 2016
@@ -21,6 +21,7 @@
<java.version>1.6</java.version>
<junit.version>4.11</junit.version>
<jython.version>2.7.0</jython.version>
+ <org.slf4j.simpleLogger.defaultLogLevel>error</org.slf4j.simpleLogger.defaultLogLevel>
<project.info.reports.version>2.8</project.info.reports.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<release.version>2.5.2</release.version>
@@ -28,7 +29,7 @@
<surefire.version>2.18.1</surefire.version>
<xalan.version>2.7.2</xalan.version>
<xmlapis.version>1.3.04</xmlapis.version>
- <xmlgraphics.commons.version>2.1.0-SNAPSHOT</xmlgraphics.commons.version>
+ <xmlgraphics.commons.version>2.2.0-SNAPSHOT</xmlgraphics.commons.version>
</properties>
<mailingLists>
@@ -79,23 +80,26 @@
</distributionManagement>
<modules>
+ <module>batik-all</module>
<module>batik-anim</module>
<module>batik-awt-util</module>
<module>batik-bridge</module>
<module>batik-codec</module>
+ <module>batik-constants</module>
<module>batik-css</module>
<module>batik-dom</module>
<module>batik-ext</module>
<module>batik-extension</module>
<module>batik-gui-util</module>
<module>batik-gvt</module>
+ <module>batik-i18n</module>
<module>batik-parser</module>
- <module>batik-rasterizer</module>
<module>batik-rasterizer-ext</module>
+ <module>batik-rasterizer</module>
<module>batik-script</module>
<module>batik-slideshow</module>
- <module>batik-squiggle</module>
<module>batik-squiggle-ext</module>
+ <module>batik-squiggle</module>
<module>batik-svg-dom</module>
<module>batik-svgbrowser</module>
<module>batik-svggen</module>
@@ -103,13 +107,15 @@
<module>batik-svgrasterizer</module>
<module>batik-swing</module>
<module>batik-test</module>
- <module>batik-test-svg</module>
- <module>batik-test-swing</module>
- <module>batik-test-util</module>
<module>batik-transcoder</module>
- <module>batik-ttf2svg</module>
<module>batik-util</module>
+ <module>batik-ttf2svg</module>
<module>batik-xml</module>
+<!--
+ <module>batik-test-svg</module>
+ <module>batik-test-swing</module>
+ <module>batik-test-util</module>
+-->
</modules>
<build>