Return-Path: 
 <scm-return-39489-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 24684 invoked from network); 11 Dec 2009 02:43:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Dec 2009 02:43:38 -0000
Received: (qmail 26758 invoked by uid 500); 11 Dec 2009 02:43:38 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 26684 invoked by uid 500); 11 Dec 2009 02:43:38 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 26671 invoked by uid 99); 11 Dec 2009 02:43:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 02:43:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 02:43:35 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AD08B23888E7; Fri, 11 Dec 2009 02:43:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r889491 - in
 /geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec: ./
 pom.xml src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java
Date: Fri, 11 Dec 2009 02:43:14 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091211024314.AD08B23888E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xuhaihong
Date: Fri Dec 11 02:43:13 2009
New Revision: 889491

URL: http://svn.apache.org/viewvc?rev=889491&view=rev
Log:
For JSP MR2 in Java EE 6

Added:
    geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/
      - copied from r889489, geronimo/specs/trunk/geronimo-jsp_2.1_spec/
Modified:
    geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java

Modified: geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/pom.xml?rev=889491&r1=889489&r2=889491&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/pom.xml Fri Dec 11 02:43:13 2009
@@ -31,11 +31,11 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-jsp_2.1_spec</artifactId>
+    <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
     <packaging>bundle</packaging>
     <name>JSP 2.1</name>
-    <version>1.0.2-SNAPSHOT</version>
-    <description>Java Server Pages 2.1 API</description>
+    <version>1.0-SNAPSHOT</version>
+    <description>Java Server Pages 2.1 MR2 API</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>
@@ -52,8 +52,8 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0-EA-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -65,9 +65,9 @@
     </dependencies>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jsp_2.1_spec/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</url>
     </scm>
 
     <build>

Modified: geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=889491&r1=889489&r2=889491&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri Dec 11 02:43:13 2009
@@ -77,8 +77,8 @@
      * @exception ELException Thrown if parsing errors were found.
      */ 
     public abstract Expression parseExpression( String expression, 
-				       Class expectedType, 
-				       FunctionMapper fMapper ) 
+                                Class<?> expectedType, 
+                                FunctionMapper fMapper ) 
       throws ELException; 
 
 
@@ -100,9 +100,9 @@
      * @exception ELException Thrown if the expression evaluation failed.
      */ 
     public abstract Object evaluate( String expression, 
-			    Class expectedType, 
-			    VariableResolver vResolver,
-			    FunctionMapper fMapper ) 
+                                Class<?> expectedType, 
+                                VariableResolver vResolver,
+                                FunctionMapper fMapper ) 
       throws ELException; 
 }