geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r514551 - in /geronimo/specs/trunk/geronimo-jsp_2.1_spec: pom.xml src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java src/main/java/javax/servlet/jsp/tagext/TagInfo.java
Date Mon, 05 Mar 2007 04:56:04 GMT
Author: djencks
Date: Sun Mar  4 20:56:03 2007
New Revision: 514551

URL: http://svn.apache.org/viewvc?view=rev&rev=514551
Log:
GERONIMO-2931 fix some jsp spec problems

Modified:
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
    geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/tagext/TagInfo.java

Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml?view=diff&rev=514551&r1=514550&r2=514551
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Sun Mar  4 20:56:03 2007
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0-M1</version>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java?view=diff&rev=514551&r1=514550&r2=514551
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
(original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
Sun Mar  4 20:56:03 2007
@@ -57,7 +57,7 @@
 		return null;
 	}
 
-	public Class getType(ELContext context, Object base, Object property)
+	public Class<Object> getType(ELContext context, Object base, Object property)
 			throws NullPointerException, PropertyNotFoundException, ELException {
 		if (context == null) {
 			throw new NullPointerException();

Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/tagext/TagInfo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/tagext/TagInfo.java?view=diff&rev=514551&r1=514550&r2=514551
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/tagext/TagInfo.java
(original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/tagext/TagInfo.java
Sun Mar  4 20:56:03 2007
@@ -38,21 +38,21 @@
      * Static constant for getBodyContent() when it is Tag dependent.
      */
 
-    public static final String BODY_CONTENT_TAG_DEPENDENT = "TAGDEPENDENT";
+    public static final String BODY_CONTENT_TAG_DEPENDENT = "tagdependent";
 
 
     /**
      * Static constant for getBodyContent() when it is empty.
      */
 
-    public static final String BODY_CONTENT_EMPTY = "EMPTY";
+    public static final String BODY_CONTENT_EMPTY = "empty";
     
     /**
      * Static constant for getBodyContent() when it is scriptless.
      * 
      * @since 2.0
      */ 
-    public static final String BODY_CONTENT_SCRIPTLESS = "SCRIPTLESS";
+    public static final String BODY_CONTENT_SCRIPTLESS = "scriptless";                  
   
 
     /**
      * Constructor for TagInfo from data in the JSP 1.1 format for TLD.



Mime
View raw message