[pkg-java] r11131 - trunk/libcommons-el-java/debian/patches

[Niels Thykier]

Author: nthykier-guest
Date: 2009-11-26 22:25:01 +0000 (Thu, 26 Nov 2009)
New Revision: 11131

Added:
   trunk/libcommons-el-java/debian/patches/03rename_enum.patch
   trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
   trunk/libcommons-el-java/debian/patches/series
Log:
Forgot to add some new files.

Added: trunk/libcommons-el-java/debian/patches/03rename_enum.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/03rename_enum.patch	                        (rev 0)
+++ trunk/libcommons-el-java/debian/patches/03rename_enum.patch	2009-11-26 22:25:01 UTC (rev 11131)
@@ -0,0 +1,32 @@
+diff -Nur -x '*.orig' -x '*~' libcommons-el-java-1.0/src/java/org/apache/commons/el/ImplicitObjects.java libcommons-el-java-1.0.new/src/java/org/apache/commons/el/ImplicitObjects.java
+--- a/src/java/org/apache/commons/el/ImplicitObjects.java	2003-02-04 03:22:25.000000000 +0300
++++ b/src/java/org/apache/commons/el/ImplicitObjects.java	2009-09-25 16:23:08.000000000 +0400
+@@ -535,10 +535,10 @@
+ 	  if (pKey instanceof String) {
+ 	    // Drain the header enumeration
+ 	    List l = new ArrayList ();
+-	    Enumeration enum = request.getHeaders ((String) pKey);
+-	    if (enum != null) {
+-	      while (enum.hasMoreElements ()) {
+-		l.add (enum.nextElement ());
++	    Enumeration enum_ = request.getHeaders ((String) pKey);
++	    if (enum_ != null) {
++	      while (enum_.hasMoreElements ()) {
++		l.add (enum_.nextElement ());
+ 	      }
+ 	    }
+ 	    String [] ret = (String []) l.toArray (new String [l.size ()]);
+diff -Nur -x '*.orig' -x '*~' libcommons-el-java-1.0/src/java/org/apache/commons/el/parser/ELParser.java libcommons-el-java-1.0.new/src/java/org/apache/commons/el/parser/ELParser.java
+--- a/src/java/org/apache/commons/el/parser/ELParser.java	2003-03-31 05:17:07.000000000 +0400
++++ b/src/java/org/apache/commons/el/parser/ELParser.java	2009-09-25 16:23:38.000000000 +0400
+@@ -1838,8 +1838,8 @@
+         jj_expentry[i] = jj_lasttokens[i];
+       }
+       boolean exists = false;
+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
+-        int[] oldentry = (int[])(enum.nextElement());
++      for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
++        int[] oldentry = (int[])(enum_.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {

Added: trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch	                        (rev 0)
+++ trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch	2009-11-26 22:25:01 UTC (rev 11131)
@@ -0,0 +1,19 @@
+--- a/src/conf/MANIFEST.MF	2007-07-11 12:47:24.000000000 -0400
++++ b/src/conf/MANIFEST.MF	2007-07-11 12:49:32.000000000 -0400
+@@ -9,3 +9,16 @@
+ Implementation-Title: org.apache.commons.el
+ Implementation-Vendor: Apache Software Foundation
+ Implementation-Version: 1.0
++Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
++ ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="
++ 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage
++ xt;version="2.0",javax.servlet.resources;version="2.4"
++Bundle-ManifestVersion: 2
++Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
++ ns.el.parser;version="1.0.0"
++Bundle-Version: 1.0.0.v200806031608
++Bundle-SymbolicName: org.apache.commons.el
++Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter
++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
++Bundle-Localization: plugin
++Bundle-Vendor: Apache Software Foundation

Added: trunk/libcommons-el-java/debian/patches/series
===================================================================
--- trunk/libcommons-el-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-el-java/debian/patches/series	2009-11-26 22:25:01 UTC (rev 11131)
@@ -0,0 +1,4 @@
+01build_xml_license_location_patch.patch
+02build_xml_javadoc_depends.patch
+03rename_enum.patch
+04add_OSGi_metadata.patch