[tomcat] Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream).
by Alexander Kurtakov
commit 2178fabdb4947a7714871c9c56726b849263604a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Jan 11 12:40:54 2012 +0200
Add EntityResolver setter patch to jasper for jetty's need. (patch sent
upstream).
add_entity_resolver_setter.patch | 19 +++++++++++++++++++
tomcat.spec | 9 +++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/add_entity_resolver_setter.patch b/add_entity_resolver_setter.patch
new file mode 100644
index 0000000..8a3f8a7
--- /dev/null
+++ b/add_entity_resolver_setter.patch
@@ -0,0 +1,19 @@
+--- java/org/apache/jasper/xmlparser/ParserUtils.java.sav 2012-01-11 12:19:05.303081671 +0200
++++ java/org/apache/jasper/xmlparser/ParserUtils.java 2012-01-11 12:25:32.327526734 +0200
+@@ -132,6 +132,16 @@ public class ParserUtils {
+
+ return (parseXMLDocument(uri, new InputSource(is)));
+ }
++
++ /**
++ * Set the EntityResolver.
++ * This is needed when the dtds and Jasper itself are in different classloaders (e.g. OSGi environment).
++ *
++ * @parem er EntityResolver to use.
++ */
++ public static void setEntityResolver(EntityResolver er) {
++ entityResolver = er;
++ }
+
+
+ // ------------------------------------------------------ Protected Methods
diff --git a/tomcat.spec b/tomcat.spec
index cc6325f..4171f42 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -80,6 +80,8 @@ Source16: tomcat-juli-OSGi-MANIFEST.MF
Source17: %{name}-%{major_version}.%{minor_version}-tomcat-sysd
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
+#https://issues.apache.org/bugzilla/show_bug.cgi?id=52450
+Patch2: add_entity_resolver_setter.patch
BuildArch: noarch
@@ -226,7 +228,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p0
%patch1 -p0
-# %patch2 -p0
+%patch2 -p0
%{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -615,6 +617,9 @@ fi
%{_initrddir}/%{name}
%changelog
+* Wed Jan 11 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:7.0.23-2
+- Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream).
+
* Mon Nov 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.23-1
- Updated to 7.0.23
12 years, 3 months
[Bug 772689] New: [PATCH] Migration to plexus-containers-component-metadata
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: [PATCH] Migration to plexus-containers-component-metadata
https://bugzilla.redhat.com/show_bug.cgi?id=772689
Summary: [PATCH] Migration to
plexus-containers-component-metadata
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven-doxia-sitetools
AssignedTo: sochotni(a)redhat.com
ReportedBy: jcapik(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: dbhole(a)redhat.com, akurtako(a)redhat.com,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Created attachment 551608
--> https://bugzilla.redhat.com/attachment.cgi?id=551608
migration.patch
Description of problem:
The attached patch replaces the obsolete plexus-maven-plugin with
plexus-containers-component-metadata.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 3 months
[maven-doxia-sitetools] Fix up newlines
by Stanislav Ochotnicky
commit 29d12c97586cc9f3771d53786b37396bfcdd5453
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jan 9 18:26:53 2012 +0100
Fix up newlines
0003-Migration-to-component-metadata.patch | 52 ++++++++++++++--------------
1 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/0003-Migration-to-component-metadata.patch b/0003-Migration-to-component-metadata.patch
index 7d8a22b..801bbf4 100644
--- a/0003-Migration-to-component-metadata.patch
+++ b/0003-Migration-to-component-metadata.patch
@@ -2,33 +2,33 @@ diff -Naur doxia-sitetools-1.2.orig/doxia-decoration-model/pom.xml doxia-sitetoo
--- doxia-sitetools-1.2.orig/doxia-decoration-model/pom.xml 2011-04-26 22:48:04.000000000 +0200
+++ doxia-sitetools-1.2/doxia-decoration-model/pom.xml 2012-01-09 17:25:20.704405788 +0100
@@ -77,11 +77,11 @@
- </plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
-- <artifactId>plexus-maven-plugin</artifactId>
-+ <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
-- <goal>descriptor</goal>
-+ <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff -Naur doxia-sitetools-1.2.orig/doxia-doc-renderer/pom.xml doxia-sitetools-1.2/doxia-doc-renderer/pom.xml
--- doxia-sitetools-1.2.orig/doxia-doc-renderer/pom.xml 2011-04-26 22:48:20.000000000 +0200
+++ doxia-sitetools-1.2/doxia-doc-renderer/pom.xml 2012-01-09 17:26:26.943959066 +0100
@@ -154,11 +154,11 @@
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
-- <artifactId>plexus-maven-plugin</artifactId>
-+ <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
-- <goal>descriptor</goal>
-+ <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
12 years, 3 months