rpms/eclipse-mylyn/devel eclipse-mylyn-largebzconfigs.patch, NONE, 1.1 eclipse-mylyn.spec, 1.32, 1.33

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29299/devel

Modified Files:
	eclipse-mylyn.spec 
Added Files:
	eclipse-mylyn-largebzconfigs.patch 
Log Message:
* Wed Nov 12 2008 Andrew Overholt <overholt at redhat.com> 3.0.3-4
- Add patch for e.o#239435 (rhbz#470356).

eclipse-mylyn-largebzconfigs.patch:

--- NEW FILE eclipse-mylyn-largebzconfigs.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.mylyn.bugzilla.core
Index: src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java,v
retrieving revision 1.40
diff -u -r1.40 AbstractReportFactory.java
--- src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java	20 May 2008 23:13:39 -0000	1.40
+++ src/org/eclipse/mylyn/internal/bugzilla/core/AbstractReportFactory.java	10 Aug 2008 19:21:32 -0000
@@ -9,7 +9,7 @@
 package org.eclipse.mylyn.internal.bugzilla.core;

 import java.io.BufferedInputStream;
-import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -48,6 +48,7 @@
 	 * @throws GeneralSecurityException
 	 */
 	protected void collectResults(DefaultHandler contentHandler, boolean clean) throws IOException {
+		File tempFile = null;

 		if (inStream == null) {
 			return;
@@ -77,9 +78,9 @@
 		}

 		if (clean) {
-			StringBuffer result = XmlCleaner.clean(in);
-			StringReader strReader = new StringReader(result.toString());
-			in = new BufferedReader(strReader);
+			tempFile = File.createTempFile("XmlCleaner-", "tmp");
+			tempFile.deleteOnExit();
+			in = XmlCleaner.clean(in, tempFile);
 		}

 		try {
@@ -125,6 +126,12 @@
 			throw new IOException(e.getMessage());
 			// }
 		}
+
+		finally {
+			if (tempFile != null) {
+				tempFile.delete();
+			}
+		}
 	}

 }
Index: src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java,v
retrieving revision 1.11
diff -u -r1.11 XmlCleaner.java
--- src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java	30 Apr 2008 15:34:35 -0000	1.11
+++ src/org/eclipse/mylyn/internal/bugzilla/core/XmlCleaner.java	10 Aug 2008 19:21:33 -0000
@@ -8,6 +8,11 @@

 package org.eclipse.mylyn.internal.bugzilla.core;

+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Reader;
 import java.text.ParseException;
@@ -25,14 +30,13 @@
  */
 public class XmlCleaner {

-	public static StringBuffer clean(Reader in) {
+	public static BufferedReader clean(Reader in, File tempFile) {

 		HtmlStreamTokenizer tokenizer = new HtmlStreamTokenizer(in, null);
-		StringBuffer content = new StringBuffer();
-
-		// Hack since HtmlStreamTokenizer not familiar with xml tag.
-		content.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 		try {
+			BufferedWriter content = new BufferedWriter(new FileWriter(tempFile));
+			// Hack since HtmlStreamTokenizer not familiar with xml tag.
+			content.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 			for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) {

 				if (token.getType() == Token.TAG) {
@@ -50,12 +54,15 @@
 					content.append(token.toString());
 				}
 			}
+			content.flush();
+			content.close();
+			return new BufferedReader(new FileReader(tempFile));
 		} catch (IOException e) {

 		} catch (ParseException e) {

 		}
-		return content;
+		return null;
 	}

 }

Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eclipse-mylyn.spec	31 Oct 2008 15:15:06 -0000	1.32
+++ eclipse-mylyn.spec	12 Nov 2008 19:22:27 -0000	1.33
@@ -4,10 +4,10 @@
 # http://download.eclipse.org/tools/mylyn/update/e3.4/
 %define qualifier           v20081015-1500-e3x
 
-Name: eclipse-mylyn 
+Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.0.3
-Release: 3%{?dist} 
+Release: 4%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -27,6 +27,12 @@
 Patch8: %{name}-splitxmlrpc.patch
 # Red Hat Bugzilla is 3.0 now
 Patch9: %{name}-rhbz30.patch
+# Back-port patch for Bugzilla servers with large config files
+# Bug:  https://bugs.eclipse.org/bugs/show_bug.cgi?id=239435
+# Patch:  https://bugs.eclipse.org/bugs/attachment.cgi?id=109607
+# Tests part of patch taken out to avoid having to split it up by project
+# for application in %%prep.
+Patch10: %{name}-largebzconfigs.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -155,6 +161,9 @@
 popd
 #%patch7
 %patch8
+pushd org.eclipse.mylyn.bugzilla.core
+%patch10
+popd
 
 find -name feature.xml |
   while read f; do
@@ -248,7 +257,7 @@
 ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar
 popd
 
-#Do not use qualifier value for dependencies to not be forced to rebuild them for 
+#Do not use qualifier value for dependencies to not be forced to rebuild them for
 # every mylyn
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/features
 	find -name feature.xml |
@@ -310,6 +319,9 @@
 # FIXME:  add the doc files back
 
 %changelog
+* Wed Nov 12 2008 Andrew Overholt <overholt at redhat.com> 3.0.3-4
+- Add patch for e.o#239435 (rhbz#470356).
+
 * Fri Oct 31 2008 Alexander Kurtakov <akurtako at redhat.com> 3.0.3-3
 - Don't apply nojaxb.patch.
 - Fix eclipse-mylyn-splitxmlrpc.patch to Import-Package:org.apache.xmlrpc.
@@ -357,7 +369,7 @@
 * Tue Apr 15 2008 Andrew Overholt <overholt at redhat.com> 2.3.2-5
 - Re-build to attempt to fix rhbz#442251 (broken cpio archive).
 
-* Tue Apr 15 2008 Jesse Keating <jkeating at redhat.com> - 2.3.2-4 
+* Tue Apr 15 2008 Jesse Keating <jkeating at redhat.com> - 2.3.2-4
 - Rebuild due to filesystem corruption
 
 * Mon Apr 07 2008 Andrew Overholt <overholt at redhat.com> 2.3.2-3
@@ -433,4 +445,4 @@
 - Use xmlrpc3 jars instead of xmlrpc
 
 * Fri Mar 16 2007 Andrew Overholt <overholt at redhat.com> 1.0-1
-- Initial build
+- Initial build
\ No newline at end of file