You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/01/22 08:42:38 UTC

svn commit: r902019 - in /geronimo/specs/trunk/geronimo-servlet_3.0_spec: pom.xml src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java

Author: djencks
Date: Fri Jan 22 07:42:36 2010
New Revision: 902019

URL: http://svn.apache.org/viewvc?rev=902019&view=rev
Log:
signature fixes, and we can build with java 5

Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml?rev=902019&r1=902018&r2=902019&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml Fri Jan 22 07:42:36 2010
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java6-flava</artifactId>
+        <artifactId>genesis-java5-flava</artifactId>
         <version>2.0</version>
     </parent>
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java?rev=902019&r1=902018&r2=902019&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java Fri Jan 22 07:42:36 2010
@@ -30,5 +30,5 @@
 
     Collection<JspPropertyGroupDescriptor> getJspPropertyGroups();
 
-    Collection<TaglibDescriptor> getTagLibs();
+    Collection<TaglibDescriptor> getTaglibs();
 }

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java?rev=902019&r1=902018&r2=902019&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java Fri Jan 22 07:42:36 2010
@@ -38,9 +38,9 @@
 
     String getErrorOnUndeclaredNamespace();
 
-    Collection<String> getIncludedCodas();
+    Collection<String> getIncludeCodas();
 
-    Collection<String> getIncludedPreludes();
+    Collection<String> getIncludePreludes();
 
     String getIsXml();
 
@@ -50,6 +50,6 @@
 
     String getTrimDirectiveWhitespaces();
 
-    Collection<String> getUrlPatterms();
+    Collection<String> getUrlPatterns();
 
 }