Revision: 6401
http://sourceforge.net/p/jump-pilot/code/6401
Author: edso
Date: 2020-09-01 12:34:31 +0000 (Tue, 01 Sep 2020)
Log Message:
-----------
revert upgrade to batik 1.6.1
manually incl. needed jars during packaging circumventing including unneeded
dependency jars
Modified Paths:
--------------
core/trunk/etc/mvn/cmp_plus.xml
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
Added Paths:
-----------
core/trunk/lib/batik-awt-util-1.6.jar
core/trunk/lib/batik-dom-1.6.jar
core/trunk/lib/batik-svg-dom-1.6.jar
core/trunk/lib/batik-svggen-1.6.jar
core/trunk/lib/batik-transcoder-1.6.jar
core/trunk/lib/batik-util-1.6.jar
core/trunk/lib/batik-xml-1.6.jar
Removed Paths:
-------------
core/trunk/lib/batik-all-1.6.1.jar
Modified: core/trunk/etc/mvn/cmp_plus.xml
===================================================================
--- core/trunk/etc/mvn/cmp_plus.xml 2020-08-31 12:02:20 UTC (rev 6400)
+++ core/trunk/etc/mvn/cmp_plus.xml 2020-09-01 12:34:31 UTC (rev 6401)
@@ -5,11 +5,11 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <!-- include batik only in PLUS build -->
- <includes>
- <include>batik:*</include>
- <include>js:*</include>
- </includes>
+ <!-- include batik in PLUS build via copying jars from lib/ folder below
-->
+ <excludes>
+ <exclude>batik:*</exclude>
+ <exclude>js:*</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
<fileSets>
@@ -28,5 +28,12 @@
<directory>lib/plus</directory>
<outputDirectory>/lib/ext</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>lib/</directory>
+ <outputDirectory>/lib/</outputDirectory>
+ <includes>
+ <include>batik-*.jar</include>
+ </includes>
+ </fileSet>
</fileSets>
</component>
\ No newline at end of file
Deleted: core/trunk/lib/batik-all-1.6.1.jar
===================================================================
(Binary files differ)
Added: core/trunk/lib/batik-awt-util-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-awt-util-1.6.jar
===================================================================
--- core/trunk/lib/batik-awt-util-1.6.jar 2020-08-31 12:02:20 UTC (rev
6400)
+++ core/trunk/lib/batik-awt-util-1.6.jar 2020-09-01 12:34:31 UTC (rev
6401)
Property changes on: core/trunk/lib/batik-awt-util-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-dom-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-dom-1.6.jar
===================================================================
--- core/trunk/lib/batik-dom-1.6.jar 2020-08-31 12:02:20 UTC (rev 6400)
+++ core/trunk/lib/batik-dom-1.6.jar 2020-09-01 12:34:31 UTC (rev 6401)
Property changes on: core/trunk/lib/batik-dom-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-svg-dom-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-svg-dom-1.6.jar
===================================================================
--- core/trunk/lib/batik-svg-dom-1.6.jar 2020-08-31 12:02:20 UTC (rev
6400)
+++ core/trunk/lib/batik-svg-dom-1.6.jar 2020-09-01 12:34:31 UTC (rev
6401)
Property changes on: core/trunk/lib/batik-svg-dom-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-svggen-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-svggen-1.6.jar
===================================================================
--- core/trunk/lib/batik-svggen-1.6.jar 2020-08-31 12:02:20 UTC (rev 6400)
+++ core/trunk/lib/batik-svggen-1.6.jar 2020-09-01 12:34:31 UTC (rev 6401)
Property changes on: core/trunk/lib/batik-svggen-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-transcoder-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-transcoder-1.6.jar
===================================================================
--- core/trunk/lib/batik-transcoder-1.6.jar 2020-08-31 12:02:20 UTC (rev
6400)
+++ core/trunk/lib/batik-transcoder-1.6.jar 2020-09-01 12:34:31 UTC (rev
6401)
Property changes on: core/trunk/lib/batik-transcoder-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-util-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-util-1.6.jar
===================================================================
--- core/trunk/lib/batik-util-1.6.jar 2020-08-31 12:02:20 UTC (rev 6400)
+++ core/trunk/lib/batik-util-1.6.jar 2020-09-01 12:34:31 UTC (rev 6401)
Property changes on: core/trunk/lib/batik-util-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/batik-xml-1.6.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-xml-1.6.jar
===================================================================
--- core/trunk/lib/batik-xml-1.6.jar 2020-08-31 12:02:20 UTC (rev 6400)
+++ core/trunk/lib/batik-xml-1.6.jar 2020-09-01 12:34:31 UTC (rev 6401)
Property changes on: core/trunk/lib/batik-xml-1.6.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified:
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
===================================================================
---
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
2020-08-31 12:02:20 UTC (rev 6400)
+++
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
2020-09-01 12:34:31 UTC (rev 6401)
@@ -37,7 +37,7 @@
import org.openjump.core.ui.util.LayerableUtil;
import org.openjump.sextante.core.ObjectAndDescription;
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.svg.SVGDocument;
+import org.w3c.dom.Document;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -401,7 +401,7 @@
// Get a SVGDOMImplementation and create an XML document
DOMImplementation domImpl =
SVGDOMImplementation.getDOMImplementation();
String svgNS = "http://www.w3.org/2000/svg";;
- SVGDocument svgDocument = (SVGDocument)
domImpl.createDocument(svgNS, "svg", null);
+ Document svgDocument = domImpl.createDocument(svgNS, "svg",
null);
// Create an instance of the SVG Generator
SVGGraphics2D svgGenerator = new SVGGraphics2D(svgDocument);
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
