[SCM] eclipse-wtp packaging branch, master, updated. upstream/3.4.1-31-g7b20241
Jakub Adam
jakub.adam at ktknet.cz
Sun Oct 21 20:44:21 UTC 2012
The following commit has been merged in the master branch:
commit 782b38ff98a5852d44d4ed7653eb7276e904b037
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Oct 21 18:31:42 2012 +0200
Create w3c-xsd-xslt binary package
diff --git a/debian/catalog.xml b/debian/catalog.xml
new file mode 100644
index 0000000..02de0b2
--- /dev/null
+++ b/debian/catalog.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <!--
+ Seems there is no way how to distinguish between schemas having same namespace
+ and different version, so mapping to the latest version here.
+ -->
+ <uri name="http://www.w3.org/1999/XSL/Transform" uri="xslt-2.0.xsd"/>
+ <uri name="http://www.w3.org/2001/XInclude" uri="xinclude.xsd"/>
+</catalog>
diff --git a/debian/control b/debian/control
index d3eb06f..1f44963 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends: debhelper (>= 8~),
jflex,
cup,
jikespg,
+ xml-core,
unzip,
zip
Standards-Version: 3.9.3
@@ -88,6 +89,7 @@ Package: eclipse-wtp-xsl
Architecture: all
Depends: eclipse-wtp (= ${binary:Version}),
eclipse-wtp-xmltools (= ${binary:Version}),
+ w3c-xsd-xslt,
${misc:Depends},
${orbit:Depends}
Description: Eclipse Extensible Stylesheet Language tools
@@ -136,3 +138,11 @@ Description: Eclipse WTP server tools
testing apps.
.
This package provides a generic framework and adapters for application servers.
+
+Package: w3c-xsd-xslt
+Architecture: all
+Depends: ${misc:Depends}
+Description: XML Schema for W3C EXtensible Stylesheet Language Transformations (XSLT)
+ XSL Transformation (XSLT) is an XML language for transforming XML documents.
+ This package includes XML Schema files that describe structure of XSLT 1.0,
+ XSLT 2.0 and XML Inclusions (XInclude) 1.0.
diff --git a/debian/patches/series b/debian/patches/series
index 356af9e..4dc7dea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ jflex-xmlheadtokenizer-fix.patch
eclipsehelp-rebuild-customizations.patch
add-debian-system-catalog-reader.patch
regenerate-js-parser-resources.patch
+use-xslt-xsd-from-system-location.patch
diff --git a/debian/patches/use-xslt-xsd-from-system-location.patch b/debian/patches/use-xslt-xsd-from-system-location.patch
new file mode 100644
index 0000000..90534b9
--- /dev/null
+++ b/debian/patches/use-xslt-xsd-from-system-location.patch
@@ -0,0 +1,67 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 21 Oct 2012 20:55:31 +0200
+Subject: use-xslt-xsd-from-system-location
+
+---
+ org.eclipse.wst.xsl.core/build.properties | 1 -
+ org.eclipse.wst.xsl.core/plugin.xml | 10 ----------
+ .../eclipse/wst/xsl/core/resolver/ResolverExtension.java | 13 ++-----------
+ 3 files changed, 2 insertions(+), 22 deletions(-)
+
+diff --git a/org.eclipse.wst.xsl.core/build.properties b/org.eclipse.wst.xsl.core/build.properties
+index 2c3b42d..516c2cf 100644
+--- a/org.eclipse.wst.xsl.core/build.properties
++++ b/org.eclipse.wst.xsl.core/build.properties
+@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ plugin.properties,\
+- xslt-schemas/,\
+ lib/,\
+ bin/,\
+ about.html,\
+diff --git a/org.eclipse.wst.xsl.core/plugin.xml b/org.eclipse.wst.xsl.core/plugin.xml
+index 00a308a..4581eec 100644
+--- a/org.eclipse.wst.xsl.core/plugin.xml
++++ b/org.eclipse.wst.xsl.core/plugin.xml
+@@ -96,16 +96,6 @@
+ </modelHandler>
+ </extension>
+ <extension
+- point="org.eclipse.wst.xml.core.catalogContributions">
+- <catalogContribution>
+- <uri
+- id="org.w3c.xinclude"
+- name="http://www.w3.org/2001/XInclude"
+- uri="xslt-schemas/xinclude.xsd">
+- </uri>
+- </catalogContribution>
+- </extension>
+- <extension
+ point="org.eclipse.core.runtime.preferences">
+ <initializer
+ class="org.eclipse.wst.xsl.core.internal.preferences.PreferenceInitializer">
+diff --git a/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java b/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
+index 940c00a..5cc0384 100644
+--- a/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
++++ b/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
+@@ -109,17 +109,8 @@ public class ResolverExtension implements URIResolverExtension
+ if (!initialised)
+ {
+ initialised = true;
+- try
+- {
+- URL pluginURL = FileLocator.find(XSLCorePlugin.getDefault().getBundle(), new Path("/xslt-schemas/xslt-1.0.xsd"), null); //$NON-NLS-1$
+- xslt_1_0_fileURL = FileLocator.toFileURL(pluginURL).toExternalForm();
+- pluginURL = FileLocator.find(XSLCorePlugin.getDefault().getBundle(), new Path("/xslt-schemas/xslt-2.0.xsd"), null); //$NON-NLS-1$
+- xslt_2_0_fileURL = FileLocator.toFileURL(pluginURL).toExternalForm();
+- }
+- catch (IOException e)
+- {
+- XSLCorePlugin.log(e);
+- }
++ xslt_1_0_fileURL = "file:/usr/share/xml/xslt/xslt-1.0.xsd";
++ xslt_2_0_fileURL = "file:/usr/share/xml/xslt/xslt-2.0.xsd";
+ }
+ }
+
diff --git a/debian/rules b/debian/rules
index 95d666c..c9acab8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,3 +68,6 @@ override_jh_installeclipse:
org/eclipse/wst/jsdt/internal/compiler/parser/parser*.rsc \
org/eclipse/wst/jsdt/internal/compiler/parser/readableNames.properties
+override_dh_install:
+ dh_install
+ dh_installxmlcatalogs
diff --git a/debian/w3c-xsd-xslt.install b/debian/w3c-xsd-xslt.install
new file mode 100644
index 0000000..2a09dd4
--- /dev/null
+++ b/debian/w3c-xsd-xslt.install
@@ -0,0 +1 @@
+org.eclipse.wst.xsl.core/xslt-schemas/*.xsd usr/share/xml/xslt
diff --git a/debian/w3c-xsd-xslt.xmlcatalogs b/debian/w3c-xsd-xslt.xmlcatalogs
new file mode 100644
index 0000000..c6d1094
--- /dev/null
+++ b/debian/w3c-xsd-xslt.xmlcatalogs
@@ -0,0 +1,3 @@
+local;debian/catalog.xml;/usr/share/xml/xslt/catalog.xml
+root-and-package;uri;http://www.w3.org/1999/XSL/Transform;/usr/share/xml/xslt/catalog.xml
+root-and-package;uri;http://www.w3.org/2001/XInclude;/usr/share/xml/xslt/catalog.xml
--
eclipse-wtp packaging
More information about the pkg-java-commits
mailing list