Author: sebb
Date: Sat May 9 11:10:19 2009
New Revision: 773200
URL: http://svn.apache.org/viewvc?rev=773200&view=rev
Log:
Migrate from Batik codecs to xmlgraphics-commons codecs
Added:
jakarta/jmeter/trunk/lib/xmlgraphics-commons-1.3.1.jar (with props)
Removed:
jakarta/jmeter/trunk/lib/batik-codec-1.7.jar
Modified:
jakarta/jmeter/trunk/build.properties
jakarta/jmeter/trunk/build.xml
jakarta/jmeter/trunk/lib/aareadme.txt
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=773200&r1=773199&r2=773200&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Sat May 9 11:10:19 2009
@@ -17,7 +17,6 @@
apache-bsf.jar = ${lib.dir}/bsf-2.4.0.jar
avalon-framework.jar = ${lib.dir}/avalon-framework-4.1.4.jar
-batik-codec.jar = ${lib.dir}/batik-codec-1.7.jar
commons-codec.jar = ${lib.dir}/commons-codec-1.3.jar
commons-collections.jar = ${lib.dir}/commons-collections-3.2.jar
@@ -56,6 +55,9 @@
xerces.jar = ${lib.dir}/xercesImpl-2_9_1.jar
xml-apis.jar = ${lib.dir}/xml-apis-2_9_1.jar
+# Codecs were previously provided by Batik
+xmlgraphics-commons.jar = ${lib.dir}/xmlgraphics-commons-1.3.1.jar
+
# Geronimo API jars
activation.jar = ${lib.api}/geronimo-activation_1.0.2_spec-1.1.jar
javamail.jar = ${lib.api}/geronimo-javamail_1.3.1_spec-1.1.jar
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=773200&r1=773199&r2=773200&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat May 9 11:10:19 2009
@@ -298,7 +298,7 @@
<patternset id="external.jars">
<include name="${apache-bsf.jar}"/>
<include name="${avalon-framework.jar}"/>
- <include name="${batik-codec.jar}"/>
+ <include name="${xmlgraphics-commons.jar}"/>
<include name="${commons-codec.jar}"/>
<include name="${commons-collections.jar}"/>
<include name="${commons-httpclient.jar}"/>
@@ -350,7 +350,7 @@
<!-- Externally produced jars -->
<pathelement location="${apache-bsf.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${batik-codec.jar}"/>
+ <pathelement location="${xmlgraphics-commons.jar}"/>
<pathelement location="${commons-codec.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
Modified: jakarta/jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/lib/aareadme.txt?rev=773200&r1=773199&r2=773200&view=diff
==============================================================================
--- jakarta/jmeter/trunk/lib/aareadme.txt (original)
+++ jakarta/jmeter/trunk/lib/aareadme.txt Sat May 9 11:10:19 2009
@@ -7,9 +7,9 @@
- LogKit (used by HttpClient ?)
- Configuration (ResultCollector, SaveService, SampleResult, TestElementSaver)
-batik-codec-1.7 (org.apache.batik.ext.image.codec)
+xmlgraphics-commons-1.3.1 (org.apache.xmlgraphics.image.codec)
------------------
-Download: http://xmlgraphics.apache.org/batik/download.cgi
+http://xmlgraphics.apache.org/commons/download.html
- SaveGraphicsService
commons-codec-1.3
Added: jakarta/jmeter/trunk/lib/xmlgraphics-commons-1.3.1.jar
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/lib/xmlgraphics-commons-1.3.1.jar?rev=773200&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/trunk/lib/xmlgraphics-commons-1.3.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java?rev=773200&r1=773199&r2=773200&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
Sat May 9 11:10:19 2009
@@ -28,10 +28,10 @@
import javax.swing.JComponent;
-import org.apache.batik.ext.awt.image.codec.png.PNGEncodeParam;
-import org.apache.batik.ext.awt.image.codec.png.PNGImageEncoder;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFEncodeParam;
-import org.apache.batik.ext.awt.image.codec.tiff.TIFFImageEncoder;
+import org.apache.xmlgraphics.image.codec.png.PNGEncodeParam;
+import org.apache.xmlgraphics.image.codec.png.PNGImageEncoder;
+import org.apache.xmlgraphics.image.codec.tiff.TIFFEncodeParam;
+import org.apache.xmlgraphics.image.codec.tiff.TIFFImageEncoder;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.util.JOrphanUtils;
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=773200&r1=773199&r2=773200&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat May 9 11:10:19 2009
@@ -271,7 +271,7 @@
<li>Moved PreProcessor invocation to JMeterThread class</li>
<li>Made HashTree Map field final</li>
<li>Improve performance of calling ResultCollector#isSampleWanted() for
multiple samples</li>
-<li>Updated to new versions of: batik-codec (1.7), jdom (1.1), xstream
(1.3.1), velocity (1.6.2)</li>
+<li>Updated to new versions of: xmlgraphics-commons (1.3.1), jdom (1.1),
xstream (1.3.1), velocity (1.6.2)</li>
</ul>
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
