[mojarra] Don't use namespace-alias XSLT element
Juan Hernandez
jhernand at fedoraproject.org
Tue Jul 24 18:44:09 UTC 2012
commit bc7ad4a72deaad31529c668b931c5339fe5368a8
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Tue Jul 24 20:24:11 2012 +0200
Don't use namespace-alias XSLT element
mojarra-dont-use-namespace-alias.patch | 42 ++++++++++++++++++++++++++++++++
mojarra.spec | 10 +++++++-
2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/mojarra-dont-use-namespace-alias.patch b/mojarra-dont-use-namespace-alias.patch
new file mode 100644
index 0000000..8cfdf44
--- /dev/null
+++ b/mojarra-dont-use-namespace-alias.patch
@@ -0,0 +1,42 @@
+From 681afa7bf8d77aac809595e0bfcf79a9e9ef71a0 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Tue, 24 Jul 2012 19:10:59 +0200
+Subject: [PATCH] Don't use namespace-alias in merge-config.xsl
+
+The build process uses a stylesheet named "merge-config.xsl" to
+merge the content of different XML files and it uses the
+"namespace-alias" element in the following way:
+
+<xsl:namespace-alias stylesheet-prefix="jsf" result-prefix="#default"/>
+
+This generates the following error during the build:
+
+create.runtime.config:
+ [xslt] Processing /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-api/doc/standard-html-renderkit.xml to /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-ri/merged.xml
+ [xslt] Loading stylesheet /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-ri/conf/xslt/merge-config.xsl
+ [xslt] /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-ri/conf/xslt/merge-config.xsl:50:76: Error! The result-prefix attribute of an xsl:namespace-alias element has the value '#default', but there is no declaration of the default namespace in scope for the element
+ [xslt] /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-ri/conf/xslt/merge-config.xsl:0:0: Fatal Error! java.lang.NullPointerException Cause: java.lang.NullPointerException
+ [xslt] Failed to process /home/jhernand/rpmbuild/BUILD/mojarra-2.1.7/jsf-api/doc/standard-html-renderkit.xml
+
+The only way I find to avoid this is to remove the
+"namespace-alias" element. As far as I can tell the content of the
+"jsf-ri-runtime.xml" file is not affected.
+---
+ jsf-ri/conf/xslt/merge-config.xsl | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/jsf-ri/conf/xslt/merge-config.xsl b/jsf-ri/conf/xslt/merge-config.xsl
+index 32b6bb2..5a2c397 100644
+--- a/jsf-ri/conf/xslt/merge-config.xsl
++++ b/jsf-ri/conf/xslt/merge-config.xsl
+@@ -47,7 +47,6 @@
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:strip-space elements="*"/>
+- <xsl:namespace-alias stylesheet-prefix="jsf" result-prefix="#default"/>
+
+ <xsl:variable name="source" select="document('../../resources/jsf-ri-config.xml')"/>
+
+--
+1.7.10.4
+
diff --git a/mojarra.spec b/mojarra.spec
index 5102f6b..9068e1b 100644
--- a/mojarra.spec
+++ b/mojarra.spec
@@ -1,6 +1,6 @@
Name: mojarra
Version: 2.1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: JSF Reference Implementation
Group: Development/Libraries
@@ -50,6 +50,10 @@ Patch8: %{name}-dont-build-injection-providers.patch
# Don't bundle the API inside the implementation:
Patch9: %{name}-dont-bundle-api.patch
+# Don't use the namespace-alias XLST element in the stylesheet
+# that merges the jsf-ri-runtime.xml file:
+Patch10: %{name}-dont-use-namespace-alias.patch
+
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -105,6 +109,7 @@ This package contains the API documentation for %{name}.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
# Remove binaries (I know this is already mentinoned in the instructions to
# build the source tarball above, but it doesn't hurt):
@@ -215,6 +220,9 @@ cp -rp jsf-api/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}/jsf-impl/.
%changelog
+* Tue Jul 24 2012 Juan Hernandez <juan.hernandez at redhat.com> - 2.1.7-4
+- Don't use the namespace-alias XSLT element
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list