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 2009/10/29 20:19:49 UTC
svn commit: r831066 - in
/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet:
./ annotation/ http/
Author: djencks
Date: Thu Oct 29 19:19:48 2009
New Revision: 831066
URL: http://svn.apache.org/viewvc?rev=831066&view=rev
Log:
update to latest glassfish javadoc
Added:
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java (with props)
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java (with props)
Modified:
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequest.java
geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+import javax.servlet.annotation.ServletSecurity;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+public class HttpConstraintElement {
+ private final ServletSecurity.EmptyRoleSemantic emptyRoleSemantic;
+ private final String[] rolesAllowed;
+ private final ServletSecurity.TransportGuarantee transportGuarantee;
+
+ public HttpConstraintElement() {
+ emptyRoleSemantic = ServletSecurity.EmptyRoleSemantic.PERMIT;
+ rolesAllowed = new String[] {};
+ transportGuarantee = ServletSecurity.TransportGuarantee.NONE;
+ }
+
+ public HttpConstraintElement(ServletSecurity.EmptyRoleSemantic emptyRoleSemantic) {
+ this.emptyRoleSemantic = emptyRoleSemantic;
+ rolesAllowed = new String[] {};
+ transportGuarantee = ServletSecurity.TransportGuarantee.NONE;
+ }
+
+ public HttpConstraintElement(ServletSecurity.EmptyRoleSemantic emptyRoleSemantic, ServletSecurity.TransportGuarantee transportGuarantee, String... rolesAllowed) {
+ this.emptyRoleSemantic = emptyRoleSemantic;
+ this.rolesAllowed = rolesAllowed;
+ this.transportGuarantee = transportGuarantee;
+ }
+
+ public HttpConstraintElement(ServletSecurity.TransportGuarantee transportGuarantee, String... rolesAllowed) {
+ emptyRoleSemantic = ServletSecurity.EmptyRoleSemantic.PERMIT;
+ this.rolesAllowed = rolesAllowed;
+ this.transportGuarantee = transportGuarantee;
+ }
+
+ ServletSecurity.EmptyRoleSemantic getEmptyRoleSemantic() {
+ return emptyRoleSemantic;
+ }
+
+ String[] getRolesAllowed() {
+ return rolesAllowed;
+ }
+
+ ServletSecurity.TransportGuarantee getTransportGuarantee() {
+ return transportGuarantee;
+ }
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+public class HttpMethodConstraintElement extends HttpConstraintElement {
+
+ private final String methodName;
+
+ public HttpMethodConstraintElement(String methodName) {
+ this.methodName = methodName;
+ }
+
+ public HttpMethodConstraintElement(String methodName, HttpConstraintElement constraintElement) {
+ super(constraintElement.getEmptyRoleSemantic(), constraintElement.getTransportGuarantee(), constraintElement.getRolesAllowed());
+ this.methodName = methodName;
+ }
+
+ public String getMethodName() {
+ return methodName;
+ }
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpMethodConstraintElement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+import javax.servlet.annotation.MultipartConfig;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+public class MultipartConfigElement {
+ private final int fileSizeThreshold;
+ private final String location;
+ private final long maxFileSize;
+ private final long maxRequestSize;
+
+ public MultipartConfigElement(String location) {
+ this.location = location == null ? "" : location;
+ fileSizeThreshold = 0;
+ maxFileSize = -1L;
+ maxRequestSize = -1L;
+ }
+
+ public MultipartConfigElement(MultipartConfig config) {
+ location = config.location();
+ fileSizeThreshold = config.fileSizeThreshold();
+ maxFileSize = config.maxFileSize();
+ maxRequestSize = config.maxRequestSize();
+ }
+
+ public MultipartConfigElement(String location, long maxFileSize, long maxRequestSize, int fileSizeThreshold) {
+ this.fileSizeThreshold = fileSizeThreshold;
+ this.location = location;
+ this.maxFileSize = maxFileSize;
+ this.maxRequestSize = maxRequestSize;
+ }
+
+ public int getFileSizeThreshold() {
+ return fileSizeThreshold;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public long getMaxFileSize() {
+ return maxFileSize;
+ }
+
+ public long getMaxRequestSize() {
+ return maxRequestSize;
+ }
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/MultipartConfigElement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java?rev=831066&r1=831065&r2=831066&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java Thu Oct 29 19:19:48 2009
@@ -37,9 +37,22 @@
Iterable<String> getMappings();
+ String getRunAsRole();
+
public interface Dynamic extends ServletRegistration, Registration.Dynamic {
void setLoadOnStartup(int loadOnStartup);
+
+ void setMultipartConfig(MultipartConfigElement element);
+
+ void setRunAsRole(String role);
+
+ /**
+ *
+ * @param securityElement
+ * @return set of url mappings that were not changed
+ */
+ Set<String> setServletSecurity(ServletSecurityElement securityElement);
}
}
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+public class ServletSecurityElement {
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletSecurityElement.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface HttpConstraint {
+
+ String[] rolesAllowed() default {};
+
+ ServletSecurity.TransportGuarantee transportGuarantee() default ServletSecurity.TransportGuarantee.NONE;
+
+ ServletSecurity.EmptyRoleSemantic value() default ServletSecurity.EmptyRoleSemantic.PERMIT;
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpConstraint.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface HttpMethodConstraint {
+
+ /**
+ *
+ * @return http method name
+ */
+ String value();
+
+ ServletSecurity.EmptyRoleSemantic emptyRoleSemantic() default ServletSecurity.EmptyRoleSemantic.PERMIT;
+
+ String[] rolesAllowed() default {};
+
+ ServletSecurity.TransportGuarantee transportGuarantee() default ServletSecurity.TransportGuarantee.NONE;
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java?rev=831066&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java Thu Oct 29 19:19:48 2009
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Inherited;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 3.0
+ */
+
+@Inherited
+@Documented
+@Target(value= ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface ServletSecurity {
+
+ enum EmptyRoleSemantic {DENY, PERMIT}
+
+ enum TransportGuarantee {NONE, CONFIDENTIAL}
+
+ HttpMethodConstraint[] httpMethodConstraints() default {};
+
+ HttpConstraint value() default @HttpConstraint;
+
+}
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/ServletSecurity.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequest.java?rev=831066&r1=831065&r2=831066&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequest.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequest.java Thu Oct 29 19:19:48 2009
@@ -19,11 +19,12 @@
package javax.servlet.http;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletException;
-
-import java.util.Enumeration;
import java.io.IOException;
+import java.util.Collection;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
/**
* Extends the {@link javax.servlet.ServletRequest} interface
@@ -61,6 +62,7 @@
* @param response response to use to conduct a dialog if necessary
* @return whether authentication was successful
* @throws javax.servlet.ServletException if something goes wrong
+ * @throws java.io.IOException if something IO related goes wrong
* @since 3.0
*/
boolean authenticate(HttpServletResponse response) throws IOException, ServletException;
@@ -240,6 +242,7 @@
/**
* @param name part name
* @return named part
+ * @throws java.io.IOException if something IO related goes wrong
* @throws javax.servlet.ServletException if something goes wrong
* @since 3.0
*/
@@ -247,10 +250,11 @@
/**
* @return all the parts
+ * @throws java.io.IOException if something IO related goes wrong
* @throws javax.servlet.ServletException if something goes wrong
* @since 3.0
*/
- Iterable<Part> getParts() throws IOException, ServletException;
+ Collection<Part> getParts() throws IOException, ServletException;
/**
* Returns any extra path information associated with
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=831066&r1=831065&r2=831066&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java Thu Oct 29 19:19:48 2009
@@ -23,6 +23,7 @@
import javax.servlet.ServletException;
import java.util.Enumeration;
+import java.util.Collection;
import java.io.IOException;
/**
@@ -128,7 +129,7 @@
return getHttpServletRequest().getPart(name);
}
- public Iterable<Part> getParts() throws IOException, ServletException {
+ public Collection<Part> getParts() throws IOException, ServletException {
return getHttpServletRequest().getParts();
}