[jbossweb-commits] JBossWeb SVN: r905 - in trunk/java/javax/servlet: annotation and 2 other directories.

Author: remy.maucherat(a)jboss.com Date: 2009-01-16 11:10:23 -0500 (Fri, 16 Jan 2009) New Revision: 905 Added: trunk/java/javax/servlet/AsyncContext.java trunk/java/javax/servlet/AsyncEvent.java trunk/java/javax/servlet/AsyncListener.java trunk/java/javax/servlet/DispatcherType.java trunk/java/javax/servlet/SessionCookieConfig.java trunk/java/javax/servlet/SessionTrackingMode.java trunk/java/javax/servlet/annotation/ trunk/java/javax/servlet/annotation/InitParam.java trunk/java/javax/servlet/annotation/ServletFilter.java trunk/java/javax/servlet/annotation/WebServlet.java trunk/java/javax/servlet/annotation/WebServletContextListener.java Modified: trunk/java/javax/servlet/FilterConfig.java trunk/java/javax/servlet/GenericServlet.java trunk/java/javax/servlet/LocalStrings_es.properties trunk/java/javax/servlet/ServletConfig.java trunk/java/javax/servlet/ServletContext.java trunk/java/javax/servlet/ServletRequest.java trunk/java/javax/servlet/ServletRequestWrapper.java trunk/java/javax/servlet/http/Cookie.java trunk/java/javax/servlet/http/HttpServlet.java trunk/java/javax/servlet/http/HttpServletRequest.java trunk/java/javax/servlet/http/HttpServletRequestWrapper.java trunk/java/javax/servlet/http/HttpServletResponseWrapper.java trunk/java/javax/servlet/http/HttpSession.java trunk/java/javax/servlet/http/HttpSessionContext.java trunk/java/javax/servlet/http/HttpUtils.java trunk/java/javax/servlet/http/package.html trunk/java/javax/servlet/package.html trunk/java/javax/servlet/resources/XMLSchema.dtd trunk/java/javax/servlet/resources/datatypes.dtd trunk/java/javax/servlet/resources/web-app_2_3.dtd trunk/java/javax/servlet/resources/web-app_2_4.xsd trunk/java/javax/servlet/resources/web-app_2_5.xsd Log: - Sync with the ASF API classes. - Will not build for now, as I don't feel like adding dummy methods which I will forget about. Added: trunk/java/javax/servlet/AsyncContext.java =================================================================== --- trunk/java/javax/servlet/AsyncContext.java (rev 0) +++ trunk/java/javax/servlet/AsyncContext.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,33 @@ +/* +* 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; + +/** + * @since 3.0 + * $Id: AsyncContext.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +public interface AsyncContext { + ServletRequest getRequest(); + ServletResponse getResponse(); + boolean hasOriginalRequestAndResponse(); + void forward(); + void forward(String path); + void forward(ServletContext context, String path); + void complete(); + void start(Runnable run); +} Added: trunk/java/javax/servlet/AsyncEvent.java =================================================================== --- trunk/java/javax/servlet/AsyncEvent.java (rev 0) +++ trunk/java/javax/servlet/AsyncEvent.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,40 @@ +/* +* 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; + +/** + * @since 3.0 + * $Id: AsyncEvent.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +public class AsyncEvent { + private ServletRequest request; + private ServletResponse response; + + AsyncEvent(ServletRequest request, ServletResponse response) { + this.request = request; + this.response = response; + } + + public ServletRequest getRequest() { + return request; + } + + public ServletResponse getResponse() { + return response; + } +} Added: trunk/java/javax/servlet/AsyncListener.java =================================================================== --- trunk/java/javax/servlet/AsyncListener.java (rev 0) +++ trunk/java/javax/servlet/AsyncListener.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,29 @@ +/* +* 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 java.io.IOException; + +/** + * @since 3.0 + * $Id: AsyncListener.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +public interface AsyncListener { + void onComplete(AsyncEvent event) throws IOException; + void onTimeout(AsyncEvent event) throws IOException; +} Added: trunk/java/javax/servlet/DispatcherType.java =================================================================== --- trunk/java/javax/servlet/DispatcherType.java (rev 0) +++ trunk/java/javax/servlet/DispatcherType.java 2009-01-16 16:10:23 UTC (rev 905) @@ -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; + +/** + * @since 3.0 + * $Id: DispatcherType.java 734696 2009-01-15 13:24:26Z markt $ + */ +public enum DispatcherType { + FORWARD, + INCLUDE, + REQUEST, + ERROR +} Modified: trunk/java/javax/servlet/FilterConfig.java =================================================================== --- trunk/java/javax/servlet/FilterConfig.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/FilterConfig.java 2009-01-16 16:10:23 UTC (rev 905) @@ -84,7 +84,7 @@ * */ - public Enumeration getInitParameterNames(); + public Enumeration<String> getInitParameterNames(); Modified: trunk/java/javax/servlet/GenericServlet.java =================================================================== --- trunk/java/javax/servlet/GenericServlet.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/GenericServlet.java 2009-01-16 16:10:23 UTC (rev 905) @@ -119,7 +119,7 @@ * */ - public Enumeration getInitParameterNames() { + public Enumeration<String> getInitParameterNames() { return getServletConfig().getInitParameterNames(); } Modified: trunk/java/javax/servlet/LocalStrings_es.properties =================================================================== --- trunk/java/javax/servlet/LocalStrings_es.properties 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/LocalStrings_es.properties 2009-01-16 16:10:23 UTC (rev 905) @@ -1,3 +1,18 @@ -err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: {0} -value.true = true -value.false = false +# 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. + +err.not_iso8859_1 = No es un car\u00E1cter ISO 8859-1\: {0} +value.true = true +value.false = false Modified: trunk/java/javax/servlet/ServletConfig.java =================================================================== --- trunk/java/javax/servlet/ServletConfig.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/ServletConfig.java 2009-01-16 16:10:23 UTC (rev 905) @@ -89,7 +89,7 @@ * */ - public Enumeration getInitParameterNames(); + public Enumeration<String> getInitParameterNames(); } Modified: trunk/java/javax/servlet/ServletContext.java =================================================================== --- trunk/java/javax/servlet/ServletContext.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/ServletContext.java 2009-01-16 16:10:23 UTC (rev 905) @@ -19,7 +19,9 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.EnumSet; import java.util.Enumeration; +import java.util.Map; import java.util.Set; @@ -90,10 +92,10 @@ /** * Returns the major version of the Java Servlet API that this * servlet container supports. All implementations that comply - * with Version 2.4 must have this method - * return the integer 2. + * with Version 3.0 must have this method + * return the integer 3. * - * @return 2 + * @return 3 * */ @@ -104,10 +106,10 @@ /** * Returns the minor version of the Servlet API that this * servlet container supports. All implementations that comply - * with Version 2.4 must have this method - * return the integer 4. + * with Version 3.0 must have this method + * return the integer 0. * - * @return 4 + * @return 0 * */ @@ -160,7 +162,7 @@ * @since Servlet 2.3 */ - public Set getResourcePaths(String path); + public Set<String> getResourcePaths(String path); @@ -350,7 +352,7 @@ * */ - public Enumeration getServlets(); + public Enumeration<Servlet> getServlets(); @@ -369,7 +371,7 @@ * */ - public Enumeration getServletNames(); + public Enumeration<String> getServletNames(); @@ -522,7 +524,7 @@ * @see ServletConfig#getInitParameter */ - public Enumeration getInitParameterNames(); + public Enumeration<String> getInitParameterNames(); @@ -575,7 +577,7 @@ * */ - public Enumeration getAttributeNames(); + public Enumeration<String> getAttributeNames(); @@ -641,6 +643,87 @@ */ public String getServletContextName(); + + /** + * + * @param servletName + * @param urlPatterns + * @since 3.0 + */ + public void addServletMapping(String servletName, String[] urlPatterns); + + /** + * + * @param filterName + * @param description + * @param className + * @param initParameters + * @param isAsyncSupported + * @since 3.0 + */ + public void addFilter(String filterName, String description, + String className, Map<String,String> initParameters, + boolean isAsyncSupported); + + /** + * + * @param filterName + * @param dispatcherTypes + * @param isMatchAfter + * @param servletNames + * @since 3.0 + */ + public void addFilterMappingForServletNames(String filterName, + EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, + String... servletNames); + + /** + * + * @param filterName + * @param dispatcherTypes + * @param isMatchAfter + * @param urlPatterns + * @since 3.0 + */ + public void addFilterMappingForUrlPatterns(String filterName, + EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, + String... urlPatterns); + + /** + * + * @param sessionCookieConfig + * @since 3.0 + */ + public void setSessionCookieConfig(SessionCookieConfig sessionCookieConfig); + + /** + * + * @return + * @since 3.0 + */ + public SessionCookieConfig getSessionCookieConfig(); + + /** + * + * @param sessionTrackingModes + * @since 3.0 + */ + public void setSessionTrackingModes( + EnumSet<SessionTrackingMode> sessionTrackingModes); + + /** + * + * @return + * @since 3.0 + */ + public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes(); + + /** + * + * @return + * @since 3.0 + */ + public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes(); } Modified: trunk/java/javax/servlet/ServletRequest.java =================================================================== --- trunk/java/javax/servlet/ServletRequest.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/ServletRequest.java 2009-01-16 16:10:23 UTC (rev 905) @@ -91,7 +91,7 @@ * */ - public Enumeration getAttributeNames(); + public Enumeration<String> getAttributeNames(); @@ -229,7 +229,7 @@ * */ - public Enumeration getParameterNames(); + public Enumeration<String> getParameterNames(); @@ -266,7 +266,7 @@ * */ - public Map getParameterMap(); + public Map<String,String[]> getParameterMap(); @@ -480,7 +480,7 @@ * */ - public Enumeration getLocales(); + public Enumeration<Locale> getLocales(); @@ -594,5 +594,76 @@ */ public int getLocalPort(); + /** + * + * @return + * @since 3.0 + */ + public ServletContext getServletContext(); + + /** + * + * @return + * @throws java.lang.IllegalStateException + * @since 3.0 + */ + public AsyncContext startAsync() throws java.lang.IllegalStateException; + + /** + * + * @param servletRequest + * @param servletResponse + * @return + * @throws java.lang.IllegalStateException + * @since 3.0 + */ + public AsyncContext startAsync(ServletRequest servletRequest, + ServletResponse servletResponse) + throws java.lang.IllegalStateException; + + /** + * + * @return + * @since 3.0 + */ + public boolean isAsyncStarted(); + + /** + * + * @return + * @since 3.0 + */ + public boolean isAsyncSupported(); + + /** + * + * @return + * @since 3.0 + */ + public AsyncContext getAsyncContext(); + + /** + * + * @param listener + * @since 3.0 + */ + public void addAsyncListener(AsyncListener listener); + + /** + * + * @param listener + * @param servletRequest + * @param servletResponse + * @since 3.0 + */ + public void addAsyncListener(AsyncListener listener, + ServletRequest servletRequest, ServletResponse servletResponse); + + /** + * + * @param timeout + * @since 3.0 + */ + public void setAsyncTimeout(long timeout); } Modified: trunk/java/javax/servlet/ServletRequestWrapper.java =================================================================== --- trunk/java/javax/servlet/ServletRequestWrapper.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/ServletRequestWrapper.java 2009-01-16 16:10:23 UTC (rev 905) @@ -89,7 +89,7 @@ * on the wrapped request object. */ - public Enumeration getAttributeNames() { + public Enumeration<String> getAttributeNames() { return this.request.getAttributeNames(); } @@ -162,7 +162,7 @@ * The default behavior of this method is to return getParameterMap() * on the wrapped request object. */ - public Map getParameterMap() { + public Map<String,String[]> getParameterMap() { return this.request.getParameterMap(); } @@ -174,7 +174,7 @@ * on the wrapped request object. */ - public Enumeration getParameterNames() { + public Enumeration<String> getParameterNames() { return this.request.getParameterNames(); } @@ -315,7 +315,7 @@ * on the wrapped request object. */ - public Enumeration getLocales() { + public Enumeration<Locale> getLocales() { return this.request.getLocales(); } @@ -349,6 +349,7 @@ /** * The default behavior of this method is to return getRealPath(String path) * on the wrapped request object. + * @deprecated As of Version 3.0 of the Java Servlet API */ public String getRealPath(String path) { @@ -396,6 +397,116 @@ public int getLocalPort(){ return this.request.getLocalPort(); } + + /** + * The default behavior of this method is to return + * getServletContext() on the wrapped request object. + * + * @return + * @since 3.0 + */ + public ServletContext getServletContext() { + return request.getServletContext(); + } + /** + * The default behavior of this method is to return + * startAsync() on the wrapped request object. + * + * @return + * @throws java.lang.IllegalStateException + * @since 3.0 + */ + public AsyncContext startAsync() throws java.lang.IllegalStateException { + return request.startAsync(); + } + + /** + * The default behavior of this method is to return + * startAsync(ServletRequest, ServletResponse) on the wrapped request + * object. + * + * @param servletRequest + * @param servletResponse + * @return + * @throws java.lang.IllegalStateException + * @since 3.0 + */ + public AsyncContext startAsync(ServletRequest servletRequest, + ServletResponse servletResponse) + throws java.lang.IllegalStateException { + return request.startAsync(servletRequest, servletResponse); + } + + /** + * The default behavior of this method is to return + * isAsyncStarted() on the wrapped request object. + * + * @return + * @since 3.0 + */ + public boolean isAsyncStarted() { + return request.isAsyncStarted(); + } + + /** + * The default behavior of this method is to return + * isAsyncSupported() on the wrapped request object. + * + * @return + * @since 3.0 + */ + public boolean isAsyncSupported() { + return request.isAsyncSupported(); + } + + /** + * The default behavior of this method is to return + * getAsyncContext() on the wrapped request object. + * + * @return + * @since 3.0 + */ + public AsyncContext getAsyncContext() { + return request.getAsyncContext(); + } + + /** + * The default behavior of this method is to call + * addAsyncListener(AsyncListener) on the wrapped request object. + * + * @param listener + * @since 3.0 + */ + public void addAsyncListener(AsyncListener listener) { + request.addAsyncListener(listener); + } + + /** + * The default behavior of this method is to call + * addAsyncListener(AsyncListener, ServletRequest, ServletResponse) on the + * wrapped request object. + * + * @param listener + * @param servletRequest + * @param servletResponse + * @since 3.0 + */ + public void addAsyncListener(AsyncListener listener, + ServletRequest servletRequest, ServletResponse servletResponse) { + addAsyncListener(listener, servletRequest, servletResponse); + } + + /** + * The default behavior of this method is to call + * startAsync() on the wrapped request object. + * + * @param timeout + * @since 3.0 + */ + public void setAsyncTimeout(long timeout) { + request.setAsyncTimeout(timeout); + } + } Added: trunk/java/javax/servlet/SessionCookieConfig.java =================================================================== --- trunk/java/javax/servlet/SessionCookieConfig.java (rev 0) +++ trunk/java/javax/servlet/SessionCookieConfig.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,78 @@ +/* + * 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; + +/** + * + * @since 3.0 + * $Id: SessionCookieConfig.java 733271 2009-01-10 13:37:33Z markt $ + */ +public class SessionCookieConfig { + private String domain; + private String path; + private String comment; + private boolean httpOnly; + private boolean secure; + + /** + * + * @param domain Domain to use for session cookies generated for a + * {@link ServletContext} in which this + * {@link SessionCookieConfig} has been set + * @param path Path to use for session cookies generated for a + * {@link ServletContext} in which this + * {@link SessionCookieConfig} has been set. If null + * {@link ServletContext#getContextPath()} is used + * @param comment Comment to use for session cookies generated for a + * {@link ServletContext} in which this + * {@link SessionCookieConfig} has been set + * @param isHttpOnly HttpOnly flag to use for session cookies generated for + * a {@link ServletContext} in which this + * {@link SessionCookieConfig} has been set + * @param isSecure If <code>true</code>, the cookie will always be marked + * as secure. If <code>false</code> the cookie will only + * be marked as secure if the request is secure. + */ + public SessionCookieConfig(String domain, String path, String comment, + boolean isHttpOnly, boolean isSecure) { + this.domain = domain; + this.path = path; + this.comment = comment; + this.httpOnly = isHttpOnly; + this.secure = isSecure; + } + + public java.lang.String getDomain() { + return domain; + } + + public java.lang.String getPath() { + return path; + } + + public java.lang.String getComment() { + return comment; + } + + public boolean isHttpOnly() { + return httpOnly; + } + + public boolean isSecure() { + return secure; + } +} Added: trunk/java/javax/servlet/SessionTrackingMode.java =================================================================== --- trunk/java/javax/servlet/SessionTrackingMode.java (rev 0) +++ trunk/java/javax/servlet/SessionTrackingMode.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,27 @@ +/* +* 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; + +/** + * @since 3.0 + * $Id: SessionTrackingMode.java 734696 2009-01-15 13:24:26Z markt $ + */ +public enum SessionTrackingMode { + COOKIE, + URL, + SSL +} Added: trunk/java/javax/servlet/annotation/InitParam.java =================================================================== --- trunk/java/javax/servlet/annotation/InitParam.java (rev 0) +++ trunk/java/javax/servlet/annotation/InitParam.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,37 @@ +/* + * 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.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; + +/** + * @since 3.0 + * $Id: InitParam.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +(a)Target({ElementType.TYPE}) +(a)Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface InitParam { + String name(); + String value(); + String description() default ""; +} Added: trunk/java/javax/servlet/annotation/ServletFilter.java =================================================================== --- trunk/java/javax/servlet/annotation/ServletFilter.java (rev 0) +++ trunk/java/javax/servlet/annotation/ServletFilter.java 2009-01-16 16:10:23 UTC (rev 905) @@ -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.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; + +import javax.servlet.DispatcherType; + +/** + * @since 3.0 + * $Id: ServletFilter.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +(a)Target({ElementType.TYPE}) +(a)Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ServletFilter { + String description() default ""; + String displayName() default ""; + InitParam[] initParams() default {}; + String filterName() default ""; + String icon() default ""; + String[] servletNames() default {}; + String[] value() default {}; + String[] urlPatterns() default {}; + DispatcherType[] dispatcherTypes() default {DispatcherType.REQUEST}; + boolean asyncSupported() default false; + long asyncTimeout() default 60000L; +} Added: trunk/java/javax/servlet/annotation/WebServlet.java =================================================================== --- trunk/java/javax/servlet/annotation/WebServlet.java (rev 0) +++ trunk/java/javax/servlet/annotation/WebServlet.java 2009-01-16 16:10:23 UTC (rev 905) @@ -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.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; + +/** + * @since 3.0 + * $Id: WebServlet.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +(a)Target({ElementType.TYPE}) +(a)Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface WebServlet { + String name() default ""; + String[] value() default {}; + String[] urlPatterns() default {}; + int loadOnStartup() default -1; + InitParam[] initParams() default {}; + boolean asyncSupported() default false; + long asyncTimeout() default 60000L; + String icon() default ""; + String description() default ""; +} Added: trunk/java/javax/servlet/annotation/WebServletContextListener.java =================================================================== --- trunk/java/javax/servlet/annotation/WebServletContextListener.java (rev 0) +++ trunk/java/javax/servlet/annotation/WebServletContextListener.java 2009-01-16 16:10:23 UTC (rev 905) @@ -0,0 +1,35 @@ +/* + * 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.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; + +/** + * @since 3.0 + * $Id: WebServletContextListener.java 731967 2009-01-06 15:15:32Z markt $ + * TODO SERVLET3 + */ +(a)Target({ElementType.TYPE}) +(a)Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface WebServletContextListener { + String description() default ""; +} Modified: trunk/java/javax/servlet/http/Cookie.java =================================================================== --- trunk/java/javax/servlet/http/Cookie.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/Cookie.java 2009-01-16 16:10:23 UTC (rev 905) @@ -81,15 +81,15 @@ // Attributes encoded in the header's cookie fields. // - private String comment; // ;Comment=VALUE ... describes cookie's use - // ;Discard ... implied by maxAge < 0 - private String domain; // ;Domain=VALUE ... domain that sees cookie - private int maxAge = -1; // ;Max-Age=VALUE ... cookies auto-expire - private String path; // ;Path=VALUE ... URLs that see the cookie - private boolean secure; // ;Secure ... e.g. use SSL - private int version = 0; // ;Version=1 ... means RFC 2109++ style + private String comment; // ;Comment=VALUE ... describes cookie's use + // ;Discard ... implied by maxAge < 0 + private String domain; // ;Domain=VALUE ... domain that sees cookie + private int maxAge = -1; // ;Max-Age=VALUE ... cookies auto-expire + private String path; // ;Path=VALUE ... URLs that see the cookie + private boolean secure; // ;Secure ... e.g. use SSL + private int version = 0; // ;Version=1 ... means RFC 2109++ style + private boolean httpOnly; // Not in cookie specs, but supported by browsers - /** * Constructs a cookie with a specified name and value. @@ -533,5 +533,23 @@ throw new RuntimeException(e.getMessage()); } } + + /** + * + * @return + * @since 3.0 + */ + public boolean isHttpOnly() { + return httpOnly; + } + + /** + * + * @param httpOnly + * since 3.0 + */ + public void setHttpOnly(boolean httpOnly) { + this.httpOnly = httpOnly; + } } Modified: trunk/java/javax/servlet/http/HttpServlet.java =================================================================== --- trunk/java/javax/servlet/http/HttpServlet.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpServlet.java 2009-01-16 16:10:23 UTC (rev 905) @@ -416,7 +416,7 @@ } - private static Method[] getAllDeclaredMethods(Class c) { + private static Method[] getAllDeclaredMethods(Class<?> c) { if (c.equals(javax.servlet.http.HttpServlet.class)) { return null; @@ -501,7 +501,7 @@ String allow = null; if (ALLOW_GET) - if (allow==null) allow=METHOD_GET; + allow=METHOD_GET; if (ALLOW_HEAD) if (allow==null) allow=METHOD_HEAD; else allow += ", " + METHOD_HEAD; @@ -558,10 +558,10 @@ String responseString = "TRACE "+ req.getRequestURI()+ " " + req.getProtocol(); - Enumeration reqHeaderEnum = req.getHeaderNames(); + Enumeration<String> reqHeaderEnum = req.getHeaderNames(); while( reqHeaderEnum.hasMoreElements() ) { - String headerName = (String)reqHeaderEnum.nextElement(); + String headerName = reqHeaderEnum.nextElement(); responseString += CRLF + headerName + ": " + req.getHeader(headerName); } Modified: trunk/java/javax/servlet/http/HttpServletRequest.java =================================================================== --- trunk/java/javax/servlet/http/HttpServletRequest.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpServletRequest.java 2009-01-16 16:10:23 UTC (rev 905) @@ -192,7 +192,7 @@ * */ - public Enumeration getHeaders(String name); + public Enumeration<String> getHeaders(String name); @@ -219,7 +219,7 @@ * */ - public Enumeration getHeaderNames(); + public Enumeration<String> getHeaderNames(); Modified: trunk/java/javax/servlet/http/HttpServletRequestWrapper.java =================================================================== --- trunk/java/javax/servlet/http/HttpServletRequestWrapper.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpServletRequestWrapper.java 2009-01-16 16:10:23 UTC (rev 905) @@ -84,7 +84,7 @@ * The default behavior of this method is to return getHeaders(String name) * on the wrapped request object. */ - public Enumeration getHeaders(String name) { + public Enumeration<String> getHeaders(String name) { return this._getHttpServletRequest().getHeaders(name); } @@ -93,7 +93,7 @@ * on the wrapped request object. */ - public Enumeration getHeaderNames() { + public Enumeration<String> getHeaderNames() { return this._getHttpServletRequest().getHeaderNames(); } @@ -253,6 +253,7 @@ /** * The default behavior of this method is to return isRequestedSessionIdFromUrl() * on the wrapped request object. + * @deprecated As of Version 3.0 of the Java Servlet API */ public boolean isRequestedSessionIdFromUrl() { return this._getHttpServletRequest().isRequestedSessionIdFromUrl(); Modified: trunk/java/javax/servlet/http/HttpServletResponseWrapper.java =================================================================== --- trunk/java/javax/servlet/http/HttpServletResponseWrapper.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpServletResponseWrapper.java 2009-01-16 16:10:23 UTC (rev 905) @@ -87,6 +87,7 @@ /** * The default behavior of this method is to call encodeUrl(String url) * on the wrapped response object. + * @deprecated As of Version 3.0 of the Java Servlet API */ public String encodeUrl(String url) { return this._getHttpServletResponse().encodeUrl(url); @@ -95,6 +96,7 @@ /** * The default behavior of this method is to return encodeRedirectUrl(String url) * on the wrapped response object. + * @deprecated As of Version 3.0 of the Java Servlet API */ public String encodeRedirectUrl(String url) { return this._getHttpServletResponse().encodeRedirectUrl(url); @@ -187,6 +189,7 @@ /** * The default behavior of this method is to call setStatus(int sc, String sm) * on the wrapped response object. + * @deprecated As of Version 3.0 of the Java Servlet API */ public void setStatus(int sc, String sm) { this._getHttpServletResponse().setStatus(sc, sm); Modified: trunk/java/javax/servlet/http/HttpSession.java =================================================================== --- trunk/java/javax/servlet/http/HttpSession.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpSession.java 2009-01-16 16:10:23 UTC (rev 905) @@ -257,7 +257,7 @@ * */ - public Enumeration getAttributeNames(); + public Enumeration<String> getAttributeNames(); Modified: trunk/java/javax/servlet/http/HttpSessionContext.java =================================================================== --- trunk/java/javax/servlet/http/HttpSessionContext.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpSessionContext.java 2009-01-16 16:10:23 UTC (rev 905) @@ -62,7 +62,7 @@ * */ - public Enumeration getIds(); + public Enumeration<String> getIds(); } Modified: trunk/java/javax/servlet/http/HttpUtils.java =================================================================== --- trunk/java/javax/servlet/http/HttpUtils.java 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/HttpUtils.java 2009-01-16 16:10:23 UTC (rev 905) @@ -84,18 +84,18 @@ * */ - static public Hashtable parseQueryString(String s) { + static public Hashtable<String,String[]> parseQueryString(String s) { String valArray[] = null; if (s == null) { throw new IllegalArgumentException(); } - Hashtable ht = new Hashtable(); + Hashtable<String,String[]> ht = new Hashtable<String,String[]>(); StringBuffer sb = new StringBuffer(); StringTokenizer st = new StringTokenizer(s, "&"); while (st.hasMoreTokens()) { - String pair = (String)st.nextToken(); + String pair = st.nextToken(); int pos = pair.indexOf('='); if (pos == -1) { // XXX @@ -105,7 +105,7 @@ String key = parseName(pair.substring(0, pos), sb); String val = parseName(pair.substring(pos+1, pair.length()), sb); if (ht.containsKey(key)) { - String oldVals[] = (String []) ht.get(key); + String oldVals[] = ht.get(key); valArray = new String[oldVals.length + 1]; for (int i = 0; i < oldVals.length; i++) valArray[i] = oldVals[i]; @@ -163,15 +163,17 @@ */ - static public Hashtable parsePostData(int len, + static public Hashtable<String,String[]> parsePostData(int len, ServletInputStream in) { // XXX // should a length of 0 be an IllegalArgumentException - if (len <=0) - return new Hashtable(); // cheap hack to return an empty hash + // cheap hack to return an empty hash + if (len <=0) + return new Hashtable<String,String[]>(); + if (in == null) { throw new IllegalArgumentException(); } Modified: trunk/java/javax/servlet/http/package.html =================================================================== --- trunk/java/javax/servlet/http/package.html 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/http/package.html 2009-01-16 16:10:23 UTC (rev 905) @@ -2,14 +2,21 @@ <HTML> <HEAD> <!-- + 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 - Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. + http://www.apache.org/licenses/LICENSE-2.0 - This software is the proprietary information of Sun Microsystems, Inc. - Use is subject to license terms. - + 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. --> - </HEAD> <BODY BGCOLOR="white"> Modified: trunk/java/javax/servlet/package.html =================================================================== --- trunk/java/javax/servlet/package.html 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/package.html 2009-01-16 16:10:23 UTC (rev 905) @@ -1,15 +1,22 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <HTML> -<HEAD> <!-- + 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 - Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. + http://www.apache.org/licenses/LICENSE-2.0 - This software is the proprietary information of Sun Microsystems, Inc. - Use is subject to license terms. - + 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. --> - +<HEAD> </HEAD> <BODY BGCOLOR="white"> Modified: trunk/java/javax/servlet/resources/XMLSchema.dtd =================================================================== --- trunk/java/javax/servlet/resources/XMLSchema.dtd 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/resources/XMLSchema.dtd 2009-01-16 16:10:23 UTC (rev 905) @@ -1,7 +1,23 @@ +<!-- + 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. +--> <!-- DTD for XML Schemas: Part 1: Structures Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN" Official Location: http://www.w3.org/2001/XMLSchema.dtd --> -<!-- $Rev: 467222 $ $Date: 2006-10-24 05:17:11 +0200 (mar., 24 oct. 2006) $ --> +<!-- $Id: XMLSchema.dtd 615583 2008-01-27 12:01:49Z rjung $ --> <!-- Note this DTD is NOT normative, or even definitive. --> <!--d--> <!-- prose copy in the structures REC is the definitive version --> <!--d--> <!-- (which shouldn't differ from this one except for this --> <!--d--> Modified: trunk/java/javax/servlet/resources/datatypes.dtd =================================================================== --- trunk/java/javax/servlet/resources/datatypes.dtd 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/resources/datatypes.dtd 2009-01-16 16:10:23 UTC (rev 905) @@ -16,7 +16,7 @@ --> <!-- DTD for XML Schemas: Part 2: Datatypes - $Id: datatypes.dtd 467222 2006-10-24 03:17:11Z markt $ + $Id: datatypes.dtd 615583 2008-01-27 12:01:49Z rjung $ Note this DTD is NOT normative, or even definitive. - - the prose copy in the datatypes REC is the definitive version (which shouldn't differ from this one except for this comment Modified: trunk/java/javax/servlet/resources/web-app_2_3.dtd =================================================================== --- trunk/java/javax/servlet/resources/web-app_2_3.dtd 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/resources/web-app_2_3.dtd 2009-01-16 16:10:23 UTC (rev 905) @@ -14,79 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- -Copyright 2000-2001 Sun Microsystems, Inc. 901 San Antonio Road, -Palo Alto, CA 94303, U.S.A. All rights reserved. -This product or document is protected by copyright and distributed -under licenses restricting its use, copying, distribution, and -decompilation. No part of this product or documentation may be -reproduced in any form by any means without prior written authorization -of Sun and its licensors, if any. - -Third party software, including font technology, is copyrighted and -licensed from Sun suppliers. - -Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java -Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, -are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. -and other countries. - -All SPARC trademarks are used under license and are trademarks -or registered trademarks of SPARC International, Inc. -in the U.S. and other countries. Products bearing SPARC -trademarks are based upon an architecture developed by Sun Microsystems, Inc. - -PostScript is a registered trademark of Adobe Systems, Inc. - -Federal Acquisitions: Commercial Software - Government Users Subject to -Standard License Terms and Conditions. - -DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED -CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY -IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT -TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY -INVALID. - -_________________________________________________________________________ - -Copyright 2000-2001 Sun Microsystems, Inc., -901 San Antonio Road, Palo Alto, CA 94303, Etats-Unis. -Tous droits re'serve's. - - -Ce produit ou document est prote'ge' par un copyright et distribue' avec -des licences qui en restreignent l'utilisation, la copie, la distribution, -et la de'compilation. Aucune partie de ce produit ou de sa documentation -associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen -que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses -bailleurs de licence, s'il y en a. - -Le logiciel de'tenu par des tiers, et qui comprend la technologie -relative aux polices de caracte`res, est prote'ge' par un copyright -et licencie' par des fournisseurs de Sun. - -Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java -Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans, -sont des marques de fabrique ou des marques de'pose'es de Sun -Microsystems, Inc. aux Etats-Unis et dans d'autres pays. - -Toutes les marques SPARC sont utilise'es sous licence et sont -des marques de fabrique ou des marques de'pose'es de SPARC -International, Inc. aux Etats-Unis et dans -d'autres pays. Les produits portant les marques SPARC sont -base's sur une architecture de'veloppe'e par Sun Microsystems, Inc. - -Postcript est une marque enregistre'e d'Adobe Systems Inc. - -LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS, -DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES, -DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT -TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE -A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON. ---> - <!-- This is the XML DTD for the Servlet 2.3 deployment descriptor. All Servlet 2.3 deployment descriptors must include a DOCTYPE Modified: trunk/java/javax/servlet/resources/web-app_2_4.xsd =================================================================== --- trunk/java/javax/servlet/resources/web-app_2_4.xsd 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/resources/web-app_2_4.xsd 2009-01-16 16:10:23 UTC (rev 905) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -<?xml version="1.0" encoding="UTF-8"?> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" @@ -770,7 +770,7 @@ <xsd:simpleContent> <xsd:restriction base="j2ee:string"> - <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/> + <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> Modified: trunk/java/javax/servlet/resources/web-app_2_5.xsd =================================================================== --- trunk/java/javax/servlet/resources/web-app_2_5.xsd 2009-01-15 15:56:37 UTC (rev 904) +++ trunk/java/javax/servlet/resources/web-app_2_5.xsd 2009-01-16 16:10:23 UTC (rev 905) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -<?xml version="1.0" encoding="UTF-8"?> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/javaee" xmlns:javaee="http://java.sun.com/xml/ns/javaee" @@ -473,14 +473,14 @@ <xsd:attribute name="id" type="xsd:ID" /> </xsd:complexType> <!-- **************************************************** --> - <xsd:simpleType name="�?http-methodType�?"> + <xsd:simpleType name="http-methodType"> <xsd:annotation> <xsd:documentation> A HTTP method type as defined in HTTP 1.1 section 2.2. </xsd:documentation> </xsd:annotation> - <xsd:restriction base="�?xsd:token�?"> - <xsd:pattern value="�?[\p{L}-[\p{Cc}\p{Z}]]+�?" /> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="[\p{L}-[\p{Cc}\p{Z}]]+" /> </xsd:restriction> </xsd:simpleType>