From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Tue, 13 Sep 2016 13:46:56 +0000 (+0300)
Subject: Removed standard xml packages from apache and import them from elsewhere
X-Git-Tag: v1.25.0~123^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=2e00706ab0e92835dde7044c43ae569bdce8a074;hp=402384bf9afa895e925d9d2593a81e99ab99eab9

Removed standard xml packages from apache and import them from elsewhere

Change-Id: I9499e63a4905bea38461d9ead48dcea68ea6f77b
---

diff --git a/bundles/org.apache.batik/.classpath b/bundles/org.apache.batik/.classpath
index 4a8d60f3c..93684ddba 100644
--- a/bundles/org.apache.batik/.classpath
+++ b/bundles/org.apache.batik/.classpath
@@ -11,8 +11,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xerces_2_5_0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.8.jar"/>
diff --git a/bundles/org.apache.batik/META-INF/MANIFEST.MF b/bundles/org.apache.batik/META-INF/MANIFEST.MF
index aebf12801..b8a5093e8 100644
--- a/bundles/org.apache.batik/META-INF/MANIFEST.MF
+++ b/bundles/org.apache.batik/META-INF/MANIFEST.MF
@@ -9,16 +9,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: java_cup.runtime,
- javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
  org.apache.avalon.framework,
  org.apache.avalon.framework.activity,
  org.apache.avalon.framework.configuration,
@@ -195,7 +185,6 @@ Export-Package: java_cup.runtime,
  org.apache.xml.serialize,
  org.apache.xml.utils,
  org.apache.xml.utils.res,
- org.apache.xmlcommons,
  org.apache.xmlgraphics.fonts,
  org.apache.xmlgraphics.image,
  org.apache.xmlgraphics.image.codec.png,
@@ -256,25 +245,7 @@ Export-Package: java_cup.runtime,
  org.mozilla.javascript.tools.jsc,
  org.mozilla.javascript.tools.shell,
  org.mozilla.javascript.xml,
- org.mozilla.javascript.xmlimpl,
- org.w3c.css.sac,
- org.w3c.css.sac.helpers,
- org.w3c.dom,
- org.w3c.dom.bootstrap,
- org.w3c.dom.css,
- org.w3c.dom.events,
- org.w3c.dom.html,
- org.w3c.dom.ls,
- org.w3c.dom.ranges,
- org.w3c.dom.smil,
- org.w3c.dom.stylesheets,
- org.w3c.dom.svg,
- org.w3c.dom.traversal,
- org.w3c.dom.views,
- org.w3c.dom.xpath,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
+ org.mozilla.javascript.xmlimpl
 Bundle-ClassPath: lib/batik-awt-util-1.8.jar,
  lib/batik-dom-1.8.jar,
  lib/batik-ext-1.8.jar,
@@ -298,6 +269,33 @@ Bundle-ClassPath: lib/batik-awt-util-1.8.jar,
  lib/js.jar,
  lib/xalan-2.7.0.jar,
  lib/xerces_2_5_0.jar,
- lib/xml-apis-1.3.04.jar,
- lib/xml-apis-ext-1.3.04.jar,
  lib/fop-transcoder-allinone-svn-trunk.jar
+Import-Package: javax.xml,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.xpath,
+ org.w3c.css.sac,
+ org.w3c.css.sac.helpers,
+ org.w3c.dom,
+ org.w3c.dom.bootstrap,
+ org.w3c.dom.css,
+ org.w3c.dom.events,
+ org.w3c.dom.html,
+ org.w3c.dom.ls,
+ org.w3c.dom.ranges,
+ org.w3c.dom.smil,
+ org.w3c.dom.stylesheets,
+ org.w3c.dom.svg,
+ org.w3c.dom.traversal,
+ org.w3c.dom.views,
+ org.w3c.dom.xpath,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
+ org.apache.xmlcommons
diff --git a/bundles/org.apache.batik/build.properties b/bundles/org.apache.batik/build.properties
index 91aa3c77a..4dce108e6 100644
--- a/bundles/org.apache.batik/build.properties
+++ b/bundles/org.apache.batik/build.properties
@@ -25,6 +25,4 @@ bin.includes = META-INF/,\
                lib/js.jar,\
                lib/xalan-2.7.0.jar,\
                lib/xerces_2_5_0.jar,\
-               lib/xml-apis-1.3.04.jar,\
-               lib/xml-apis-ext-1.3.04.jar,\
                lib/fop-transcoder-allinone-svn-trunk.jar