You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/31 20:54:05 UTC
[tomcat] 01/02: Remove trailing whitespace
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a3b80b03604ae3fb9537c43d9c91fb8b249fd2d2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 31 21:36:09 2019 +0100
Remove trailing whitespace
Align 7.0.x with 8.5.x (and 9.0.x) primarily to reduce conflicts when
back-porting.
---
RELEASE-NOTES | 2 +-
java/javax/annotation/Generated.java | 4 +-
java/javax/annotation/PostConstruct.java | 4 +-
java/javax/annotation/PreDestroy.java | 4 +-
java/javax/annotation/Resource.java | 4 +-
java/javax/annotation/Resources.java | 4 +-
java/javax/annotation/security/DeclareRoles.java | 4 +-
java/javax/annotation/security/DenyAll.java | 4 +-
java/javax/annotation/security/PermitAll.java | 4 +-
java/javax/annotation/security/RolesAllowed.java | 4 +-
java/javax/annotation/security/RunAs.java | 4 +-
java/javax/ejb/EJB.java | 4 +-
java/javax/ejb/EJBs.java | 4 +-
java/javax/el/ArrayELResolver.java | 4 +-
java/javax/el/BeanELResolver.java | 12 +-
java/javax/el/CompositeELResolver.java | 10 +-
java/javax/el/ELContext.java | 32 +-
java/javax/el/ELContextEvent.java | 6 +-
java/javax/el/ELContextListener.java | 6 +-
java/javax/el/ELException.java | 12 +-
java/javax/el/ELResolver.java | 18 +-
java/javax/el/Expression.java | 8 +-
java/javax/el/ExpressionFactory.java | 24 +-
java/javax/el/FunctionMapper.java | 6 +-
java/javax/el/ListELResolver.java | 4 +-
java/javax/el/MapELResolver.java | 10 +-
java/javax/el/MethodExpression.java | 10 +-
java/javax/el/MethodInfo.java | 18 +-
java/javax/el/MethodNotFoundException.java | 6 +-
java/javax/el/PropertyNotFoundException.java | 6 +-
java/javax/el/PropertyNotWritableException.java | 6 +-
java/javax/el/ResourceBundleELResolver.java | 18 +-
java/javax/el/Util.java | 4 +-
java/javax/el/ValueExpression.java | 12 +-
java/javax/el/ValueReference.java | 10 +-
java/javax/el/VariableMapper.java | 6 +-
java/javax/persistence/PersistenceContext.java | 4 +-
java/javax/persistence/PersistenceContextType.java | 4 +-
java/javax/persistence/PersistenceContexts.java | 4 +-
java/javax/persistence/PersistenceUnit.java | 4 +-
java/javax/persistence/PersistenceUnits.java | 4 +-
java/javax/servlet/AsyncContext.java | 32 +-
java/javax/servlet/AsyncEvent.java | 10 +-
java/javax/servlet/Filter.java | 4 +-
java/javax/servlet/FilterChain.java | 6 +-
java/javax/servlet/FilterConfig.java | 14 +-
java/javax/servlet/FilterRegistration.java | 14 +-
java/javax/servlet/GenericServlet.java | 22 +-
java/javax/servlet/HttpConstraintElement.java | 18 +-
.../javax/servlet/HttpMethodConstraintElement.java | 4 +-
java/javax/servlet/MultipartConfigElement.java | 16 +-
java/javax/servlet/Registration.java | 14 +-
java/javax/servlet/RequestDispatcher.java | 38 +-
java/javax/servlet/Servlet.java | 54 +-
java/javax/servlet/ServletConfig.java | 8 +-
.../javax/servlet/ServletContainerInitializer.java | 2 +-
java/javax/servlet/ServletContext.java | 42 +-
.../servlet/ServletContextAttributeEvent.java | 2 +-
.../servlet/ServletContextAttributeListener.java | 2 +-
java/javax/servlet/ServletContextEvent.java | 6 +-
java/javax/servlet/ServletContextListener.java | 4 +-
java/javax/servlet/ServletException.java | 10 +-
java/javax/servlet/ServletInputStream.java | 4 +-
java/javax/servlet/ServletOutputStream.java | 32 +-
java/javax/servlet/ServletRegistration.java | 8 +-
java/javax/servlet/ServletRequest.java | 58 +-
.../servlet/ServletRequestAttributeEvent.java | 8 +-
java/javax/servlet/ServletRequestEvent.java | 4 +-
java/javax/servlet/ServletRequestWrapper.java | 28 +-
java/javax/servlet/ServletResponse.java | 32 +-
java/javax/servlet/ServletResponseWrapper.java | 10 +-
java/javax/servlet/ServletSecurityElement.java | 26 +-
java/javax/servlet/SessionCookieConfig.java | 48 +-
java/javax/servlet/SingleThreadModel.java | 2 +-
java/javax/servlet/UnavailableException.java | 12 +-
java/javax/servlet/annotation/HandlesTypes.java | 6 +-
java/javax/servlet/annotation/HttpConstraint.java | 14 +-
.../servlet/annotation/HttpMethodConstraint.java | 16 +-
java/javax/servlet/annotation/MultipartConfig.java | 12 +-
java/javax/servlet/annotation/ServletSecurity.java | 10 +-
java/javax/servlet/annotation/WebFilter.java | 24 +-
java/javax/servlet/annotation/WebInitParam.java | 8 +-
java/javax/servlet/annotation/WebListener.java | 10 +-
java/javax/servlet/annotation/WebServlet.java | 22 +-
.../servlet/descriptor/JspConfigDescriptor.java | 4 +-
.../descriptor/JspPropertyGroupDescriptor.java | 4 +-
.../javax/servlet/descriptor/TaglibDescriptor.java | 4 +-
java/javax/servlet/http/HttpServletRequest.java | 52 +-
.../servlet/http/HttpServletRequestWrapper.java | 6 +-
java/javax/servlet/http/HttpServletResponse.java | 32 +-
.../servlet/http/HttpServletResponseWrapper.java | 10 +-
.../http/HttpSessionActivationListener.java | 8 +-
.../servlet/http/HttpSessionAttributeListener.java | 2 +-
.../servlet/http/HttpSessionBindingEvent.java | 10 +-
.../servlet/http/HttpSessionBindingListener.java | 6 +-
java/javax/servlet/http/HttpSessionEvent.java | 2 +-
java/javax/servlet/http/HttpSessionListener.java | 6 +-
java/javax/servlet/http/HttpUtils.java | 50 +-
java/javax/servlet/http/Part.java | 2 +-
java/javax/servlet/jsp/ErrorData.java | 12 +-
java/javax/servlet/jsp/HttpJspPage.java | 8 +-
java/javax/servlet/jsp/JspApplicationContext.java | 8 +-
java/javax/servlet/jsp/JspContext.java | 66 +-
java/javax/servlet/jsp/JspEngineInfo.java | 6 +-
java/javax/servlet/jsp/JspException.java | 14 +-
java/javax/servlet/jsp/JspFactory.java | 20 +-
java/javax/servlet/jsp/JspPage.java | 4 +-
java/javax/servlet/jsp/JspTagException.java | 6 +-
java/javax/servlet/jsp/JspWriter.java | 58 +-
java/javax/servlet/jsp/PageContext.java | 104 +--
java/javax/servlet/jsp/SkipPageException.java | 8 +-
java/javax/servlet/jsp/el/ELException.java | 10 +-
java/javax/servlet/jsp/el/Expression.java | 18 +-
java/javax/servlet/jsp/el/ExpressionEvaluator.java | 6 +-
java/javax/servlet/jsp/el/FunctionMapper.java | 4 +-
java/javax/servlet/jsp/el/VariableResolver.java | 4 +-
java/javax/servlet/jsp/el/package.html | 12 +-
java/javax/servlet/jsp/resources/jsp_2_1.xsd | 12 +-
java/javax/servlet/jsp/resources/jsp_2_2.xsd | 62 +-
java/javax/servlet/jsp/resources/jspxml.dtd | 2 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 54 +-
.../jsp/resources/web-jsptaglibrary_2_1.xsd | 10 +-
java/javax/servlet/jsp/tagext/BodyContent.java | 12 +-
java/javax/servlet/jsp/tagext/BodyTag.java | 6 +-
java/javax/servlet/jsp/tagext/BodyTagSupport.java | 16 +-
.../servlet/jsp/tagext/DynamicAttributes.java | 16 +-
java/javax/servlet/jsp/tagext/FunctionInfo.java | 4 +-
java/javax/servlet/jsp/tagext/IterationTag.java | 12 +-
java/javax/servlet/jsp/tagext/JspFragment.java | 28 +-
java/javax/servlet/jsp/tagext/JspTag.java | 2 +-
java/javax/servlet/jsp/tagext/PageData.java | 8 +-
java/javax/servlet/jsp/tagext/SimpleTag.java | 86 +--
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 52 +-
java/javax/servlet/jsp/tagext/Tag.java | 36 +-
java/javax/servlet/jsp/tagext/TagAdapter.java | 18 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagData.java | 12 +-
java/javax/servlet/jsp/tagext/TagExtraInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagFileInfo.java | 8 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 24 +-
java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 32 +-
.../servlet/jsp/tagext/TagLibraryValidator.java | 24 +-
java/javax/servlet/jsp/tagext/TagSupport.java | 4 +-
java/javax/servlet/jsp/tagext/TagVariableInfo.java | 12 +-
java/javax/servlet/jsp/tagext/TryCatchFinally.java | 10 +-
.../servlet/jsp/tagext/ValidationMessage.java | 6 +-
java/javax/servlet/jsp/tagext/VariableInfo.java | 10 +-
java/javax/servlet/jsp/tagext/package.html | 4 +-
java/javax/servlet/resources/XMLSchema.dtd | 6 +-
java/javax/servlet/resources/datatypes.dtd | 2 +-
java/javax/servlet/resources/javaee_6.xsd | 500 +++++++--------
.../servlet/resources/javaee_web_services_1_3.xsd | 122 ++--
.../resources/javaee_web_services_client_1_3.xsd | 188 +++---
java/javax/servlet/resources/web-app_2_2.dtd | 2 +-
java/javax/servlet/resources/web-app_2_5.xsd | 36 +-
java/javax/servlet/resources/web-app_3_0.xsd | 64 +-
java/javax/servlet/resources/web-common_3_0.xsd | 246 +++----
java/javax/servlet/resources/web-fragment_3_0.xsd | 64 +-
java/javax/servlet/resources/xml.xsd | 2 +-
java/javax/xml/ws/WebServiceRef.java | 4 +-
java/javax/xml/ws/WebServiceRefs.java | 4 +-
java/org/apache/catalina/Realm.java | 2 +-
java/org/apache/catalina/Valve.java | 10 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 44 +-
java/org/apache/catalina/ant/DeployTask.java | 6 +-
java/org/apache/catalina/ant/FindLeaksTask.java | 4 +-
.../apache/catalina/ant/JKStatusUpdateTask.java | 18 +-
java/org/apache/catalina/ant/JMXGetTask.java | 8 +-
java/org/apache/catalina/ant/JMXQueryTask.java | 14 +-
java/org/apache/catalina/ant/JMXSetTask.java | 12 +-
java/org/apache/catalina/ant/ListTask.java | 4 +-
java/org/apache/catalina/ant/ReloadTask.java | 4 +-
java/org/apache/catalina/ant/ResourcesTask.java | 4 +-
java/org/apache/catalina/ant/ServerinfoTask.java | 4 +-
java/org/apache/catalina/ant/SessionsTask.java | 14 +-
java/org/apache/catalina/ant/StartTask.java | 4 +-
java/org/apache/catalina/ant/StopTask.java | 6 +-
java/org/apache/catalina/ant/UndeployTask.java | 4 +-
java/org/apache/catalina/ant/ValidatorTask.java | 6 +-
java/org/apache/catalina/ant/antlib.xml | 4 +-
java/org/apache/catalina/ant/jmx/Arg.java | 4 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 20 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 28 +-
.../ant/jmx/JMXAccessorEqualsCondition.java | 14 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 22 +-
.../catalina/ant/jmx/JMXAccessorInvokeTask.java | 30 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 30 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 32 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 40 +-
.../ant/jmx/JMXAccessorUnregisterTask.java | 12 +-
java/org/apache/catalina/ant/jmx/package.html | 2 +-
java/org/apache/catalina/ant/package.html | 2 +-
.../apache/catalina/authenticator/Constants.java | 4 +-
.../catalina/authenticator/SSLAuthenticator.java | 4 +-
.../catalina/authenticator/SavedRequest.java | 14 +-
.../catalina/authenticator/SingleSignOn.java | 20 +-
.../catalina/authenticator/SingleSignOnEntry.java | 4 +-
.../authenticator/SpnegoAuthenticator.java | 14 +-
.../catalina/authenticator/mbeans-descriptors.xml | 92 +--
.../apache/catalina/connector/RequestFacade.java | 2 +-
.../org/apache/catalina/core/AccessLogAdapter.java | 4 +-
.../catalina/core/ApplicationContextFacade.java | 90 +--
.../catalina/core/ApplicationFilterChain.java | 86 +--
.../catalina/core/ApplicationFilterFactory.java | 40 +-
.../core/ApplicationFilterRegistration.java | 42 +-
.../catalina/core/ApplicationHttpResponse.java | 4 +-
.../core/ApplicationJspConfigDescriptor.java | 4 +-
.../ApplicationJspPropertyGroupDescriptor.java | 54 +-
.../apache/catalina/core/ApplicationRequest.java | 8 +-
.../apache/catalina/core/ApplicationResponse.java | 4 +-
.../core/ApplicationSessionCookieConfig.java | 12 +-
.../catalina/core/ApplicationTaglibDescriptor.java | 6 +-
.../apache/catalina/core/AsyncListenerWrapper.java | 8 +-
java/org/apache/catalina/core/Constants.java | 4 +-
java/org/apache/catalina/core/StandardEngine.java | 18 +-
.../apache/catalina/core/StandardEngineValve.java | 6 +-
.../org/apache/catalina/core/StandardPipeline.java | 26 +-
java/org/apache/catalina/core/StandardServer.java | 62 +-
java/org/apache/catalina/core/StandardService.java | 16 +-
.../catalina/core/StandardThreadExecutor.java | 50 +-
.../catalina/core/StandardWrapperFacade.java | 4 +-
.../core/ThreadLocalLeakPreventionListener.java | 10 +-
.../apache/catalina/core/mbeans-descriptors.xml | 706 ++++++++++-----------
.../catalina/deploy/ApplicationParameter.java | 4 +-
java/org/apache/catalina/deploy/Constants.java | 4 +-
java/org/apache/catalina/deploy/ContextEjb.java | 6 +-
.../apache/catalina/deploy/ContextEnvironment.java | 4 +-
.../org/apache/catalina/deploy/ContextHandler.java | 6 +-
.../apache/catalina/deploy/ContextLocalEjb.java | 6 +-
.../apache/catalina/deploy/ContextResource.java | 10 +-
.../catalina/deploy/ContextResourceEnvRef.java | 6 +-
.../catalina/deploy/ContextResourceLink.java | 4 +-
.../org/apache/catalina/deploy/ContextService.java | 10 +-
.../apache/catalina/deploy/ContextTransaction.java | 10 +-
java/org/apache/catalina/deploy/ErrorPage.java | 4 +-
java/org/apache/catalina/deploy/FilterDef.java | 16 +-
java/org/apache/catalina/deploy/FilterMap.java | 38 +-
java/org/apache/catalina/deploy/Injectable.java | 4 +-
.../apache/catalina/deploy/InjectionTarget.java | 4 +-
java/org/apache/catalina/deploy/LoginConfig.java | 4 +-
.../apache/catalina/deploy/MessageDestination.java | 4 +-
.../catalina/deploy/MessageDestinationRef.java | 6 +-
java/org/apache/catalina/deploy/MultipartDef.java | 18 +-
.../apache/catalina/deploy/NamingResources.java | 58 +-
java/org/apache/catalina/deploy/ResourceBase.java | 6 +-
.../apache/catalina/deploy/SecurityCollection.java | 4 +-
.../apache/catalina/deploy/SecurityConstraint.java | 24 +-
.../apache/catalina/deploy/SecurityRoleRef.java | 4 +-
java/org/apache/catalina/deploy/ServletDef.java | 30 +-
java/org/apache/catalina/deploy/SessionConfig.java | 24 +-
.../apache/catalina/deploy/mbeans-descriptors.xml | 36 +-
.../catalina/filters/AddDefaultCharsetFilter.java | 14 +-
java/org/apache/catalina/filters/Constants.java | 8 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 46 +-
.../apache/catalina/filters/RemoteAddrFilter.java | 10 +-
.../catalina/filters/RequestDumperFilter.java | 44 +-
.../org/apache/catalina/filters/RequestFilter.java | 16 +-
.../apache/catalina/filters/WebdavFixFilter.java | 12 +-
java/org/apache/catalina/ha/CatalinaCluster.java | 34 +-
java/org/apache/catalina/ha/ClusterDeployer.java | 4 +-
java/org/apache/catalina/ha/ClusterListener.java | 12 +-
java/org/apache/catalina/ha/ClusterManager.java | 12 +-
java/org/apache/catalina/ha/ClusterMessage.java | 2 +-
.../org/apache/catalina/ha/ClusterMessageBase.java | 2 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 10 +-
java/org/apache/catalina/ha/ClusterSession.java | 4 +-
java/org/apache/catalina/ha/ClusterValve.java | 4 +-
.../ha/authenticator/ClusterSingleSignOn.java | 2 +-
.../apache/catalina/ha/backend/CollectedInfo.java | 8 +-
.../catalina/ha/backend/HeartbeatListener.java | 6 +-
.../catalina/ha/backend/MultiCastSender.java | 8 +-
java/org/apache/catalina/ha/backend/Proxy.java | 4 +-
java/org/apache/catalina/ha/backend/Sender.java | 4 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 16 +-
java/org/apache/catalina/ha/deploy/Constants.java | 4 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 34 +-
.../catalina/ha/deploy/FileChangeListener.java | 4 +-
.../org/apache/catalina/ha/deploy/FileMessage.java | 24 +-
.../catalina/ha/deploy/FileMessageFactory.java | 32 +-
.../apache/catalina/ha/deploy/UndeployMessage.java | 2 +-
java/org/apache/catalina/ha/deploy/WarWatcher.java | 8 +-
.../apache/catalina/ha/jmx/ClusterJmxHelper.java | 26 +-
.../ha/session/ClusterSessionListener.java | 2 +-
java/org/apache/catalina/ha/session/Constants.java | 4 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 8 +-
.../session/JvmRouteSessionIDBinderListener.java | 12 +-
.../catalina/ha/session/SerializablePrincipal.java | 18 +-
.../catalina/ha/session/SessionMessageImpl.java | 8 +-
java/org/apache/catalina/ha/tcp/Constants.java | 4 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 78 +--
.../apache/catalina/ha/tcp/SendMessageData.java | 6 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 110 ++--
.../apache/catalina/ha/util/IDynamicProperty.java | 12 +-
java/org/apache/catalina/loader/Constants.java | 4 +-
.../apache/catalina/loader/JdbcLeakPrevention.java | 6 +-
.../catalina/loader/ParallelWebappClassLoader.java | 4 +-
java/org/apache/catalina/loader/ResourceEntry.java | 4 +-
.../catalina/loader/StandardClassLoader.java | 4 +-
.../catalina/loader/StandardClassLoaderMBean.java | 4 +-
.../apache/catalina/loader/WebappClassLoader.java | 2 +-
.../apache/catalina/loader/mbeans-descriptors.xml | 10 +-
java/org/apache/catalina/manager/Constants.java | 18 +-
.../apache/catalina/manager/DummyProxySession.java | 6 +-
.../apache/catalina/manager/JMXProxyServlet.java | 10 +-
java/org/apache/catalina/manager/JspHelper.java | 4 +-
.../catalina/manager/StatusManagerServlet.java | 14 +-
.../apache/catalina/manager/host/Constants.java | 4 +-
.../manager/host/HTMLHostManagerServlet.java | 26 +-
.../catalina/manager/host/HostManagerServlet.java | 56 +-
.../manager/util/BaseSessionComparator.java | 6 +-
.../apache/catalina/manager/util/SessionUtils.java | 2 +-
.../org/apache/catalina/mbeans/ClassNameMBean.java | 4 +-
.../org/apache/catalina/mbeans/ConnectorMBean.java | 8 +-
java/org/apache/catalina/mbeans/Constants.java | 4 +-
.../org/apache/catalina/mbeans/ContainerMBean.java | 58 +-
.../catalina/mbeans/ContextEnvironmentMBean.java | 14 +-
java/org/apache/catalina/mbeans/ContextMBean.java | 86 +--
.../catalina/mbeans/ContextResourceLinkMBean.java | 34 +-
.../catalina/mbeans/ContextResourceMBean.java | 34 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 4 +-
java/org/apache/catalina/mbeans/GroupMBean.java | 4 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 126 ++--
java/org/apache/catalina/mbeans/MBeanUtils.java | 168 ++---
.../catalina/mbeans/MemoryUserDatabaseMBean.java | 4 +-
.../catalina/mbeans/NamingResourcesMBean.java | 72 +--
java/org/apache/catalina/mbeans/RoleMBean.java | 4 +-
java/org/apache/catalina/mbeans/ServiceMBean.java | 80 +--
java/org/apache/catalina/mbeans/UserMBean.java | 4 +-
.../apache/catalina/mbeans/mbeans-descriptors.xml | 6 +-
java/org/apache/catalina/realm/CombinedRealm.java | 28 +-
java/org/apache/catalina/realm/Constants.java | 6 +-
.../apache/catalina/realm/GenericPrincipal.java | 22 +-
.../apache/catalina/realm/JAASCallbackHandler.java | 16 +-
.../catalina/realm/JAASMemoryLoginModule.java | 8 +-
java/org/apache/catalina/realm/LockOutRealm.java | 42 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 4 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 10 +-
.../apache/catalina/realm/mbeans-descriptors.xml | 90 +--
java/org/apache/catalina/session/Constants.java | 4 +-
java/org/apache/catalina/session/FileStore.java | 8 +-
java/org/apache/catalina/session/JDBCStore.java | 28 +-
java/org/apache/catalina/session/ManagerBase.java | 84 +--
.../apache/catalina/session/PersistentManager.java | 6 +-
.../catalina/session/PersistentManagerBase.java | 70 +-
.../apache/catalina/session/StandardManager.java | 6 +-
.../catalina/session/StandardSessionFacade.java | 4 +-
java/org/apache/catalina/session/StoreBase.java | 18 +-
.../session/TooManyActiveSessionsException.java | 6 +-
.../apache/catalina/session/mbeans-descriptors.xml | 64 +-
.../catalina/ssi/ByteArrayServletOutputStream.java | 4 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 4 +-
.../apache/catalina/ssi/ExpressionTokenizer.java | 2 +-
java/org/apache/catalina/ssi/SSICommand.java | 4 +-
java/org/apache/catalina/ssi/SSIConditional.java | 2 +-
.../apache/catalina/ssi/SSIConditionalState.java | 2 +-
java/org/apache/catalina/ssi/SSIConfig.java | 2 +-
java/org/apache/catalina/ssi/SSIEcho.java | 2 +-
java/org/apache/catalina/ssi/SSIExec.java | 4 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 8 +-
java/org/apache/catalina/ssi/SSIFlastmod.java | 2 +-
java/org/apache/catalina/ssi/SSIFsize.java | 2 +-
java/org/apache/catalina/ssi/SSIInclude.java | 2 +-
java/org/apache/catalina/ssi/SSIProcessor.java | 14 +-
java/org/apache/catalina/ssi/SSIServlet.java | 26 +-
.../catalina/ssi/SSIServletExternalResolver.java | 8 +-
.../apache/catalina/ssi/SSIServletRequestUtil.java | 2 +-
java/org/apache/catalina/ssi/SSISet.java | 2 +-
.../catalina/ssi/SSIStopProcessingException.java | 2 +-
java/org/apache/catalina/startup/Bootstrap.java | 2 +-
.../catalina/startup/CatalinaProperties.java | 10 +-
.../catalina/startup/ClassLoaderFactory.java | 18 +-
.../catalina/startup/ConnectorCreateRule.java | 20 +-
.../apache/catalina/startup/ContextRuleSet.java | 4 +-
.../startup/CopyParentClassLoaderRule.java | 4 +-
.../apache/catalina/startup/DigesterFactory.java | 22 +-
java/org/apache/catalina/startup/Embedded.java | 20 +-
java/org/apache/catalina/startup/EngineConfig.java | 4 +-
.../org/apache/catalina/startup/EngineRuleSet.java | 2 +-
java/org/apache/catalina/startup/ExpandWar.java | 30 +-
.../apache/catalina/startup/HomesUserDatabase.java | 4 +-
java/org/apache/catalina/startup/HostRuleSet.java | 4 +-
.../catalina/startup/LifecycleListenerRule.java | 10 +-
.../org/apache/catalina/startup/NamingRuleSet.java | 4 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 4 +-
.../catalina/startup/SetAllPropertiesRule.java | 14 +-
.../catalina/startup/SetContextPropertiesRule.java | 12 +-
.../apache/catalina/startup/SetNextNamingRule.java | 20 +-
java/org/apache/catalina/startup/TldConfig.java | 52 +-
java/org/apache/catalina/startup/TldRuleSet.java | 26 +-
java/org/apache/catalina/startup/Tool.java | 6 +-
java/org/apache/catalina/startup/UserConfig.java | 8 +-
java/org/apache/catalina/startup/UserDatabase.java | 4 +-
java/org/apache/catalina/startup/WebRuleSet.java | 96 +--
.../apache/catalina/startup/XmlErrorHandler.java | 10 +-
.../apache/catalina/startup/mbeans-descriptors.xml | 26 +-
.../apache/catalina/tribes/ChannelException.java | 38 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 32 +-
.../apache/catalina/tribes/ChannelListener.java | 18 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 22 +-
.../apache/catalina/tribes/ChannelReceiver.java | 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 12 +-
java/org/apache/catalina/tribes/Constants.java | 4 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 12 +-
java/org/apache/catalina/tribes/Heartbeat.java | 6 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 10 +-
.../apache/catalina/tribes/MembershipListener.java | 6 +-
.../apache/catalina/tribes/MembershipService.java | 42 +-
.../apache/catalina/tribes/MessageListener.java | 22 +-
java/org/apache/catalina/tribes/UniqueId.java | 16 +-
.../catalina/tribes/group/AbsoluteOrder.java | 26 +-
.../catalina/tribes/group/ChannelCoordinator.java | 42 +-
.../tribes/group/ChannelInterceptorBase.java | 8 +-
.../catalina/tribes/group/ExtendedRpcCallback.java | 14 +-
.../apache/catalina/tribes/group/GroupChannel.java | 2 +-
.../catalina/tribes/group/InterceptorPayload.java | 6 +-
.../org/apache/catalina/tribes/group/Response.java | 6 +-
.../apache/catalina/tribes/group/RpcCallback.java | 12 +-
.../apache/catalina/tribes/group/RpcChannel.java | 62 +-
.../apache/catalina/tribes/group/RpcMessage.java | 12 +-
.../interceptors/DomainFilterInterceptor.java | 6 +-
.../interceptors/FragmentationInterceptor.java | 48 +-
.../tribes/group/interceptors/GzipInterceptor.java | 10 +-
.../interceptors/MessageDispatch15Interceptor.java | 10 +-
.../interceptors/MessageDispatchInterceptor.java | 32 +-
.../group/interceptors/NonBlockingCoordinator.java | 176 ++---
.../group/interceptors/OrderInterceptor.java | 68 +-
.../group/interceptors/SimpleCoordinator.java | 10 +-
.../interceptors/StaticMembershipInterceptor.java | 6 +-
.../group/interceptors/TcpPingInterceptor.java | 34 +-
.../group/interceptors/ThroughputInterceptor.java | 12 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 4 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 54 +-
.../tribes/io/DirectByteArrayOutputStream.java | 10 +-
.../apache/catalina/tribes/io/ListenCallback.java | 8 +-
.../catalina/tribes/io/ReplicationStream.java | 22 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 84 +--
.../catalina/tribes/membership/Constants.java | 4 +-
.../catalina/tribes/membership/McastService.java | 20 +-
.../tribes/membership/McastServiceImpl.java | 52 +-
.../catalina/tribes/membership/Membership.java | 38 +-
.../catalina/tribes/membership/StaticMember.java | 16 +-
java/org/apache/catalina/tribes/package.html | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 2 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 32 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 34 +-
.../apache/catalina/tribes/tipis/Streamable.java | 12 +-
.../catalina/tribes/transport/AbstractRxTask.java | 14 +-
.../catalina/tribes/transport/Constants.java | 6 +-
.../catalina/tribes/transport/DataSender.java | 8 +-
.../tribes/transport/MultiPointSender.java | 4 +-
.../catalina/tribes/transport/PooledSender.java | 20 +-
.../catalina/tribes/transport/ReceiverBase.java | 6 +-
.../tribes/transport/ReplicationTransmitter.java | 22 +-
.../catalina/tribes/transport/RxTaskPool.java | 18 +-
.../catalina/tribes/transport/SenderState.java | 34 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 8 +-
.../tribes/transport/bio/BioReplicationTask.java | 22 +-
.../tribes/transport/bio/MultipointBioSender.java | 2 +-
.../tribes/transport/bio/PooledMultiSender.java | 4 +-
.../tribes/transport/bio/util/LinkObject.java | 6 +-
.../bio/util/SingleRemoveSynchronizedAddLock.java | 16 +-
.../catalina/tribes/transport/nio/NioSender.java | 4 +-
.../tribes/transport/nio/PooledParallelSender.java | 4 +-
java/org/apache/catalina/tribes/util/Arrays.java | 40 +-
.../catalina/tribes/util/ExecutorFactory.java | 6 +-
java/org/apache/catalina/tribes/util/Logs.java | 6 +-
.../apache/catalina/tribes/util/StringManager.java | 4 +-
.../catalina/tribes/util/TcclThreadFactory.java | 12 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 14 +-
java/org/apache/catalina/users/AbstractGroup.java | 6 +-
java/org/apache/catalina/users/AbstractRole.java | 4 +-
java/org/apache/catalina/users/AbstractUser.java | 4 +-
java/org/apache/catalina/users/Constants.java | 4 +-
java/org/apache/catalina/users/MemoryGroup.java | 4 +-
java/org/apache/catalina/users/MemoryRole.java | 4 +-
java/org/apache/catalina/users/MemoryUser.java | 4 +-
.../apache/catalina/users/MemoryUserDatabase.java | 4 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 4 +-
java/org/apache/catalina/util/Base64.java | 16 +-
java/org/apache/catalina/util/CharsetMapper.java | 10 +-
java/org/apache/catalina/util/ContextName.java | 48 +-
.../catalina/util/CustomObjectInputStream.java | 4 +-
java/org/apache/catalina/util/DOMWriter.java | 10 +-
java/org/apache/catalina/util/DateTool.java | 6 +-
java/org/apache/catalina/util/Enumerator.java | 6 +-
java/org/apache/catalina/util/Extension.java | 8 +-
.../apache/catalina/util/ExtensionValidator.java | 68 +-
java/org/apache/catalina/util/IOTools.java | 20 +-
java/org/apache/catalina/util/InstanceSupport.java | 6 +-
.../apache/catalina/util/LifecycleMBeanBase.java | 68 +-
.../org/apache/catalina/util/LifecycleSupport.java | 8 +-
java/org/apache/catalina/util/MIME2Java.java | 4 +-
.../org/apache/catalina/util/ManifestResource.java | 40 +-
java/org/apache/catalina/util/RequestUtil.java | 18 +-
java/org/apache/catalina/util/ResourceSet.java | 4 +-
java/org/apache/catalina/util/SchemaResolver.java | 4 +-
java/org/apache/catalina/util/ServerInfo.java | 4 +-
java/org/apache/catalina/util/Strftime.java | 14 +-
java/org/apache/catalina/util/StringParser.java | 4 +-
java/org/apache/catalina/util/TomcatCSS.java | 4 +-
java/org/apache/catalina/util/XMLWriter.java | 4 +-
.../apache/catalina/valves/PersistentValve.java | 8 +-
java/org/apache/catalina/websocket/Constants.java | 4 +-
.../apache/catalina/websocket/MessageInbound.java | 4 +-
.../apache/catalina/websocket/StreamInbound.java | 8 +-
java/org/apache/catalina/websocket/WsFrame.java | 4 +-
.../websocket/WsHttpServletRequestWrapper.java | 4 +-
.../apache/catalina/websocket/WsInputStream.java | 4 +-
java/org/apache/catalina/websocket/WsOutbound.java | 28 +-
java/org/apache/coyote/ActionCode.java | 16 +-
java/org/apache/coyote/ActionHook.java | 4 +-
java/org/apache/coyote/Adapter.java | 6 +-
java/org/apache/coyote/AsyncContextCallback.java | 2 +-
java/org/apache/coyote/Constants.java | 2 +-
java/org/apache/coyote/InputBuffer.java | 4 +-
java/org/apache/coyote/OutputBuffer.java | 4 +-
java/org/apache/coyote/Request.java | 72 +--
java/org/apache/coyote/RequestInfo.java | 6 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 6 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 6 +-
java/org/apache/coyote/ajp/AjpMessage.java | 74 +--
java/org/apache/coyote/ajp/AjpNioProtocol.java | 12 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 12 +-
java/org/apache/coyote/ajp/Constants.java | 8 +-
.../coyote/http11/AbstractHttp11JsseProtocol.java | 16 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 18 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 74 +--
java/org/apache/coyote/http11/Constants.java | 28 +-
.../apache/coyote/http11/Http11AprProtocol.java | 14 +-
.../apache/coyote/http11/Http11NioProtocol.java | 2 +-
java/org/apache/coyote/http11/Http11Processor.java | 22 +-
java/org/apache/coyote/http11/Http11Protocol.java | 14 +-
java/org/apache/coyote/http11/InputFilter.java | 8 +-
.../coyote/http11/LocalStrings_ja.properties | 2 +-
java/org/apache/coyote/http11/OutputFilter.java | 12 +-
.../coyote/http11/filters/BufferedInputFilter.java | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 70 +-
.../coyote/http11/filters/ChunkedOutputFilter.java | 10 +-
.../http11/filters/FlushableGZIPOutputStream.java | 2 +-
.../coyote/http11/filters/GzipOutputFilter.java | 10 +-
.../coyote/http11/filters/IdentityInputFilter.java | 14 +-
.../http11/filters/IdentityOutputFilter.java | 10 +-
.../http11/filters/SavedRequestInputFilter.java | 12 +-
.../coyote/http11/filters/VoidInputFilter.java | 14 +-
.../coyote/http11/filters/VoidOutputFilter.java | 12 +-
.../coyote/http11/upgrade/UpgradeInbound.java | 2 +-
.../coyote/http11/upgrade/UpgradeOutbound.java | 2 +-
.../http11/upgrade/servlet31/WebConnection.java | 2 +-
java/org/apache/el/ExpressionFactoryImpl.java | 8 +-
java/org/apache/el/MethodExpressionImpl.java | 60 +-
java/org/apache/el/MethodExpressionLiteral.java | 4 +-
java/org/apache/el/ValueExpressionImpl.java | 40 +-
java/org/apache/el/ValueExpressionLiteral.java | 4 +-
java/org/apache/el/lang/EvaluationContext.java | 4 +-
java/org/apache/el/lang/FunctionMapperFactory.java | 4 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 16 +-
java/org/apache/el/lang/VariableMapperFactory.java | 4 +-
java/org/apache/el/lang/VariableMapperImpl.java | 4 +-
java/org/apache/el/parser/ArithmeticNode.java | 4 +-
java/org/apache/el/parser/AstDotSuffix.java | 2 +-
java/org/apache/el/parser/AstIdentifier.java | 2 +-
java/org/apache/el/parser/AstMethodParameters.java | 2 +-
java/org/apache/el/parser/AstValue.java | 30 +-
java/org/apache/el/parser/BooleanNode.java | 4 +-
.../org/apache/el/parser/ELParserTokenManager.java | 30 +-
java/org/apache/el/parser/Node.java | 12 +-
java/org/apache/el/parser/NodeVisitor.java | 4 +-
java/org/apache/el/parser/SimpleNode.java | 6 +-
java/org/apache/el/util/MessageFactory.java | 4 +-
java/org/apache/el/util/ReflectionUtil.java | 36 +-
java/org/apache/el/util/Validation.java | 14 +-
java/org/apache/jasper/Constants.java | 72 +--
java/org/apache/jasper/EmbeddedServletOptions.java | 210 +++---
java/org/apache/jasper/JasperException.java | 8 +-
java/org/apache/jasper/compiler/AntCompiler.java | 74 +--
.../apache/jasper/compiler/AttributeParser.java | 26 +-
.../org/apache/jasper/compiler/BeanRepository.java | 14 +-
java/org/apache/jasper/compiler/Compiler.java | 24 +-
.../jasper/compiler/DefaultErrorHandler.java | 24 +-
java/org/apache/jasper/compiler/Dumper.java | 16 +-
.../apache/jasper/compiler/ELFunctionMapper.java | 18 +-
java/org/apache/jasper/compiler/ELNode.java | 6 +-
.../apache/jasper/compiler/ErrorDispatcher.java | 40 +-
java/org/apache/jasper/compiler/ErrorHandler.java | 6 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 18 +-
java/org/apache/jasper/compiler/JarResource.java | 20 +-
.../apache/jasper/compiler/JarScannerFactory.java | 6 +-
.../org/apache/jasper/compiler/JarURLResource.java | 16 +-
java/org/apache/jasper/compiler/JasperTagInfo.java | 6 +-
java/org/apache/jasper/compiler/JspConfig.java | 22 +-
.../apache/jasper/compiler/JspDocumentParser.java | 10 +-
java/org/apache/jasper/compiler/Localizer.java | 20 +-
java/org/apache/jasper/compiler/Mark.java | 20 +-
java/org/apache/jasper/compiler/Node.java | 66 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 20 +-
java/org/apache/jasper/compiler/Parser.java | 74 +--
.../apache/jasper/compiler/ScriptingVariabler.java | 8 +-
java/org/apache/jasper/compiler/ServletWriter.java | 10 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 6 +-
java/org/apache/jasper/compiler/SmapStratum.java | 10 +-
java/org/apache/jasper/compiler/TagConstants.java | 4 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 26 +-
.../apache/jasper/compiler/TagPluginManager.java | 4 +-
java/org/apache/jasper/compiler/TextOptimizer.java | 8 +-
java/org/apache/jasper/compiler/TldLocation.java | 22 +-
java/org/apache/jasper/compiler/WebXml.java | 16 +-
.../jasper/compiler/tagplugin/TagPlugin.java | 4 +-
.../compiler/tagplugin/TagPluginContext.java | 4 +-
java/org/apache/jasper/el/ELContextImpl.java | 6 +-
java/org/apache/jasper/el/ELContextWrapper.java | 8 +-
java/org/apache/jasper/el/ELResolverImpl.java | 4 +-
.../apache/jasper/el/ExpressionEvaluatorImpl.java | 6 +-
java/org/apache/jasper/el/ExpressionImpl.java | 6 +-
java/org/apache/jasper/el/FunctionMapperImpl.java | 6 +-
java/org/apache/jasper/el/JspELException.java | 4 +-
java/org/apache/jasper/el/JspMethodExpression.java | 4 +-
.../jasper/el/JspMethodNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotFoundException.java | 4 +-
.../jasper/el/JspPropertyNotWritableException.java | 4 +-
java/org/apache/jasper/el/JspValueExpression.java | 6 +-
.../org/apache/jasper/el/VariableResolverImpl.java | 6 +-
.../jasper/resources/LocalStrings.properties | 26 +-
.../jasper/resources/LocalStrings_es.properties | 16 +-
.../jasper/resources/LocalStrings_fr.properties | 14 +-
.../org/apache/jasper/runtime/BodyContentImpl.java | 108 ++--
java/org/apache/jasper/runtime/ExceptionUtils.java | 8 +-
java/org/apache/jasper/runtime/HttpJspBase.java | 22 +-
.../jasper/runtime/InstanceManagerFactory.java | 6 +-
.../apache/jasper/runtime/JspContextWrapper.java | 12 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 10 +-
.../apache/jasper/runtime/JspFragmentHelper.java | 20 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 92 +--
.../apache/jasper/runtime/JspSourceDependent.java | 4 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 140 ++--
.../org/apache/jasper/runtime/PageContextImpl.java | 20 +-
.../jasper/runtime/PerThreadTagHandlerPool.java | 8 +-
.../jasper/runtime/ProtectedFunctionMapper.java | 14 +-
.../runtime/ServletResponseWrapperInclude.java | 6 +-
java/org/apache/jasper/runtime/TagHandlerPool.java | 10 +-
java/org/apache/jasper/security/SecurityUtil.java | 12 +-
java/org/apache/jasper/servlet/JasperLoader.java | 56 +-
.../apache/jasper/servlet/JspCServletContext.java | 8 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 86 +--
.../apache/jasper/tagplugins/jstl/core/Catch.java | 36 +-
.../apache/jasper/tagplugins/jstl/core/Choose.java | 10 +-
.../jasper/tagplugins/jstl/core/ForEach.java | 84 +--
.../jasper/tagplugins/jstl/core/ForTokens.java | 32 +-
.../org/apache/jasper/tagplugins/jstl/core/If.java | 6 +-
.../apache/jasper/tagplugins/jstl/core/Import.java | 140 ++--
.../jasper/tagplugins/jstl/core/Otherwise.java | 8 +-
.../apache/jasper/tagplugins/jstl/core/Out.java | 22 +-
.../apache/jasper/tagplugins/jstl/core/Param.java | 18 +-
.../jasper/tagplugins/jstl/core/Redirect.java | 28 +-
.../apache/jasper/tagplugins/jstl/core/Remove.java | 14 +-
.../apache/jasper/tagplugins/jstl/core/Set.java | 52 +-
.../apache/jasper/tagplugins/jstl/core/Url.java | 32 +-
.../apache/jasper/tagplugins/jstl/core/When.java | 10 +-
java/org/apache/jasper/util/Enumerator.java | 6 +-
.../apache/jasper/util/UniqueAttributesImpl.java | 2 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 8 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 62 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 12 +-
java/org/apache/jasper/xmlparser/SymbolTable.java | 4 +-
java/org/apache/jasper/xmlparser/TreeNode.java | 12 +-
java/org/apache/jasper/xmlparser/UCSReader.java | 22 +-
java/org/apache/jasper/xmlparser/UTF8Reader.java | 56 +-
java/org/apache/jasper/xmlparser/XMLChar.java | 18 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 82 +--
java/org/apache/jasper/xmlparser/XMLString.java | 14 +-
.../apache/jasper/xmlparser/XMLStringBuffer.java | 40 +-
java/org/apache/juli/AsyncFileHandler.java | 14 +-
java/org/apache/juli/FileHandler.java | 8 +-
java/org/apache/juli/JdkLoggerFormatter.java | 38 +-
java/org/apache/juli/VerbatimFormatter.java | 6 +-
java/org/apache/juli/logging/DirectJDKLog.java | 86 +--
java/org/apache/juli/logging/Log.java | 6 +-
.../juli/logging/LogConfigurationException.java | 6 +-
java/org/apache/juli/logging/package.html | 10 +-
java/org/apache/naming/Constants.java | 6 +-
.../org/apache/naming/ContextAccessController.java | 20 +-
java/org/apache/naming/ContextBindings.java | 50 +-
java/org/apache/naming/JndiPermission.java | 6 +-
java/org/apache/naming/NameParserImpl.java | 12 +-
java/org/apache/naming/NamingContext.java | 330 +++++-----
.../naming/NamingContextBindingsEnumeration.java | 16 +-
.../apache/naming/NamingContextEnumeration.java | 8 +-
java/org/apache/naming/NamingEntry.java | 8 +-
java/org/apache/naming/factory/BeanFactory.java | 48 +-
.../naming/factory/DataSourceLinkFactory.java | 34 +-
java/org/apache/naming/factory/EjbFactory.java | 34 +-
.../apache/naming/factory/MailSessionFactory.java | 8 +-
java/org/apache/naming/factory/OpenEjbFactory.java | 12 +-
.../apache/naming/factory/ResourceEnvFactory.java | 16 +-
.../org/apache/naming/factory/ResourceFactory.java | 22 +-
.../org/apache/naming/factory/SendMailFactory.java | 8 +-
.../apache/naming/factory/TransactionFactory.java | 22 +-
.../naming/factory/webservices/ServiceProxy.java | 10 +-
.../factory/webservices/ServiceRefFactory.java | 12 +-
.../apache/naming/java/javaURLContextFactory.java | 14 +-
.../apache/naming/resources/BaseDirContext.java | 564 ++++++++--------
java/org/apache/naming/resources/CacheEntry.java | 12 +-
java/org/apache/naming/resources/Constants.java | 8 +-
.../resources/DirContextURLStreamHandler.java | 120 ++--
.../DirContextURLStreamHandlerFactory.java | 22 +-
.../resources/ImmutableNameNotFoundException.java | 10 +-
.../apache/naming/resources/ProxyDirContext.java | 554 ++++++++--------
.../resources/RecyclableNamingEnumeration.java | 8 +-
java/org/apache/naming/resources/Resource.java | 68 +-
.../org/apache/naming/resources/ResourceCache.java | 28 +-
.../org/apache/naming/resources/WARDirContext.java | 336 +++++-----
java/org/apache/naming/resources/jndi/Handler.java | 8 +-
java/org/apache/naming/resources/package.html | 2 +-
.../apache/tomcat/dbcp/dbcp/ConnectionFactory.java | 4 +-
.../dbcp/dbcp/DataSourceConnectionFactory.java | 4 +-
.../org/apache/tomcat/dbcp/dbcp/DbcpException.java | 6 +-
.../dbcp/dbcp/DelegatingPreparedStatement.java | 10 +-
.../tomcat/dbcp/dbcp/DriverConnectionFactory.java | 4 +-
.../dbcp/dbcp/DriverManagerConnectionFactory.java | 10 +-
.../tomcat/dbcp/dbcp/SQLNestedException.java | 6 +-
.../dbcp/dbcp/cpdsadapter/ConnectionImpl.java | 18 +-
.../tomcat/dbcp/dbcp/datasources/PoolKey.java | 10 +-
.../dbcp/datasources/PooledConnectionAndInfo.java | 14 +-
.../dbcp/datasources/PooledConnectionManager.java | 20 +-
.../datasources/SharedPoolDataSourceFactory.java | 8 +-
.../tomcat/dbcp/dbcp/datasources/UserPassKey.java | 30 +-
java/org/apache/tomcat/util/buf/C2BConverter.java | 8 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 4 +-
.../digester/AbstractObjectCreationFactory.java | 6 +-
.../apache/tomcat/util/digester/ArrayStack.java | 10 +-
.../tomcat/util/digester/CallMethodRule.java | 102 +--
.../apache/tomcat/util/digester/CallParamRule.java | 64 +-
.../tomcat/util/digester/FactoryCreateRule.java | 40 +-
.../tomcat/util/digester/NodeCreateRule.java | 98 +--
.../tomcat/util/digester/ObjectCreateRule.java | 16 +-
.../util/digester/ObjectCreationFactory.java | 6 +-
.../tomcat/util/digester/ObjectParamRule.java | 6 +-
.../util/digester/ParserFeatureSetterFactory.java | 12 +-
.../tomcat/util/digester/PathCallParamRule.java | 22 +-
java/org/apache/tomcat/util/digester/Rule.java | 42 +-
java/org/apache/tomcat/util/digester/RuleSet.java | 6 +-
.../apache/tomcat/util/digester/RuleSetBase.java | 6 +-
java/org/apache/tomcat/util/digester/Rules.java | 6 +-
.../org/apache/tomcat/util/digester/RulesBase.java | 10 +-
.../apache/tomcat/util/digester/SetNextRule.java | 34 +-
.../tomcat/util/digester/SetPropertiesRule.java | 88 +--
.../tomcat/util/digester/SetPropertyRule.java | 18 +-
.../apache/tomcat/util/digester/SetRootRule.java | 32 +-
.../apache/tomcat/util/digester/SetTopRule.java | 34 +-
.../util/digester/WithDefaultsRulesWrapper.java | 50 +-
java/org/apache/tomcat/util/digester/package.html | 132 ++--
.../org/apache/tomcat/util/http/CookieSupport.java | 2 +-
java/org/apache/tomcat/util/http/Cookies.java | 4 +-
.../tomcat/util/http/FastHttpDateFormat.java | 2 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 8 +-
.../apache/tomcat/util/modeler/AttributeInfo.java | 8 +-
.../tomcat/util/modeler/BaseAttributeFilter.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 48 +-
.../util/modeler/BaseNotificationBroadcaster.java | 4 +-
.../tomcat/util/modeler/ConstructorInfo.java | 6 +-
.../apache/tomcat/util/modeler/FeatureInfo.java | 10 +-
.../util/modeler/FixedNotificationFilter.java | 4 +-
.../tomcat/util/modeler/NotificationInfo.java | 4 +-
.../apache/tomcat/util/modeler/OperationInfo.java | 10 +-
.../apache/tomcat/util/modeler/ParameterInfo.java | 4 +-
java/org/apache/tomcat/util/modeler/Registry.java | 176 ++---
.../apache/tomcat/util/modeler/RegistryMBean.java | 64 +-
.../modules/MbeansDescriptorsDOMSource.java | 4 +-
.../modules/MbeansDescriptorsDigesterSource.java | 36 +-
.../MbeansDescriptorsIntrospectionSource.java | 24 +-
.../tomcat/util/modeler/modules/MbeansSource.java | 48 +-
.../util/modeler/modules/MbeansSourceMBean.java | 28 +-
.../tomcat/util/modeler/modules/ModelerSource.java | 16 +-
.../tomcat/util/modeler/modules/package.html | 10 +-
java/org/apache/tomcat/util/modeler/package.html | 2 +-
.../tomcat/util/net/NioBlockingSelector.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtil.java | 4 +-
java/org/apache/tomcat/util/net/SocketWrapper.java | 2 +-
.../apache/tomcat/util/security/MD5Encoder.java | 4 +-
.../websocket/server/LocalStrings.properties | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 8 +-
.../org/apache/tomcat/jdbc/pool/DataSource.java | 2 +-
.../catalina/loader/TestWebappClassLoader.java | 2 +-
test/org/apache/catalina/realm/TestRealmBase.java | 2 +-
test/org/apache/jasper/compiler/TestELParser.java | 2 +-
.../jasper/runtime/TestJspContextWrapper.java | 2 +-
test/org/apache/tomcat/unittest/TesterContext.java | 4 +-
test/org/apache/tomcat/util/net/localhost-cert.pem | 10 +-
test/org/apache/tomcat/websocket/TestUtil.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 2 +-
test/webapp-3.0-fragments/WEB-INF/web.xml | 2 +-
test/webapp-3.0/WEB-INF/tags/bug58178.tag | 2 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/filter.xml | 10 +-
webapps/docs/config/http.xml | 14 +-
webapps/docs/config/realm.xml | 8 +-
webapps/docs/introduction.xml | 42 +-
webapps/docs/jasper-howto.xml | 6 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
webapps/docs/monitoring.xml | 6 +-
.../classes/websocket/echo/EchoEndpoint.java | 4 +-
webapps/examples/WEB-INF/web.xml | 2 +-
webapps/examples/websocket-deprecated/index.html | 2 +-
webapps/examples/websocket/drawboard.xhtml | 2 +-
804 files changed, 9023 insertions(+), 9023 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 43ea7ae..7024160 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -169,7 +169,7 @@ have a JDK that is up to date, or disable sendfile behavior in the Connector.<br
Enabling SSI and CGI Support:
=============================
Because of the security risks associated with CGI and SSI available
-to web applications, these features are disabled by default.
+to web applications, these features are disabled by default.
To enable and configure CGI support, please see the cgi-howto.html page.
diff --git a/java/javax/annotation/Generated.java b/java/javax/annotation/Generated.java
index 9cd4aa6..06d99bd 100644
--- a/java/javax/annotation/Generated.java
+++ b/java/javax/annotation/Generated.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/PostConstruct.java b/java/javax/annotation/PostConstruct.java
index 3486337..3ecb25b 100644
--- a/java/javax/annotation/PostConstruct.java
+++ b/java/javax/annotation/PostConstruct.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/PreDestroy.java b/java/javax/annotation/PreDestroy.java
index 347e82b..eb1d578 100644
--- a/java/javax/annotation/PreDestroy.java
+++ b/java/javax/annotation/PreDestroy.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/Resource.java b/java/javax/annotation/Resource.java
index 58c8025..19a63b1 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/Resources.java b/java/javax/annotation/Resources.java
index 104124c..7b79dda 100644
--- a/java/javax/annotation/Resources.java
+++ b/java/javax/annotation/Resources.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/security/DeclareRoles.java b/java/javax/annotation/security/DeclareRoles.java
index 56a19f3..d50e30d 100644
--- a/java/javax/annotation/security/DeclareRoles.java
+++ b/java/javax/annotation/security/DeclareRoles.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/security/DenyAll.java b/java/javax/annotation/security/DenyAll.java
index f06f702..069aca2 100644
--- a/java/javax/annotation/security/DenyAll.java
+++ b/java/javax/annotation/security/DenyAll.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/security/PermitAll.java b/java/javax/annotation/security/PermitAll.java
index 956a8fd..db1d7b6 100644
--- a/java/javax/annotation/security/PermitAll.java
+++ b/java/javax/annotation/security/PermitAll.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/security/RolesAllowed.java b/java/javax/annotation/security/RolesAllowed.java
index 1397472..f916b6d 100644
--- a/java/javax/annotation/security/RolesAllowed.java
+++ b/java/javax/annotation/security/RolesAllowed.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/annotation/security/RunAs.java b/java/javax/annotation/security/RunAs.java
index cdc7803..8a366e2 100644
--- a/java/javax/annotation/security/RunAs.java
+++ b/java/javax/annotation/security/RunAs.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index 46a6564..2b16782 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/ejb/EJBs.java b/java/javax/ejb/EJBs.java
index 0be2360..b716915 100644
--- a/java/javax/ejb/EJBs.java
+++ b/java/javax/ejb/EJBs.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/el/ArrayELResolver.java b/java/javax/el/ArrayELResolver.java
index c926443..4204fe4 100644
--- a/java/javax/el/ArrayELResolver.java
+++ b/java/javax/el/ArrayELResolver.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java
index db21ab8..a9ba0ab 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -5,9 +5,9 @@
* 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.
@@ -297,7 +297,7 @@ public class BeanELResolver extends ELResolver {
public BeanProperty getBeanProperty(String name) {
return get(null, name);
}
-
+
private Class<?> getType() {
return type;
}
@@ -383,13 +383,13 @@ public class BeanELResolver extends ELResolver {
private final int size;
private final Map<K,V> eden;
private final Map<K,V> longterm;
-
+
public ConcurrentCache(int size) {
this.size = size;
this.eden = new ConcurrentHashMap<K,V>(size);
this.longterm = new WeakHashMap<K,V>(size);
}
-
+
public V get(K key) {
V value = this.eden.get(key);
if (value == null) {
@@ -402,7 +402,7 @@ public class BeanELResolver extends ELResolver {
}
return value;
}
-
+
public void put(K key, V value) {
if (this.eden.size() >= this.size) {
synchronized (longterm) {
diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java
index 7d9ed11..e37b5c3 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -5,9 +5,9 @@
* 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.
@@ -30,7 +30,7 @@ public class CompositeELResolver extends ELResolver {
clazz =
Class.forName("javax.servlet.jsp.el.ScopedAttributeELResolver");
} catch (ClassNotFoundException e) {
- // Ignore. This is expected if using the EL stand-alone
+ // Ignore. This is expected if using the EL stand-alone
}
SCOPED_ATTRIBUTE_EL_RESOLVER = clazz;
}
@@ -193,7 +193,7 @@ public class CompositeELResolver extends ELResolver {
this.idx = 0;
this.guaranteeIterator();
}
-
+
private void guaranteeIterator() {
while (this.itr == null && this.idx < this.size) {
this.itr = this.resolvers[this.idx].getFeatureDescriptors(
@@ -203,7 +203,7 @@ public class CompositeELResolver extends ELResolver {
}
@Override
- public boolean hasNext() {
+ public boolean hasNext() {
if (this.next != null)
return true;
if (this.itr != null){
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 56b5c38..e69612f 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -5,9 +5,9 @@
* 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.
@@ -27,18 +27,18 @@ import java.util.Map;
public abstract class ELContext {
private Locale locale;
-
+
private Map<Class<?>, Object> map;
-
+
private boolean resolved;
-
+
/**
- *
+ *
*/
public ELContext() {
this.resolved = false;
}
-
+
// Can't use Class<?> because API needs to match specification
/**
* Obtain the context object for the given key.
@@ -59,7 +59,7 @@ public abstract class ELContext {
}
return this.map.get(key);
}
-
+
// Can't use Class<?> because API needs to match specification
/**
* Add an object to this EL context under the given key.
@@ -75,32 +75,32 @@ public abstract class ELContext {
if (key == null || contextObject == null) {
throw new NullPointerException();
}
-
+
if (this.map == null) {
this.map = new HashMap<Class<?>, Object>();
}
-
+
this.map.put(key, contextObject);
}
-
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
-
+
public boolean isPropertyResolved() {
return this.resolved;
}
-
+
public abstract ELResolver getELResolver();
public abstract FunctionMapper getFunctionMapper();
-
+
public abstract VariableMapper getVariableMapper();
-
+
public Locale getLocale() {
return this.locale;
}
-
+
public void setLocale(Locale locale) {
this.locale = locale;
}
diff --git a/java/javax/el/ELContextEvent.java b/java/javax/el/ELContextEvent.java
index fff8d0e..2ec1961 100644
--- a/java/javax/el/ELContextEvent.java
+++ b/java/javax/el/ELContextEvent.java
@@ -5,9 +5,9 @@
* 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.
@@ -29,7 +29,7 @@ public class ELContextEvent extends EventObject {
public ELContextEvent(ELContext source) {
super(source);
}
-
+
public ELContext getELContext() {
return (ELContext) this.getSource();
}
diff --git a/java/javax/el/ELContextListener.java b/java/javax/el/ELContextListener.java
index a21038b..f8701f8 100644
--- a/java/javax/el/ELContextListener.java
+++ b/java/javax/el/ELContextListener.java
@@ -5,9 +5,9 @@
* 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.
@@ -22,7 +22,7 @@ package javax.el;
*
*/
public interface ELContextListener extends java.util.EventListener {
-
+
public void contextCreated(ELContextEvent event);
}
diff --git a/java/javax/el/ELException.java b/java/javax/el/ELException.java
index 22efff7..c569478 100644
--- a/java/javax/el/ELException.java
+++ b/java/javax/el/ELException.java
@@ -5,9 +5,9 @@
* 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.
@@ -20,7 +20,7 @@ package javax.el;
/**
* Represents any of the exception conditions that can arise during expression
* evaluation.
- *
+ *
* @since 2.1
*/
public class ELException extends RuntimeException {
@@ -36,7 +36,7 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the provided detail message.
- *
+ *
* @param message
* the detail message
*/
@@ -46,7 +46,7 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the given detail message and root cause.
- *
+ *
* @param message
* the detail message
* @param cause
@@ -58,7 +58,7 @@ public class ELException extends RuntimeException {
/**
* Creates an ELException with the given cause
- *
+ *
* @param cause
* the originating cause of this exception
*/
diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java
index 2fdf574..b453254 100644
--- a/java/javax/el/ELResolver.java
+++ b/java/javax/el/ELResolver.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,11 +25,11 @@ import java.util.Iterator;
public abstract class ELResolver {
public static final String RESOLVABLE_AT_DESIGN_TIME = "resolvableAtDesignTime";
-
+
public static final String TYPE = "type";
-
+
public abstract Object getValue(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
/**
* @param context The EL context for this evaluation
* @param base The base object on which the property is to be found
@@ -45,7 +45,7 @@ public abstract class ELResolver {
* Wraps any exception throw whilst resolving the property
*/
public abstract Class<?> getType(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
/**
* @param context The EL context for this evaluation
* @param base The base object on which the property is to be found
@@ -80,11 +80,11 @@ public abstract class ELResolver {
* Wraps any exception throw whilst resolving the property
*/
public abstract boolean isReadOnly(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base);
-
+
public abstract Class<?> getCommonPropertyType(ELContext context, Object base);
-
+
/**
* Invokes a method on the the given object. This default implementation
* always returns <code>null</code>.
diff --git a/java/javax/el/Expression.java b/java/javax/el/Expression.java
index 40fbd57..5c94d22 100644
--- a/java/javax/el/Expression.java
+++ b/java/javax/el/Expression.java
@@ -5,9 +5,9 @@
* 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.
@@ -31,9 +31,9 @@ public abstract class Expression implements Serializable {
@Override
public abstract int hashCode();
-
+
public abstract String getExpressionString();
-
+
public abstract boolean isLiteralText();
}
diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
index 85c839e..33c7e6a 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -5,9 +5,9 @@
* 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.
@@ -38,11 +38,11 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- *
+ *
* @since 2.1
*/
public abstract class ExpressionFactory {
-
+
private static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
@@ -152,13 +152,13 @@ public abstract class ExpressionFactory {
/**
* Create a new {@link ExpressionFactory} passing in the provided
* {@link Properties}. Search order is the same as {@link #newInstance()}.
- *
+ *
* @param properties the properties to be passed to the new instance (may be null)
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance(Properties properties) {
ExpressionFactory result = null;
-
+
ClassLoader tccl = Util.getContextClassLoader();
CacheValue cacheValue;
@@ -260,10 +260,10 @@ public abstract class ExpressionFactory {
"Unable to create ExpressionFactory of type: " + clazz.getName(),
e);
}
-
+
return result;
}
-
+
/**
* Key used to cache ExpressionFactory discovery information per class
* loader. The class loader reference is never {@code null}, because
@@ -379,7 +379,7 @@ public abstract class ExpressionFactory {
private static String getClassNameServices(ClassLoader tccl) {
InputStream is = null;
-
+
if (tccl == null) {
is = ClassLoader.getSystemResourceAsStream(SERVICE_RESOURCE_NAME);
} else {
@@ -419,10 +419,10 @@ public abstract class ExpressionFactory {
} catch (IOException ioe) {/*Ignore*/}
}
}
-
+
return null;
}
-
+
private static String getClassNameJreDir() {
File file = new File(PROPERTY_FILE);
if (file.canRead()) {
@@ -451,7 +451,7 @@ public abstract class ExpressionFactory {
}
return null;
}
-
+
private static final String getClassNameSysProp() {
String value = System.getProperty(PROPERTY_NAME);
if (value != null && value.trim().length() > 0) {
diff --git a/java/javax/el/FunctionMapper.java b/java/javax/el/FunctionMapper.java
index 666a76c..edf24e2 100644
--- a/java/javax/el/FunctionMapper.java
+++ b/java/javax/el/FunctionMapper.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,5 +25,5 @@ import java.lang.reflect.Method;
public abstract class FunctionMapper {
public abstract Method resolveFunction(String prefix, String localName);
-
+
}
diff --git a/java/javax/el/ListELResolver.java b/java/javax/el/ListELResolver.java
index 8fe74aa..caf21d4 100644
--- a/java/javax/el/ListELResolver.java
+++ b/java/javax/el/ListELResolver.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/el/MapELResolver.java b/java/javax/el/MapELResolver.java
index fad81cf..2e345b1 100644
--- a/java/javax/el/MapELResolver.java
+++ b/java/javax/el/MapELResolver.java
@@ -5,9 +5,9 @@
* 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.
@@ -51,7 +51,7 @@ public class MapELResolver extends ELResolver {
context.setPropertyResolved(true);
return ((Map<?,?>) base).get(property);
}
-
+
return null;
}
@@ -66,7 +66,7 @@ public class MapELResolver extends ELResolver {
context.setPropertyResolved(true);
return Object.class;
}
-
+
return null;
}
@@ -109,7 +109,7 @@ public class MapELResolver extends ELResolver {
context.setPropertyResolved(true);
return this.readOnly || UNMODIFIABLE.equals(base.getClass());
}
-
+
return this.readOnly;
}
diff --git a/java/javax/el/MethodExpression.java b/java/javax/el/MethodExpression.java
index a9fcb4d..abd85ef 100644
--- a/java/javax/el/MethodExpression.java
+++ b/java/javax/el/MethodExpression.java
@@ -5,9 +5,9 @@
* 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.
@@ -40,7 +40,7 @@ public abstract class MethodExpression extends Expression {
* Wraps any exception throw whilst resolving the property
*/
public abstract MethodInfo getMethodInfo(ELContext context) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
-
+
/**
* @param context The EL context for this evaluation
* @param params The parameters with which to invoke this method expression
@@ -59,10 +59,10 @@ public abstract class MethodExpression extends Expression {
* coercion of the result to the expected return type fails
*/
public abstract Object invoke(ELContext context, Object[] params) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
-
+
/**
* @since EL 2.2
- *
+ *
* Note: The spelling mistake is deliberate.
* isParmetersProvided() - Specification definition
* isParametersProvided() - Corrected spelling
diff --git a/java/javax/el/MethodInfo.java b/java/javax/el/MethodInfo.java
index 8047e25..dff61f7 100644
--- a/java/javax/el/MethodInfo.java
+++ b/java/javax/el/MethodInfo.java
@@ -5,9 +5,9 @@
* 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.
@@ -23,28 +23,28 @@ package javax.el;
public class MethodInfo {
private final String name;
-
+
private final Class<?>[] paramTypes;
-
+
private final Class<?> returnType;
-
+
/**
- *
+ *
*/
public MethodInfo(String name, Class<?> returnType, Class<?>[] paramTypes) {
this.name = name;
this.returnType = returnType;
this.paramTypes = paramTypes;
}
-
+
public String getName() {
return this.name;
}
-
+
public Class<?>[] getParamTypes() {
return this.paramTypes;
}
-
+
public Class<?> getReturnType() {
return this.returnType;
}
diff --git a/java/javax/el/MethodNotFoundException.java b/java/javax/el/MethodNotFoundException.java
index be09681..8d4a835 100644
--- a/java/javax/el/MethodNotFoundException.java
+++ b/java/javax/el/MethodNotFoundException.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,7 +25,7 @@ public class MethodNotFoundException extends ELException {
private static final long serialVersionUID = -3631968116081480328L;
/**
- *
+ *
*/
public MethodNotFoundException() {
super();
diff --git a/java/javax/el/PropertyNotFoundException.java b/java/javax/el/PropertyNotFoundException.java
index e19127a..28b7f94 100644
--- a/java/javax/el/PropertyNotFoundException.java
+++ b/java/javax/el/PropertyNotFoundException.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,7 +25,7 @@ public class PropertyNotFoundException extends ELException {
private static final long serialVersionUID = -3799200961303506745L;
/**
- *
+ *
*/
public PropertyNotFoundException() {
super();
diff --git a/java/javax/el/PropertyNotWritableException.java b/java/javax/el/PropertyNotWritableException.java
index 6beddb7..fc9f644 100644
--- a/java/javax/el/PropertyNotWritableException.java
+++ b/java/javax/el/PropertyNotWritableException.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,7 +25,7 @@ public class PropertyNotWritableException extends ELException {
private static final long serialVersionUID = 827987155471214717L;
/**
- *
+ *
*/
public PropertyNotWritableException() {
super();
diff --git a/java/javax/el/ResourceBundleELResolver.java b/java/javax/el/ResourceBundleELResolver.java
index a83bc57..101a62f 100644
--- a/java/javax/el/ResourceBundleELResolver.java
+++ b/java/javax/el/ResourceBundleELResolver.java
@@ -5,9 +5,9 @@
* 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.
@@ -39,7 +39,7 @@ public class ResourceBundleELResolver extends ELResolver {
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
@@ -62,11 +62,11 @@ public class ResourceBundleELResolver extends ELResolver {
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
}
-
+
return null;
}
@@ -78,7 +78,7 @@ public class ResourceBundleELResolver extends ELResolver {
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
throw new PropertyNotWritableException(Util.message(context,
@@ -93,19 +93,19 @@ public class ResourceBundleELResolver extends ELResolver {
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
return true;
}
-
+
return false;
}
@Override
// Can't use Iterator<FeatureDescriptor> because API needs to match
// specification
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public Iterator getFeatureDescriptors(
ELContext context, Object base) {
if (base instanceof ResourceBundle) {
diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index fff5108..5da8c67 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -554,8 +554,8 @@ class Util {
}
return null;
}
-
-
+
+
static Constructor<?> findConstructor(Class<?> clazz, Class<?>[] paramTypes,
Object[] paramValues) {
diff --git a/java/javax/el/ValueExpression.java b/java/javax/el/ValueExpression.java
index da62861..a84ae5a 100644
--- a/java/javax/el/ValueExpression.java
+++ b/java/javax/el/ValueExpression.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,7 +25,7 @@ public abstract class ValueExpression extends Expression {
private static final long serialVersionUID = 8577809572381654673L;
public abstract Class<?> getExpectedType();
-
+
/**
* @param context The EL context for this evaluation
*
@@ -41,7 +41,7 @@ public abstract class ValueExpression extends Expression {
* variable
*/
public abstract Class<?> getType(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
/**
* @param context The EL context for this evaluation
*
@@ -58,7 +58,7 @@ public abstract class ValueExpression extends Expression {
* variable
*/
public abstract boolean isReadOnly(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
/**
* @param context The EL context for this evaluation
* @param value The value to set the property to which this value
@@ -77,7 +77,7 @@ public abstract class ValueExpression extends Expression {
* variable
*/
public abstract void setValue(ELContext context, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException;
-
+
/**
* @param context The EL context for this evaluation
*
diff --git a/java/javax/el/ValueReference.java b/java/javax/el/ValueReference.java
index 61807fe..0c7f3eb 100644
--- a/java/javax/el/ValueReference.java
+++ b/java/javax/el/ValueReference.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,10 +25,10 @@ import java.io.Serializable;
public class ValueReference implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private final Object base;
private final Object property;
-
+
public ValueReference(Object base, Object property) {
this.base = base;
this.property = property;
@@ -37,7 +37,7 @@ public class ValueReference implements Serializable {
public Object getBase() {
return base;
}
-
+
public Object getProperty() {
return property;
}
diff --git a/java/javax/el/VariableMapper.java b/java/javax/el/VariableMapper.java
index 84c3682..4577e38 100644
--- a/java/javax/el/VariableMapper.java
+++ b/java/javax/el/VariableMapper.java
@@ -5,9 +5,9 @@
* 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.
@@ -23,6 +23,6 @@ package javax.el;
public abstract class VariableMapper {
public abstract ValueExpression resolveVariable(String variable);
-
+
public abstract ValueExpression setVariable(String variable, ValueExpression expression);
}
diff --git a/java/javax/persistence/PersistenceContext.java b/java/javax/persistence/PersistenceContext.java
index e8417e2..ee4b79b 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/javax/persistence/PersistenceContext.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/persistence/PersistenceContextType.java b/java/javax/persistence/PersistenceContextType.java
index 500c692..8b287fe 100644
--- a/java/javax/persistence/PersistenceContextType.java
+++ b/java/javax/persistence/PersistenceContextType.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/persistence/PersistenceContexts.java b/java/javax/persistence/PersistenceContexts.java
index b4e0542..cd9abf2 100644
--- a/java/javax/persistence/PersistenceContexts.java
+++ b/java/javax/persistence/PersistenceContexts.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/persistence/PersistenceUnit.java b/java/javax/persistence/PersistenceUnit.java
index e42a3b2..9f34198 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/javax/persistence/PersistenceUnit.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/persistence/PersistenceUnits.java b/java/javax/persistence/PersistenceUnits.java
index c1abcad..34084ac 100644
--- a/java/javax/persistence/PersistenceUnits.java
+++ b/java/javax/persistence/PersistenceUnits.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/servlet/AsyncContext.java b/java/javax/servlet/AsyncContext.java
index 07cec23..7ec7817 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -31,51 +31,51 @@ public interface AsyncContext {
"javax.servlet.async.servlet_path";
public static final String ASYNC_QUERY_STRING =
"javax.servlet.async.query_string";
-
+
ServletRequest getRequest();
-
+
ServletResponse getResponse();
-
+
boolean hasOriginalRequestAndResponse();
-
+
/**
- *
+ *
* @throws IllegalStateException
*/
void dispatch();
-
+
/**
- *
+ *
* @param path
* @throws IllegalStateException
*/
void dispatch(String path);
-
+
/**
- *
+ *
* @param context
* @param path
* @throws IllegalStateException
*/
void dispatch(ServletContext context, String path);
-
+
void complete();
-
+
void start(Runnable run);
-
+
void addListener(AsyncListener listener);
-
+
void addListener(AsyncListener listener, ServletRequest request,
ServletResponse response);
-
+
<T extends AsyncListener> T createListener(Class<T> clazz)
throws ServletException;
-
+
/**
* Get timeout in milliseconds. 0 or less indicates no timeout.
*/
long getTimeout();
-
+
/**
* Set timeout in milliseconds. 0 or less indicates no timeout.
*/
diff --git a/java/javax/servlet/AsyncEvent.java b/java/javax/servlet/AsyncEvent.java
index 6911293..4b0f0b3 100644
--- a/java/javax/servlet/AsyncEvent.java
+++ b/java/javax/servlet/AsyncEvent.java
@@ -25,7 +25,7 @@ public class AsyncEvent {
private final ServletRequest request;
private final ServletResponse response;
private final Throwable throwable;
-
+
public AsyncEvent(AsyncContext context) {
this.context = context;
this.request = null;
@@ -40,7 +40,7 @@ public class AsyncEvent {
this.response = response;
this.throwable = null;
}
-
+
public AsyncEvent(AsyncContext context, Throwable throwable) {
this.context = context;
this.throwable = throwable;
@@ -55,7 +55,7 @@ public class AsyncEvent {
this.response = response;
this.throwable = throwable;
}
-
+
public AsyncContext getAsyncContext() {
return context;
}
@@ -63,11 +63,11 @@ public class AsyncEvent {
public ServletRequest getSuppliedRequest() {
return request;
}
-
+
public ServletResponse getSuppliedResponse() {
return response;
}
-
+
public Throwable getThrowable() {
return throwable;
}
diff --git a/java/javax/servlet/Filter.java b/java/javax/servlet/Filter.java
index d29f07a..b36b37d 100644
--- a/java/javax/servlet/Filter.java
+++ b/java/javax/servlet/Filter.java
@@ -40,7 +40,7 @@ import java.io.IOException;
* 7) Filters that trigger resource access events <br>
* 8) XSL/T filters <br>
* 9) Mime-type chain Filter <br>
- *
+ *
* @since Servlet 2.3
*/
public interface Filter {
@@ -89,7 +89,7 @@ public interface Filter {
* passed. After the web container calls this method, it will not call the
* doFilter method again on this instance of the filter. <br>
* <br>
- *
+ *
* This method gives the filter an opportunity to clean up any resources
* that are being held (for example, memory, file handles, threads) and make
* sure that any persistent state is synchronized with the filter's current
diff --git a/java/javax/servlet/FilterChain.java b/java/javax/servlet/FilterChain.java
index 13c19fe..cdc5206 100644
--- a/java/javax/servlet/FilterChain.java
+++ b/java/javax/servlet/FilterChain.java
@@ -24,7 +24,7 @@ import java.io.IOException;
* Filters use the FilterChain to invoke the next filter in the chain, or if the
* calling filter is the last filter in the chain, to invoke the resource at the
* end of the chain.
- *
+ *
* @see Filter
* @since Servlet 2.3
**/
@@ -35,12 +35,12 @@ public interface FilterChain {
* Causes the next filter in the chain to be invoked, or if the calling
* filter is the last filter in the chain, causes the resource at the end of
* the chain to be invoked.
- *
+ *
* @param request
* the request to pass along the chain.
* @param response
* the response to pass along the chain.
- *
+ *
* @since 2.3
*/
public void doFilter(ServletRequest request, ServletResponse response)
diff --git a/java/javax/servlet/FilterConfig.java b/java/javax/servlet/FilterConfig.java
index 30bba64..4a0a65b 100644
--- a/java/javax/servlet/FilterConfig.java
+++ b/java/javax/servlet/FilterConfig.java
@@ -20,10 +20,10 @@ package javax.servlet;
import java.util.Enumeration;
/**
- *
+ *
* A filter configuration object used by a servlet container to pass information
* to a filter during initialization.
- *
+ *
* @see Filter
* @since Servlet 2.3
*/
@@ -38,10 +38,10 @@ public interface FilterConfig {
/**
* Returns a reference to the {@link ServletContext} in which the caller is
* executing.
- *
+ *
* @return {@link ServletContext} object, used by the caller to interact
* with its servlet container
- *
+ *
* @see ServletContext
*/
public ServletContext getServletContext();
@@ -50,11 +50,11 @@ public interface FilterConfig {
* Returns a <code>String</code> containing the value of the named
* initialization parameter, or <code>null</code> if the parameter does not
* exist.
- *
+ *
* @param name
* <code>String</code> specifying the name of the initialization
* parameter
- *
+ *
* @return <code>String</code> containing the value of the initialization
* parameter
*/
@@ -64,7 +64,7 @@ public interface FilterConfig {
* Returns the names of the filter's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the filter has no initialization parameters.
- *
+ *
* @return <code>Enumeration</code> of <code>String</code> objects
* containing the names of the filter's initialization parameters
*/
diff --git a/java/javax/servlet/FilterRegistration.java b/java/javax/servlet/FilterRegistration.java
index cce12d6..52d9596 100644
--- a/java/javax/servlet/FilterRegistration.java
+++ b/java/javax/servlet/FilterRegistration.java
@@ -24,9 +24,9 @@ import java.util.EnumSet;
* TODO SERVLET3 - Add comments
*/
public interface FilterRegistration extends Registration {
-
+
/**
- *
+ *
* @param dispatcherTypes
* @param isMatchAfter
* @param servletNames
@@ -37,13 +37,13 @@ public interface FilterRegistration extends Registration {
EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String... servletNames);
/**
- *
+ *
* @return TODO
*/
public Collection<String> getServletNameMappings();
-
+
/**
- *
+ *
* @param dispatcherTypes
* @param isMatchAfter
* @param urlPatterns
@@ -55,11 +55,11 @@ public interface FilterRegistration extends Registration {
boolean isMatchAfter, String... urlPatterns);
/**
- *
+ *
* @return TODO
*/
public Collection<String> getUrlPatternMappings();
-
+
public static interface Dynamic
extends FilterRegistration, Registration.Dynamic {
// No additional methods
diff --git a/java/javax/servlet/GenericServlet.java b/java/javax/servlet/GenericServlet.java
index 3f351c8..f040cb7 100644
--- a/java/javax/servlet/GenericServlet.java
+++ b/java/javax/servlet/GenericServlet.java
@@ -68,7 +68,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* <p>
* This method is supplied for convenience. It gets the value of the named
* parameter from the servlet's <code>ServletConfig</code> object.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the
* initialization parameter
@@ -88,7 +88,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* <p>
* This method is supplied for convenience. It gets the parameter names from
* the servlet's <code>ServletConfig</code> object.
- *
+ *
* @return Enumeration an enumeration of <code>String</code> objects
* containing the names of the servlet's initialization parameters
*/
@@ -99,7 +99,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
/**
* Returns this servlet's {@link ServletConfig} object.
- *
+ *
* @return ServletConfig the <code>ServletConfig</code> object that
* initialized this servlet
*/
@@ -114,7 +114,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* <p>
* This method is supplied for convenience. It gets the context from the
* servlet's <code>ServletConfig</code> object.
- *
+ *
* @return ServletContext the <code>ServletContext</code> object passed to
* this servlet by the <code>init</code> method
*/
@@ -128,7 +128,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* copyright. By default, this method returns an empty string. Override this
* method to have it return a meaningful value. See
* {@link Servlet#getServletInfo}.
- *
+ *
* @return String information about this servlet, by default an empty string
*/
@Override
@@ -143,7 +143,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* This implementation stores the {@link ServletConfig} object it receives
* from the servlet container for later use. When overriding this form of
* the method, call <code>super.init(config)</code>.
- *
+ *
* @param config
* the <code>ServletConfig</code> object that contains
* configuration information for this servlet
@@ -167,7 +167,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* <code>GenericServlet.init(ServletConfig config)</code>. The
* <code>ServletConfig</code> object can still be retrieved via
* {@link #getServletConfig}.
- *
+ *
* @exception ServletException
* if an exception occurs that interrupts the servlet's
* normal operation
@@ -179,7 +179,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
/**
* Writes the specified message to a servlet log file, prepended by the
* servlet's name. See {@link ServletContext#log(String)}.
- *
+ *
* @param msg
* a <code>String</code> specifying the message to be written to
* the log file
@@ -192,7 +192,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* Writes an explanatory message and a stack trace for a given
* <code>Throwable</code> exception to the servlet log file, prepended by
* the servlet's name. See {@link ServletContext#log(String, Throwable)}.
- *
+ *
* @param message
* a <code>String</code> that describes the error or exception
* @param t
@@ -208,7 +208,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
* <p>
* This method is declared abstract so subclasses, such as
* <code>HttpServlet</code>, must override it.
- *
+ *
* @param req
* the <code>ServletRequest</code> object that contains the
* client's request
@@ -228,7 +228,7 @@ public abstract class GenericServlet implements Servlet, ServletConfig,
/**
* Returns the name of this servlet instance. See
* {@link ServletConfig#getServletName}.
- *
+ *
* @return the name of this servlet instance
*/
@Override
diff --git a/java/javax/servlet/HttpConstraintElement.java b/java/javax/servlet/HttpConstraintElement.java
index 1a0fd84..c7a4f93 100644
--- a/java/javax/servlet/HttpConstraintElement.java
+++ b/java/javax/servlet/HttpConstraintElement.java
@@ -26,7 +26,7 @@ import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
* TODO SERVLET3 - Add comments
*/
public class HttpConstraintElement {
-
+
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
@@ -34,7 +34,7 @@ public class HttpConstraintElement {
private final EmptyRoleSemantic emptyRoleSemantic;// = EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// = TransportGuarantee.NONE;
private final String[] rolesAllowed;// = new String[0];
-
+
/**
* Default constraint is permit with no transport guarantee.
*/
@@ -44,17 +44,17 @@ public class HttpConstraintElement {
this.transportGuarantee = TransportGuarantee.NONE;
this.rolesAllowed = new String[0];
}
-
+
/**
* Convenience constructor for {@link EmptyRoleSemantic#DENY}.
- *
+ *
*/
public HttpConstraintElement(EmptyRoleSemantic emptyRoleSemantic) {
this.emptyRoleSemantic = emptyRoleSemantic;
this.transportGuarantee = TransportGuarantee.NONE;
this.rolesAllowed = new String[0];
}
-
+
/**
* Convenience constructor to specify transport guarantee and/or roles.
*/
@@ -66,7 +66,7 @@ public class HttpConstraintElement {
}
/**
- *
+ *
* @param emptyRoleSemantic
* @param transportGuarantee
* @param rolesAllowed
@@ -83,15 +83,15 @@ public class HttpConstraintElement {
this.transportGuarantee = transportGuarantee;
this.rolesAllowed = rolesAllowed;
}
-
+
public EmptyRoleSemantic getEmptyRoleSemantic() {
return emptyRoleSemantic;
}
-
+
public TransportGuarantee getTransportGuarantee() {
return transportGuarantee;
}
-
+
public String[] getRolesAllowed() {
return rolesAllowed;
}
diff --git a/java/javax/servlet/HttpMethodConstraintElement.java b/java/javax/servlet/HttpMethodConstraintElement.java
index f0a58f3..5de2ad9 100644
--- a/java/javax/servlet/HttpMethodConstraintElement.java
+++ b/java/javax/servlet/HttpMethodConstraintElement.java
@@ -38,7 +38,7 @@ public class HttpMethodConstraintElement extends HttpConstraintElement {
}
this.methodName = methodName;
}
-
+
public HttpMethodConstraintElement(String methodName,
HttpConstraintElement constraint) {
super(constraint.getEmptyRoleSemantic(),
@@ -50,7 +50,7 @@ public class HttpMethodConstraintElement extends HttpConstraintElement {
}
this.methodName = methodName;
}
-
+
public String getMethodName() {
return methodName;
}
diff --git a/java/javax/servlet/MultipartConfigElement.java b/java/javax/servlet/MultipartConfigElement.java
index c73b3c9..a2c6c06 100644
--- a/java/javax/servlet/MultipartConfigElement.java
+++ b/java/javax/servlet/MultipartConfigElement.java
@@ -23,12 +23,12 @@ import javax.servlet.annotation.MultipartConfig;
* TODO SERVLET3 - Add comments
*/
public class MultipartConfigElement {
-
+
private final String location;// = "";
private final long maxFileSize;// = -1;
private final long maxRequestSize;// = -1;
private final int fileSizeThreshold;// = 0;
-
+
public MultipartConfigElement(String location) {
// Keep empty string default if location is null
if (location != null) {
@@ -40,7 +40,7 @@ public class MultipartConfigElement {
this.maxRequestSize = -1;
this.fileSizeThreshold = 0;
}
-
+
public MultipartConfigElement(String location, long maxFileSize,
long maxRequestSize, int fileSizeThreshold) {
// Keep empty string default if location is null
@@ -59,26 +59,26 @@ public class MultipartConfigElement {
this.fileSizeThreshold = 0;
}
}
-
+
public MultipartConfigElement(MultipartConfig annotation) {
location = annotation.location();
maxFileSize = annotation.maxFileSize();
maxRequestSize = annotation.maxRequestSize();
fileSizeThreshold = annotation.fileSizeThreshold();
}
-
+
public String getLocation() {
return location;
}
-
+
public long getMaxFileSize() {
return maxFileSize;
}
-
+
public long getMaxRequestSize() {
return maxRequestSize;
}
-
+
public int getFileSizeThreshold() {
return fileSizeThreshold;
}
diff --git a/java/javax/servlet/Registration.java b/java/javax/servlet/Registration.java
index 8e7e380..fa9f4ec 100644
--- a/java/javax/servlet/Registration.java
+++ b/java/javax/servlet/Registration.java
@@ -24,13 +24,13 @@ import java.util.Set;
* @since Servlet 3.0
*/
public interface Registration {
-
+
public String getName();
-
+
public String getClassName();
/**
- *
+ *
* @param name
* @param value
* @return TODO
@@ -40,9 +40,9 @@ public interface Registration {
public boolean setInitParameter(String name, String value);
public String getInitParameter(String name);
-
+
/**
- *
+ *
* @param initParameters
* @return TODO
* @throws IllegalArgumentException
@@ -53,9 +53,9 @@ public interface Registration {
public Map<String, String> getInitParameters();
public interface Dynamic extends Registration {
-
+
/**
- *
+ *
* @param isAsyncSupported
* @throws IllegalStateException
*/
diff --git a/java/javax/servlet/RequestDispatcher.java b/java/javax/servlet/RequestDispatcher.java
index 54a7f7e..6ce2cfd 100644
--- a/java/javax/servlet/RequestDispatcher.java
+++ b/java/javax/servlet/RequestDispatcher.java
@@ -24,17 +24,17 @@ import java.io.IOException;
* servlet container creates the <code>RequestDispatcher</code> object, which is
* used as a wrapper around a server resource located at a particular path or
* given by a particular name.
- *
+ *
* <p>
* This interface is intended to wrap servlets, but a servlet container can
* create <code>RequestDispatcher</code> objects to wrap any type of resource.
- *
+ *
* @author Various
- *
+ *
* @see ServletContext#getRequestDispatcher(java.lang.String)
* @see ServletContext#getNamedDispatcher(java.lang.String)
* @see ServletRequest#getRequestDispatcher(java.lang.String)
- *
+ *
*/
public interface RequestDispatcher {
@@ -218,41 +218,41 @@ public interface RequestDispatcher {
* or HTML file) on the server. This method allows one servlet to do
* preliminary processing of a request and another resource to generate the
* response.
- *
+ *
* <p>
* For a <code>RequestDispatcher</code> obtained via
* <code>getRequestDispatcher()</code>, the <code>ServletRequest</code>
* object has its path elements and parameters adjusted to match the path of
* the target resource.
- *
+ *
* <p>
* <code>forward</code> should be called before the response has been
* committed to the client (before response body output has been flushed).
* If the response already has been committed, this method throws an
* <code>IllegalStateException</code>. Uncommitted output in the response
* buffer is automatically cleared before the forward.
- *
+ *
* <p>
* The request and response parameters must be either the same objects as
* were passed to the calling servlet's service method or be subclasses of
* the {@link ServletRequestWrapper} or {@link ServletResponseWrapper}
* classes that wrap them.
- *
- *
+ *
+ *
* @param request
* a {@link ServletRequest} object that represents the request
* the client makes of the servlet
- *
+ *
* @param response
* a {@link ServletResponse} object that represents the response
* the servlet returns to the client
- *
+ *
* @exception ServletException
* if the target resource throws this exception
- *
+ *
* @exception IOException
* if the target resource throws this exception
- *
+ *
* @exception IllegalStateException
* if the response was already committed
*/
@@ -263,30 +263,30 @@ public interface RequestDispatcher {
* Includes the content of a resource (servlet, JSP page, HTML file) in the
* response. In essence, this method enables programmatic server-side
* includes.
- *
+ *
* <p>
* The {@link ServletResponse} object has its path elements and parameters
* remain unchanged from the caller's. The included servlet cannot change
* the response status code or set headers; any attempt to make a change is
* ignored.
- *
+ *
* <p>
* The request and response parameters must be either the same objects as
* were passed to the calling servlet's service method or be subclasses of
* the {@link ServletRequestWrapper} or {@link ServletResponseWrapper}
* classes that wrap them.
- *
+ *
* @param request
* a {@link ServletRequest} object that contains the client's
* request
- *
+ *
* @param response
* a {@link ServletResponse} object that contains the servlet's
* response
- *
+ *
* @exception ServletException
* if the included resource throws this exception
- *
+ *
* @exception IOException
* if the included resource throws this exception
*/
diff --git a/java/javax/servlet/Servlet.java b/java/javax/servlet/Servlet.java
index 468ccd9..73d30bb 100644
--- a/java/javax/servlet/Servlet.java
+++ b/java/javax/servlet/Servlet.java
@@ -21,17 +21,17 @@ import java.io.IOException;
/**
* Defines methods that all servlets must implement.
- *
+ *
* <p>
* A servlet is a small Java program that runs within a Web server. Servlets
* receive and respond to requests from Web clients, usually across HTTP, the
* HyperText Transfer Protocol.
- *
+ *
* <p>
* To implement this interface, you can write a generic servlet that extends
* <code>javax.servlet.GenericServlet</code> or an HTTP servlet that extends
* <code>javax.servlet.http.HttpServlet</code>.
- *
+ *
* <p>
* This interface defines methods to initialize a servlet, to service requests,
* and to remove a servlet from the server. These are known as life-cycle
@@ -43,14 +43,14 @@ import java.io.IOException;
* <li>The servlet is taken out of service, then destroyed with the
* <code>destroy</code> method, then garbage collected and finalized.
* </ol>
- *
+ *
* <p>
* In addition to the life-cycle methods, this interface provides the
* <code>getServletConfig</code> method, which the servlet can use to get any
* startup information, and the <code>getServletInfo</code> method, which allows
* the servlet to return basic information about itself, such as author,
* version, and copyright.
- *
+ *
* @see GenericServlet
* @see javax.servlet.http.HttpServlet
*/
@@ -59,12 +59,12 @@ public interface Servlet {
/**
* Called by the servlet container to indicate to a servlet that the servlet
* is being placed into service.
- *
+ *
* <p>
* The servlet container calls the <code>init</code> method exactly once
* after instantiating the servlet. The <code>init</code> method must
* complete successfully before the servlet can receive any requests.
- *
+ *
* <p>
* The servlet container cannot place the servlet into service if the
* <code>init</code> method
@@ -72,36 +72,36 @@ public interface Servlet {
* <li>Throws a <code>ServletException</code>
* <li>Does not return within a time period defined by the Web server
* </ol>
- *
- *
+ *
+ *
* @param config
* a <code>ServletConfig</code> object containing the servlet's
* configuration and initialization parameters
- *
+ *
* @exception ServletException
* if an exception has occurred that interferes with the
* servlet's normal operation
- *
+ *
* @see UnavailableException
* @see #getServletConfig
*/
public void init(ServletConfig config) throws ServletException;
/**
- *
+ *
* Returns a {@link ServletConfig} object, which contains initialization and
* startup parameters for this servlet. The <code>ServletConfig</code>
* object returned is the one passed to the <code>init</code> method.
- *
+ *
* <p>
* Implementations of this interface are responsible for storing the
* <code>ServletConfig</code> object so that this method can return it. The
* {@link GenericServlet} class, which implements this interface, already
* does this.
- *
+ *
* @return the <code>ServletConfig</code> object that initializes this
* servlet
- *
+ *
* @see #init
*/
public ServletConfig getServletConfig();
@@ -109,16 +109,16 @@ public interface Servlet {
/**
* Called by the servlet container to allow the servlet to respond to a
* request.
- *
+ *
* <p>
* This method is only called after the servlet's <code>init()</code> method
* has completed successfully.
- *
+ *
* <p>
* The status code of the response always should be set for a servlet that
* throws or sends an error.
- *
- *
+ *
+ *
* <p>
* Servlets typically run inside multithreaded servlet containers that can
* handle multiple requests concurrently. Developers must be aware to
@@ -128,20 +128,20 @@ public interface Servlet {
* href
* ="http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html">
* the Java tutorial on multi-threaded programming</a>.
- *
- *
+ *
+ *
* @param req
* the <code>ServletRequest</code> object that contains the
* client's request
- *
+ *
* @param res
* the <code>ServletResponse</code> object that contains the
* servlet's response
- *
+ *
* @exception ServletException
* if an exception occurs that interferes with the servlet's
* normal operation
- *
+ *
* @exception IOException
* if an input or output exception occurs
*/
@@ -151,11 +151,11 @@ public interface Servlet {
/**
* Returns information about the servlet, such as author, version, and
* copyright.
- *
+ *
* <p>
* The string that this method returns should be plain text and not markup
* of any kind (such as HTML, XML, etc.).
- *
+ *
* @return a <code>String</code> containing servlet information
*/
public String getServletInfo();
@@ -167,7 +167,7 @@ public interface Servlet {
* after a timeout period has passed. After the servlet container calls this
* method, it will not call the <code>service</code> method again on this
* servlet.
- *
+ *
* <p>
* This method gives the servlet an opportunity to clean up any resources
* that are being held (for example, memory, file handles, threads) and make
diff --git a/java/javax/servlet/ServletConfig.java b/java/javax/servlet/ServletConfig.java
index 71301a0..be61656 100644
--- a/java/javax/servlet/ServletConfig.java
+++ b/java/javax/servlet/ServletConfig.java
@@ -29,7 +29,7 @@ public interface ServletConfig {
* server administration, assigned in the web application deployment
* descriptor, or for an unregistered (and thus unnamed) servlet instance it
* will be the servlet's class name.
- *
+ *
* @return the name of the servlet instance
*/
public String getServletName();
@@ -37,7 +37,7 @@ public interface ServletConfig {
/**
* Returns a reference to the {@link ServletContext} in which the caller is
* executing.
- *
+ *
* @return a {@link ServletContext} object, used by the caller to interact
* with its servlet container
* @see ServletContext
@@ -48,7 +48,7 @@ public interface ServletConfig {
* Returns a <code>String</code> containing the value of the named
* initialization parameter, or <code>null</code> if the parameter does not
* exist.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the
* initialization parameter
@@ -61,7 +61,7 @@ public interface ServletConfig {
* Returns the names of the servlet's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the servlet has no initialization parameters.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects
* containing the names of the servlet's initialization parameters
*/
diff --git a/java/javax/servlet/ServletContainerInitializer.java b/java/javax/servlet/ServletContainerInitializer.java
index 10ead44..3dace91 100644
--- a/java/javax/servlet/ServletContainerInitializer.java
+++ b/java/javax/servlet/ServletContainerInitializer.java
@@ -36,7 +36,7 @@ import java.util.Set;
* @since Servlet 3.0
*/
public interface ServletContainerInitializer {
-
+
/**
* Receives notification during startup of a web application of the classes
* within the web application that matched the criteria defined via the
diff --git a/java/javax/servlet/ServletContext.java b/java/javax/servlet/ServletContext.java
index df4637d..7c229b0 100644
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -45,7 +45,7 @@ import javax.servlet.descriptor.JspConfigDescriptor;
* The <code>ServletContext</code> object is contained within the
* {@link ServletConfig} object, which the Web server provides the servlet when
* the servlet is initialized.
- *
+ *
* @author Various
* @see Servlet#getServletConfig
* @see ServletConfig#getServletContext
@@ -71,7 +71,7 @@ public interface ServletContext {
* <p>
* In a security conscious environment, the servlet container may return
* <code>null</code> for a given URL.
- *
+ *
* @param uripath
* a <code>String</code> specifying the context path of another
* web application in the container.
@@ -88,7 +88,7 @@ public interface ServletContext {
* Returns the major version of the Java Servlet API that this servlet
* container supports. All implementations that comply with Version 3.0 must
* have this method return the integer 3.
- *
+ *
* @return 3
*/
public int getMajorVersion();
@@ -97,7 +97,7 @@ public interface ServletContext {
* Returns the minor version of the Servlet API that this servlet container
* supports. All implementations that comply with Version 3.0 must have this
* method return the integer 0.
- *
+ *
* @return 0
*/
public int getMinorVersion();
@@ -135,7 +135,7 @@ public interface ServletContext {
* of the servlet container, and may be specified in a web application
* deployment descriptor. Common MIME types are <code>"text/html"</code> and
* <code>"image/gif"</code>.
- *
+ *
* @param file
* a <code>String</code> specifying the name of a file
* @return a <code>String</code> specifying the file's MIME type
@@ -162,7 +162,7 @@ public interface ServletContext {
* "/customer/", "/WEB-INF/"}<br>
* getResourcePaths("/catalog/") returns {"/catalog/index.html",
* "/catalog/products.html", "/catalog/offers/"}.<br>
- *
+ *
* @param path
* the partial path used to match the resources, which must start
* with a /
@@ -200,7 +200,7 @@ public interface ServletContext {
* This method has a different purpose than
* <code>java.lang.Class.getResource</code>, which looks up resources based
* on a class loader. This method does not use class loaders.
- *
+ *
* @param path
* a <code>String</code> specifying the path to the resource
* @return the resource located at the named path, or <code>null</code> if
@@ -230,7 +230,7 @@ public interface ServletContext {
* <code>java.lang.Class.getResourceAsStream</code>, which uses a class
* loader. This method allows servlet containers to make a resource
* available to a servlet from any location, without using a class loader.
- *
+ *
* @param path
* a <code>String</code> specifying the path to the resource
* @return the <code>InputStream</code> returned to the servlet, or
@@ -249,7 +249,7 @@ public interface ServletContext {
* <code>RequestDispatcher</code> for resources in foreign contexts. This
* method returns <code>null</code> if the <code>ServletContext</code>
* cannot return a <code>RequestDispatcher</code>.
- *
+ *
* @param path
* a <code>String</code> specifying the pathname to the resource
* @return a <code>RequestDispatcher</code> object that acts as a wrapper for
@@ -272,7 +272,7 @@ public interface ServletContext {
* <p>
* This method returns <code>null</code> if the <code>ServletContext</code>
* cannot return a <code>RequestDispatcher</code> for any reason.
- *
+ *
* @param name
* a <code>String</code> specifying the name of a servlet to wrap
* @return a <code>RequestDispatcher</code> object that acts as a wrapper for
@@ -335,7 +335,7 @@ public interface ServletContext {
* Writes the specified message to a servlet log file, usually an event log.
* The name and type of the servlet log file is specific to the servlet
* container.
- *
+ *
* @param msg
* a <code>String</code> specifying the message to be written to
* the log file
@@ -359,7 +359,7 @@ public interface ServletContext {
* <code>Throwable</code> exception to the servlet log file. The name and
* type of the servlet log file is specific to the servlet container,
* usually an event log.
- *
+ *
* @param message
* a <code>String</code> that describes the error or exception
* @param throwable
@@ -380,7 +380,7 @@ public interface ServletContext {
* servlet container cannot translate the virtual path to a real path for
* any reason (such as when the content is being made available from a
* <code>.war</code> archive).
- *
+ *
* @param path
* a <code>String</code> specifying a virtual path
* @return a <code>String</code> specifying the real path, or null if the
@@ -400,7 +400,7 @@ public interface ServletContext {
* The servlet container may return other optional information after the
* primary string in parentheses, for example,
* <code>JavaServer Web Dev Kit/1.0 (JDK 1.1.6; Windows NT 4.0 x86)</code>.
- *
+ *
* @return a <code>String</code> containing at least the servlet container
* name and version number
*/
@@ -414,7 +414,7 @@ public interface ServletContext {
* This method can make available configuration information useful to an
* entire "web application". For example, it can provide a webmaster's email
* address or the name of a system that holds critical data.
- *
+ *
* @param name
* a <code>String</code> containing the name of the parameter
* whose value is requested
@@ -428,7 +428,7 @@ public interface ServletContext {
* Returns the names of the context's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the context has no initialization parameters.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects
* containing the names of the context's initialization parameters
* @see ServletConfig#getInitParameter
@@ -464,7 +464,7 @@ public interface ServletContext {
* subclass. Attribute names should follow the same convention as package
* names. The Java Servlet API specification reserves names matching
* <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @return an <code>Object</code> containing the value of the attribute, or
@@ -477,7 +477,7 @@ public interface ServletContext {
* Returns an <code>Enumeration</code> containing the attribute names
* available within this servlet context. Use the {@link #getAttribute}
* method with an attribute name to get the value of an attribute.
- *
+ *
* @return an <code>Enumeration</code> of attribute names
* @see #getAttribute
*/
@@ -497,7 +497,7 @@ public interface ServletContext {
* Attribute names should follow the same convention as package names. The
* Java Servlet API specification reserves names matching
* <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @param object
@@ -512,7 +512,7 @@ public interface ServletContext {
* <p>
* If listeners are configured on the <code>ServletContext</code> the
* container notifies them accordingly.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute to
* be removed
@@ -523,7 +523,7 @@ public interface ServletContext {
* Returns the name of this web application corresponding to this
* ServletContext as specified in the deployment descriptor for this web
* application by the display-name element.
- *
+ *
* @return The name of the web application or null if no name has been
* declared in the deployment descriptor.
* @since Servlet 2.3
diff --git a/java/javax/servlet/ServletContextAttributeEvent.java b/java/javax/servlet/ServletContextAttributeEvent.java
index be23e82..b1bf727 100644
--- a/java/javax/servlet/ServletContextAttributeEvent.java
+++ b/java/javax/servlet/ServletContextAttributeEvent.java
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications about changes to the attributes of
* the servlet context of a web application.
- *
+ *
* @see ServletContextAttributeListener
* @since v 2.3
*/
diff --git a/java/javax/servlet/ServletContextAttributeListener.java b/java/javax/servlet/ServletContextAttributeListener.java
index 72d125b..0138b98 100644
--- a/java/javax/servlet/ServletContextAttributeListener.java
+++ b/java/javax/servlet/ServletContextAttributeListener.java
@@ -23,7 +23,7 @@ import java.util.EventListener;
* attribute list on the servlet context of a web application. To receive
* notification events, the implementation class must be configured in the
* deployment descriptor for the web application.
- *
+ *
* @see ServletContextAttributeEvent
* @since v 2.3
*/
diff --git a/java/javax/servlet/ServletContextEvent.java b/java/javax/servlet/ServletContextEvent.java
index 06ff312..92a9120 100644
--- a/java/javax/servlet/ServletContextEvent.java
+++ b/java/javax/servlet/ServletContextEvent.java
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications about changes to the servlet
* context of a web application.
- *
+ *
* @see ServletContextListener
* @since v 2.3
*/
@@ -29,7 +29,7 @@ public class ServletContextEvent extends java.util.EventObject {
/**
* Construct a ServletContextEvent from the given context.
- *
+ *
* @param source
* - the ServletContext that is sending the event.
*/
@@ -39,7 +39,7 @@ public class ServletContextEvent extends java.util.EventObject {
/**
* Return the ServletContext that changed.
- *
+ *
* @return the ServletContext that sent the event.
*/
public ServletContext getServletContext() {
diff --git a/java/javax/servlet/ServletContextListener.java b/java/javax/servlet/ServletContextListener.java
index 8a5d850..db542e2 100644
--- a/java/javax/servlet/ServletContextListener.java
+++ b/java/javax/servlet/ServletContextListener.java
@@ -23,13 +23,13 @@ import java.util.EventListener;
* servlet context of the web application they are part of. To receive
* notification events, the implementation class must be configured in the
* deployment descriptor for the web application.
- *
+ *
* @see ServletContextEvent
* @since v 2.3
*/
public interface ServletContextListener extends EventListener {
-
+
/**
** Notification that the web application initialization process is starting.
* All ServletContextListeners are notified of context initialization before
diff --git a/java/javax/servlet/ServletException.java b/java/javax/servlet/ServletException.java
index 6315cbd..5a68c2c 100644
--- a/java/javax/servlet/ServletException.java
+++ b/java/javax/servlet/ServletException.java
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* Defines a general exception a servlet can throw when it encounters
* difficulty.
- *
+ *
* @author Various
*/
public class ServletException extends Exception {
@@ -36,7 +36,7 @@ public class ServletException extends Exception {
/**
* Constructs a new servlet exception with the specified message. The
* message can be written to the server log and/or displayed for the user.
- *
+ *
* @param message
* a <code>String</code> specifying the text of the exception
* message
@@ -49,7 +49,7 @@ public class ServletException extends Exception {
* Constructs a new servlet exception when the servlet needs to throw an
* exception and include a message about the "root cause" exception that
* interfered with its normal operation, including a description message.
- *
+ *
* @param message
* a <code>String</code> containing the text of the exception
* message
@@ -72,7 +72,7 @@ public class ServletException extends Exception {
* <code>Throwable</code> exception to get a localized exception message.
* When subclassing <code>ServletException</code>, this method can be
* overridden to create an exception message designed for a specific locale.
- *
+ *
* @param rootCause
* the <code>Throwable</code> exception that interfered with the
* servlet's normal operation, making the servlet exception
@@ -84,7 +84,7 @@ public class ServletException extends Exception {
/**
* Returns the exception that caused this servlet exception.
- *
+ *
* @return the <code>Throwable</code> that caused this servlet exception
*/
public Throwable getRootCause() {
diff --git a/java/javax/servlet/ServletInputStream.java b/java/javax/servlet/ServletInputStream.java
index 4f9b889..af7f87e 100644
--- a/java/javax/servlet/ServletInputStream.java
+++ b/java/javax/servlet/ServletInputStream.java
@@ -31,7 +31,7 @@ import java.io.InputStream;
* <p>
* This is an abstract class that a servlet container implements. Subclasses of
* this class must implement the <code>java.io.InputStream.read()</code> method.
- *
+ *
* @author Various
* @see ServletRequest
*/
@@ -51,7 +51,7 @@ public abstract class ServletInputStream extends InputStream {
* <p>
* This method returns -1 if it reaches the end of the input stream before
* reading the maximum number of bytes.
- *
+ *
* @param b
* an array of bytes into which data is read
* @param off
diff --git a/java/javax/servlet/ServletOutputStream.java b/java/javax/servlet/ServletOutputStream.java
index cc04175..627cd3b 100644
--- a/java/javax/servlet/ServletOutputStream.java
+++ b/java/javax/servlet/ServletOutputStream.java
@@ -30,7 +30,7 @@ import java.util.ResourceBundle;
* This is an abstract class that the servlet container implements. Subclasses
* of this class must implement the <code>java.io.OutputStream.write(int)</code>
* method.
- *
+ *
* @author Various
* @see ServletResponse
*/
@@ -49,7 +49,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>String</code> to the client, without a carriage
* return-line feed (CRLF) character at the end.
- *
+ *
* @param s
* the <code>String</code> to send to the client
* @exception IOException
@@ -86,7 +86,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>boolean</code> value to the client, with no carriage
* return-line feed (CRLF) character at the end.
- *
+ *
* @param b
* the <code>boolean</code> value to send to the client
* @exception IOException
@@ -105,7 +105,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a character to the client, with no carriage return-line feed
* (CRLF) at the end.
- *
+ *
* @param c
* the character to send to the client
* @exception IOException
@@ -118,7 +118,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes an int to the client, with no carriage return-line feed (CRLF) at
* the end.
- *
+ *
* @param i
* the int to send to the client
* @exception IOException
@@ -131,7 +131,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>long</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param l
* the <code>long</code> value to send to the client
* @exception IOException
@@ -144,7 +144,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>float</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param f
* the <code>float</code> value to send to the client
* @exception IOException
@@ -157,7 +157,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>double</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param d
* the <code>double</code> value to send to the client
* @exception IOException
@@ -169,7 +169,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a carriage return-line feed (CRLF) to the client.
- *
+ *
* @exception IOException
* if an input or output exception occurred
*/
@@ -180,7 +180,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>String</code> to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param s
* the <code>String</code> to write to the client
* @exception IOException
@@ -196,7 +196,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>boolean</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param b
* the <code>boolean</code> value to write to the client
* @exception IOException
@@ -216,7 +216,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a character to the client, followed by a carriage return-line feed
* (CRLF).
- *
+ *
* @param c
* the character to write to the client
* @exception IOException
@@ -229,7 +229,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes an int to the client, followed by a carriage return-line feed
* (CRLF) character.
- *
+ *
* @param i
* the int to write to the client
* @exception IOException
@@ -242,7 +242,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>long</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param l
* the <code>long</code> value to write to the client
* @exception IOException
@@ -255,7 +255,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>float</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param f
* the <code>float</code> value to write to the client
* @exception IOException
@@ -268,7 +268,7 @@ public abstract class ServletOutputStream extends OutputStream {
/**
* Writes a <code>double</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param d
* the <code>double</code> value to write to the client
* @exception IOException
diff --git a/java/javax/servlet/ServletRegistration.java b/java/javax/servlet/ServletRegistration.java
index 521255d..de26618 100644
--- a/java/javax/servlet/ServletRegistration.java
+++ b/java/javax/servlet/ServletRegistration.java
@@ -24,7 +24,7 @@ import java.util.Set;
* @since Servlet 3.0
*/
public interface ServletRegistration extends Registration {
-
+
/**
* TODO
* @param urlPatterns The URL patterns that this Servlet should be mapped to
@@ -34,11 +34,11 @@ public interface ServletRegistration extends Registration {
* already been initialised
*/
public Set<String> addMapping(String... urlPatterns);
-
+
public Collection<String> getMappings();
-
+
public String getRunAsRole();
-
+
public static interface Dynamic
extends ServletRegistration, Registration.Dynamic {
public void setLoadOnStartup(int loadOnStartup);
diff --git a/java/javax/servlet/ServletRequest.java b/java/javax/servlet/ServletRequest.java
index 69f8426..edfde92 100644
--- a/java/javax/servlet/ServletRequest.java
+++ b/java/javax/servlet/ServletRequest.java
@@ -32,7 +32,7 @@ import java.util.Map;
* <code>ServletRequest</code> can provide additional protocol-specific data
* (for example, HTTP data is provided by
* {@link javax.servlet.http.HttpServletRequest}.
- *
+ *
* @author Various
* @see javax.servlet.http.HttpServletRequest
*/
@@ -54,7 +54,7 @@ public interface ServletRequest {
* Attribute names should follow the same conventions as package names. This
* specification reserves names matching <code>java.*</code>,
* <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @return an <code>Object</code> containing the value of the attribute, or
@@ -67,7 +67,7 @@ public interface ServletRequest {
* attributes available to this request. This method returns an empty
* <code>Enumeration</code> if the request has no attributes available to
* it.
- *
+ *
* @return an <code>Enumeration</code> of strings containing the names of the
* request's attributes
*/
@@ -77,7 +77,7 @@ public interface ServletRequest {
* Returns the name of the character encoding used in the body of this
* request. This method returns <code>null</code> if the request does not
* specify a character encoding
- *
+ *
* @return a <code>String</code> containing the name of the character
* encoding, or <code>null</code> if the request does not specify a
* character encoding
@@ -88,7 +88,7 @@ public interface ServletRequest {
* Overrides the name of the character encoding used in the body of this
* request. This method must be called prior to reading request parameters
* or reading input using getReader().
- *
+ *
* @param env
* a <code>String</code> containing the name of the character
* encoding.
@@ -102,7 +102,7 @@ public interface ServletRequest {
* Returns the length, in bytes, of the request body and made available by
* the input stream, or -1 if the length is not known. For HTTP servlets,
* same as the value of the CGI variable CONTENT_LENGTH.
- *
+ *
* @return an integer containing the length of the request body or -1 if the
* length is not known
*/
@@ -112,7 +112,7 @@ public interface ServletRequest {
* Returns the MIME type of the body of the request, or <code>null</code> if
* the type is not known. For HTTP servlets, same as the value of the CGI
* variable CONTENT_TYPE.
- *
+ *
* @return a <code>String</code> containing the name of the MIME type of the
* request, or null if the type is not known
*/
@@ -122,7 +122,7 @@ public interface ServletRequest {
* Retrieves the body of the request as binary data using a
* {@link ServletInputStream}. Either this method or {@link #getReader} may
* be called to read the body, not both.
- *
+ *
* @return a {@link ServletInputStream} object containing the body of the
* request
* @exception IllegalStateException
@@ -151,7 +151,7 @@ public interface ServletRequest {
* an HTTP POST request, then reading the body directly via
* {@link #getInputStream} or {@link #getReader} can interfere with the
* execution of this method.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the parameter
* @return a <code>String</code> representing the single value of the
@@ -165,7 +165,7 @@ public interface ServletRequest {
* containing the names of the parameters contained in this request. If the
* request has no parameters, the method returns an empty
* <code>Enumeration</code>.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects, each
* <code>String</code> containing the name of a request parameter;
* or an empty <code>Enumeration</code> if the request has no
@@ -179,7 +179,7 @@ public interface ServletRequest {
* parameter does not exist.
* <p>
* If the parameter has a single value, the array has a length of 1.
- *
+ *
* @param name
* a <code>String</code> containing the name of the parameter
* whose value is requested
@@ -194,7 +194,7 @@ public interface ServletRequest {
* parameters are extra information sent with the request. For HTTP
* servlets, parameters are contained in the query string or posted form
* data.
- *
+ *
* @return an immutable java.util.Map containing parameter names as keys and
* parameter values as map values. The keys in the parameter map are
* of type String. The values in the parameter map are of type
@@ -207,7 +207,7 @@ public interface ServletRequest {
* <i>protocol/majorVersion.minorVersion</i>, for example, HTTP/1.1. For
* HTTP servlets, the value returned is the same as the value of the CGI
* variable <code>SERVER_PROTOCOL</code>.
- *
+ *
* @return a <code>String</code> containing the protocol name and version
* number
*/
@@ -217,7 +217,7 @@ public interface ServletRequest {
* Returns the name of the scheme used to make this request, for example,
* <code>http</code>, <code>https</code>, or <code>ftp</code>. Different
* schemes have different rules for constructing URLs, as noted in RFC 1738.
- *
+ *
* @return a <code>String</code> containing the name of the scheme used to
* make this request
*/
@@ -227,7 +227,7 @@ public interface ServletRequest {
* Returns the host name of the server to which the request was sent. It is
* the value of the part before ":" in the <code>Host</code> header value,
* if any, or the resolved server name, or the server IP address.
- *
+ *
* @return a <code>String</code> containing the name of the server
*/
public String getServerName();
@@ -236,7 +236,7 @@ public interface ServletRequest {
* Returns the port number to which the request was sent. It is the value of
* the part after ":" in the <code>Host</code> header value, if any, or the
* server port where the client connection was accepted on.
- *
+ *
* @return an integer specifying the port number
*/
public int getServerPort();
@@ -246,7 +246,7 @@ public interface ServletRequest {
* <code>BufferedReader</code>. The reader translates the character data
* according to the character encoding used on the body. Either this method
* or {@link #getInputStream} may be called to read the body, not both.
- *
+ *
* @return a <code>BufferedReader</code> containing the body of the request
* @exception java.io.UnsupportedEncodingException
* if the character set encoding used is not supported and
@@ -264,7 +264,7 @@ public interface ServletRequest {
* Returns the Internet Protocol (IP) address of the client or last proxy
* that sent the request. For HTTP servlets, same as the value of the CGI
* variable <code>REMOTE_ADDR</code>.
- *
+ *
* @return a <code>String</code> containing the IP address of the client
* that sent the request
*/
@@ -276,7 +276,7 @@ public interface ServletRequest {
* hostname (to improve performance), this method returns the dotted-string
* form of the IP address. For HTTP servlets, same as the value of the CGI
* variable <code>REMOTE_HOST</code>.
- *
+ *
* @return a <code>String</code> containing the fully qualified name of the
* client
*/
@@ -296,7 +296,7 @@ public interface ServletRequest {
* in a different web application by <code>RequestDispatcher</code>, the
* object set by this method may not be correctly retrieved in the caller
* servlet.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @param o
@@ -312,7 +312,7 @@ public interface ServletRequest {
* Attribute names should follow the same conventions as package names.
* Names beginning with <code>java.*</code>, <code>javax.*</code>, and
* <code>com.sun.*</code>, are reserved for use by Sun Microsystems.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute to
* remove
@@ -324,7 +324,7 @@ public interface ServletRequest {
* content in, based on the Accept-Language header. If the client request
* doesn't provide an Accept-Language header, this method returns the
* default locale for the server.
- *
+ *
* @return the preferred <code>Locale</code> for the client
*/
public Locale getLocale();
@@ -336,7 +336,7 @@ public interface ServletRequest {
* header. If the client request doesn't provide an Accept-Language header,
* this method returns an <code>Enumeration</code> containing one
* <code>Locale</code>, the default locale for the server.
- *
+ *
* @return an <code>Enumeration</code> of preferred <code>Locale</code>
* objects for the client
*/
@@ -345,7 +345,7 @@ public interface ServletRequest {
/**
* Returns a boolean indicating whether this request was made using a secure
* channel, such as HTTPS.
- *
+ *
* @return a boolean indicating if the request was made using a secure
* channel
*/
@@ -366,7 +366,7 @@ public interface ServletRequest {
* The difference between this method and
* {@link ServletContext#getRequestDispatcher} is that this method can take
* a relative path.
- *
+ *
* @param path
* a <code>String</code> specifying the pathname to the resource.
* If it is relative, it must be relative against the current
@@ -392,7 +392,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) source port of the client or last
* proxy that sent the request.
- *
+ *
* @return an integer specifying the port number
* @since 2.4
*/
@@ -401,7 +401,7 @@ public interface ServletRequest {
/**
* Returns the host name of the Internet Protocol (IP) interface on which
* the request was received.
- *
+ *
* @return a <code>String</code> containing the host name of the IP on which
* the request was received.
* @since 2.4
@@ -411,7 +411,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) address of the interface on which the
* request was received.
- *
+ *
* @return a <code>String</code> containing the IP address on which the
* request was received.
* @since 2.4
@@ -421,7 +421,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) port number of the interface on which
* the request was received.
- *
+ *
* @return an integer specifying the port number
* @since 2.4
*/
diff --git a/java/javax/servlet/ServletRequestAttributeEvent.java b/java/javax/servlet/ServletRequestAttributeEvent.java
index 2979598..9b25184 100644
--- a/java/javax/servlet/ServletRequestAttributeEvent.java
+++ b/java/javax/servlet/ServletRequestAttributeEvent.java
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications of changes to the attributes of the
* servlet request in an application.
- *
+ *
* @see ServletRequestAttributeListener
* @since Servlet 2.4
*/
@@ -33,7 +33,7 @@ public class ServletRequestAttributeEvent extends ServletRequestEvent {
* Construct a ServletRequestAttributeEvent giving the servlet context of
* this web application, the ServletRequest whose attributes are changing
* and the name and value of the attribute.
- *
+ *
* @param sc
* the ServletContext that is sending the event.
* @param request
@@ -52,7 +52,7 @@ public class ServletRequestAttributeEvent extends ServletRequestEvent {
/**
* Return the name of the attribute that changed on the ServletRequest.
- *
+ *
* @return the name of the changed request attribute
*/
public String getName() {
@@ -64,7 +64,7 @@ public class ServletRequestAttributeEvent extends ServletRequestEvent {
* replaced. If the attribute was added, this is the value of the attribute.
* If the attribute was removed, this is the value of the removed attribute.
* If the attribute was replaced, this is the old value of the attribute.
- *
+ *
* @return the value of the changed request attribute
*/
public Object getValue() {
diff --git a/java/javax/servlet/ServletRequestEvent.java b/java/javax/servlet/ServletRequestEvent.java
index 0b07a24..6d95e92 100644
--- a/java/javax/servlet/ServletRequestEvent.java
+++ b/java/javax/servlet/ServletRequestEvent.java
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* Events of this kind indicate lifecycle events for a ServletRequest. The
* source of the event is the ServletContext of this web application.
- *
+ *
* @see ServletRequestListener
* @since Servlet 2.4
*/
@@ -31,7 +31,7 @@ public class ServletRequestEvent extends java.util.EventObject {
/**
* Construct a ServletRequestEvent for the given ServletContext and
* ServletRequest.
- *
+ *
* @param sc
* the ServletContext of the web application.
* @param request
diff --git a/java/javax/servlet/ServletRequestWrapper.java b/java/javax/servlet/ServletRequestWrapper.java
index cc26bf0..4fcbdca 100644
--- a/java/javax/servlet/ServletRequestWrapper.java
+++ b/java/javax/servlet/ServletRequestWrapper.java
@@ -27,7 +27,7 @@ import java.util.Map;
* be subclassed by developers wishing to adapt the request to a Servlet. This
* class implements the Wrapper or Decorator pattern. Methods default to calling
* through to the wrapped request object.
- *
+ *
* @since v 2.3
* @see javax.servlet.ServletRequest
*/
@@ -36,7 +36,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* Creates a ServletRequest adaptor wrapping the given request object.
- *
+ *
* @throws IllegalArgumentException if the request is null
*/
public ServletRequestWrapper(ServletRequest request) {
@@ -287,7 +287,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* 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
*/
@Override
@@ -300,7 +300,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getRemotePort() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -311,7 +311,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getLocalName() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -322,7 +322,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getLocalAddr() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -333,7 +333,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getLocalPort() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -344,7 +344,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getServletContext() on
* the wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -355,7 +355,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return startAsync() on the
* wrapped request object.
- *
+ *
* @throws IllegalStateException If asynchronous processing is not supported
* for this request or if the request is already in asynchronous
* mode
@@ -369,7 +369,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return startAsync(Runnable) on
* the wrapped request object.
- *
+ *
* @param servletRequest The ServletRequest with which to initialise the
* asynchronous context
* @param servletResponse The ServletResponse with which to initialise the
@@ -388,7 +388,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return isAsyncStarted() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -399,7 +399,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return isAsyncSupported() on
* the wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -410,7 +410,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to return getAsyncContext() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -460,7 +460,7 @@ public class ServletRequestWrapper implements ServletRequest {
/**
* The default behavior of this method is to call getDispatcherType() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
diff --git a/java/javax/servlet/ServletResponse.java b/java/javax/servlet/ServletResponse.java
index 5767755..51cedc0 100644
--- a/java/javax/servlet/ServletResponse.java
+++ b/java/javax/servlet/ServletResponse.java
@@ -44,7 +44,7 @@ import java.util.Locale;
* See the Internet RFCs such as <a href="http://www.ietf.org/rfc/rfc2045.txt">
* RFC 2045</a> for more information on MIME. Protocols such as SMTP and HTTP
* define profiles of MIME, and those standards are still evolving.
- *
+ *
* @author Various
* @see ServletOutputStream
*/
@@ -63,7 +63,7 @@ public interface ServletResponse {
* <p>
* See RFC 2047 (http://www.ietf.org/rfc/rfc2047.txt) for more information
* about character encoding and MIME.
- *
+ *
* @return a <code>String</code> specifying the name of the character
* encoding, for example, <code>UTF-8</code>
*/
@@ -78,7 +78,7 @@ public interface ServletResponse {
* specified as described in {@link #getCharacterEncoding}, the charset
* parameter is included in the string returned. If no character encoding
* has been specified, the charset parameter is omitted.
- *
+ *
* @return a <code>String</code> specifying the content type, for example,
* <code>text/html; charset=UTF-8</code>, or null
* @since 2.4
@@ -92,7 +92,7 @@ public interface ServletResponse {
* Calling flush() on the ServletOutputStream commits the response. Either
* this method or {@link #getWriter} may be called to write the body, not
* both.
- *
+ *
* @return a {@link ServletOutputStream} for writing binary data
* @exception IllegalStateException
* if the <code>getWriter</code> method has been called on
@@ -116,7 +116,7 @@ public interface ServletResponse {
* <p>
* Either this method or {@link #getOutputStream} may be called to write the
* body, not both.
- *
+ *
* @return a <code>PrintWriter</code> object that can return character data
* to the client
* @exception java.io.UnsupportedEncodingException
@@ -153,7 +153,7 @@ public interface ServletResponse {
* the character encoding cannot be communicated via HTTP headers if the
* servlet does not specify a content type; however, it is still used to
* encode text written via the servlet response's writer.
- *
+ *
* @param charset
* a String specifying only the character set defined by IANA
* Character Sets
@@ -166,7 +166,7 @@ public interface ServletResponse {
/**
* Sets the length of the content body in the response In HTTP servlets,
* this method sets the HTTP Content-Length header.
- *
+ *
* @param len
* an integer specifying the length of the content being returned
* to the client; sets the Content-Length header
@@ -191,7 +191,7 @@ public interface ServletResponse {
* used for the servlet response's writer to the client if the protocol
* provides a way for doing so. In the case of HTTP, the
* <code>Content-Type</code> header is used.
- *
+ *
* @param type
* a <code>String</code> specifying the MIME type of the content
* @see #setLocale
@@ -214,7 +214,7 @@ public interface ServletResponse {
* This method must be called before any response body content is written;
* if content has been written or the response object has been committed,
* this method throws an <code>IllegalStateException</code>.
- *
+ *
* @param size
* the preferred buffer size
* @exception IllegalStateException
@@ -229,7 +229,7 @@ public interface ServletResponse {
/**
* Returns the actual buffer size used for the response. If no buffering is
* used, this method returns 0.
- *
+ *
* @return the actual buffer size used
* @see #setBufferSize
* @see #flushBuffer
@@ -242,7 +242,7 @@ public interface ServletResponse {
* Forces any content in the buffer to be written to the client. A call to
* this method automatically commits the response, meaning the status code
* and headers will be written.
- *
+ *
* @see #setBufferSize
* @see #getBufferSize
* @see #isCommitted
@@ -254,7 +254,7 @@ public interface ServletResponse {
* Clears the content of the underlying buffer in the response without
* clearing headers or status code. If the response has been committed, this
* method throws an <code>IllegalStateException</code>.
- *
+ *
* @see #setBufferSize
* @see #getBufferSize
* @see #isCommitted
@@ -266,7 +266,7 @@ public interface ServletResponse {
/**
* Returns a boolean indicating if the response has been committed. A
* committed response has already had its status code and headers written.
- *
+ *
* @return a boolean indicating if the response has been committed
* @see #setBufferSize
* @see #getBufferSize
@@ -279,7 +279,7 @@ public interface ServletResponse {
* Clears any data that exists in the buffer as well as the status code and
* headers. If the response has been committed, this method throws an
* <code>IllegalStateException</code>.
- *
+ *
* @exception IllegalStateException
* if the response has already been committed
* @see #setBufferSize
@@ -316,7 +316,7 @@ public interface ServletResponse {
* the character encoding cannot be communicated via HTTP headers if the
* servlet does not specify a content type; however, it is still used to
* encode text written via the servlet response's writer.
- *
+ *
* @param loc
* the locale of the response
* @see #getLocale
@@ -330,7 +330,7 @@ public interface ServletResponse {
* {@link #setLocale} method. Calls made to <code>setLocale</code> after the
* response is committed have no effect. If no locale has been specified,
* the container's default locale is returned.
- *
+ *
* @see #setLocale
*/
public Locale getLocale();
diff --git a/java/javax/servlet/ServletResponseWrapper.java b/java/javax/servlet/ServletResponseWrapper.java
index 728bfee..3f0940b 100644
--- a/java/javax/servlet/ServletResponseWrapper.java
+++ b/java/javax/servlet/ServletResponseWrapper.java
@@ -25,7 +25,7 @@ import java.util.Locale;
* can be subclassed by developers wishing to adapt the response from a Servlet.
* This class implements the Wrapper or Decorator pattern. Methods default to
* calling through to the wrapped response object.
- *
+ *
* @author Various
* @since v 2.3
* @see javax.servlet.ServletResponse
@@ -35,7 +35,7 @@ public class ServletResponseWrapper implements ServletResponse {
/**
* Creates a ServletResponse adaptor wrapping the given response object.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the response is null.
*/
@@ -55,7 +55,7 @@ public class ServletResponseWrapper implements ServletResponse {
/**
* Sets the response being wrapped.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the response is null.
*/
@@ -69,7 +69,7 @@ public class ServletResponseWrapper implements ServletResponse {
/**
* The default behavior of this method is to call
* setCharacterEncoding(String charset) on the wrapped response object.
- *
+ *
* @since 2.4
*/
@Override
@@ -125,7 +125,7 @@ public class ServletResponseWrapper implements ServletResponse {
/**
* The default behavior of this method is to return getContentType() on the
* wrapped response object.
- *
+ *
* @since 2.4
*/
@Override
diff --git a/java/javax/servlet/ServletSecurityElement.java b/java/javax/servlet/ServletSecurityElement.java
index 8a0900e..56667b4 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -5,9 +5,9 @@
* 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.
@@ -27,12 +27,12 @@ import javax.servlet.annotation.HttpMethodConstraint;
import javax.servlet.annotation.ServletSecurity;
/**
- *
+ *
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
public class ServletSecurityElement extends HttpConstraintElement {
-
+
private final Map<String,HttpMethodConstraintElement> methodConstraints =
new HashMap<String,HttpMethodConstraintElement>();
@@ -42,8 +42,8 @@ public class ServletSecurityElement extends HttpConstraintElement {
public ServletSecurityElement() {
super();
}
-
-
+
+
/**
* Use specific constraints for specified methods and default
* HttpConstraintElement for all other methods.
@@ -56,7 +56,7 @@ public class ServletSecurityElement extends HttpConstraintElement {
super();
addHttpMethodConstraints(httpMethodConstraints);
}
-
+
/**
* Use specified HttpConstraintElement.
* @param httpConstraintElement
@@ -64,7 +64,7 @@ public class ServletSecurityElement extends HttpConstraintElement {
public ServletSecurityElement(HttpConstraintElement httpConstraintElement) {
this (httpConstraintElement, null);
}
-
+
/**
* Use specified HttpConstraintElement as default and specific constraints
* for specified methods.
@@ -79,7 +79,7 @@ public class ServletSecurityElement extends HttpConstraintElement {
httpConstraintElement.getRolesAllowed());
addHttpMethodConstraints(httpMethodConstraints);
}
-
+
/**
* Create from an annotation.
* @param annotation
@@ -89,7 +89,7 @@ public class ServletSecurityElement extends HttpConstraintElement {
this(new HttpConstraintElement(annotation.value().value(),
annotation.value().transportGuarantee(),
annotation.value().rolesAllowed()));
-
+
List<HttpMethodConstraintElement> l =
new ArrayList<HttpMethodConstraintElement>();
HttpMethodConstraint[] constraints = annotation.httpMethodConstraints();
@@ -106,20 +106,20 @@ public class ServletSecurityElement extends HttpConstraintElement {
}
addHttpMethodConstraints(l);
}
-
+
public Collection<HttpMethodConstraintElement> getHttpMethodConstraints() {
Collection<HttpMethodConstraintElement> result =
new HashSet<HttpMethodConstraintElement>();
result.addAll(methodConstraints.values());
return result;
}
-
+
public Collection<String> getMethodNames() {
Collection<String> result = new HashSet<String>();
result.addAll(methodConstraints.keySet());
return result;
}
-
+
private void addHttpMethodConstraints(
Collection<HttpMethodConstraintElement> httpMethodConstraints) {
if (httpMethodConstraints == null) {
diff --git a/java/javax/servlet/SessionCookieConfig.java b/java/javax/servlet/SessionCookieConfig.java
index c10f68c..11567c0 100644
--- a/java/javax/servlet/SessionCookieConfig.java
+++ b/java/javax/servlet/SessionCookieConfig.java
@@ -5,9 +5,9 @@
* 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.
@@ -17,74 +17,74 @@
package javax.servlet;
/**
- *
+ *
* TODO SERVLET3 - Add comments
* @since Servlet 3.0
*/
public interface SessionCookieConfig {
-
+
/**
- *
+ *
* @param name
* @throws IllegalStateException
*/
public void setName(String name);
-
+
public String getName();
-
+
/**
- *
+ *
* @param domain
* @throws IllegalStateException
*/
public void setDomain(String domain);
-
+
public String getDomain();
-
+
/**
- *
+ *
* @param path
* @throws IllegalStateException
*/
public void setPath(String path);
-
+
public String getPath();
-
+
/**
- *
+ *
* @param comment
* @throws IllegalStateException
*/
public void setComment(String comment);
-
+
public String getComment();
-
+
/**
- *
+ *
* @param httpOnly
* @throws IllegalStateException
*/
public void setHttpOnly(boolean httpOnly);
-
+
public boolean isHttpOnly();
-
+
/**
- *
+ *
* @param secure
* @throws IllegalStateException
*/
public void setSecure(boolean secure);
-
+
public boolean isSecure();
/**
* Sets the maximum age.
- *
+ *
* @param MaxAge the maximum age to set
* @throws IllegalStateException
*/
public void setMaxAge(int MaxAge);
-
+
public int getMaxAge();
-
+
}
diff --git a/java/javax/servlet/SingleThreadModel.java b/java/javax/servlet/SingleThreadModel.java
index 83e2002..3ba2374 100644
--- a/java/javax/servlet/SingleThreadModel.java
+++ b/java/javax/servlet/SingleThreadModel.java
@@ -34,7 +34,7 @@ package javax.servlet;
* such as avoiding the usage of an instance variable or synchronizing the block
* of the code accessing those resources. This interface is deprecated in
* Servlet API version 2.4.
- *
+ *
* @author Various
* @deprecated As of Java Servlet API 2.4, with no direct replacement.
*/
diff --git a/java/javax/servlet/UnavailableException.java b/java/javax/servlet/UnavailableException.java
index 7295715..888fcca 100644
--- a/java/javax/servlet/UnavailableException.java
+++ b/java/javax/servlet/UnavailableException.java
@@ -38,7 +38,7 @@ package javax.servlet;
* the servlet container more robust. Specifically, the servlet container might
* block requests to the servlet or filter for a period of time suggested by the
* exception, rather than rejecting them until the servlet container restarts.
- *
+ *
* @author Various
*/
public class UnavailableException extends ServletException {
@@ -94,7 +94,7 @@ public class UnavailableException extends ServletException {
/**
* Constructs a new exception with a descriptive message indicating that the
* servlet is permanently unavailable.
- *
+ *
* @param msg
* a <code>String</code> specifying the descriptive message
*/
@@ -115,7 +115,7 @@ public class UnavailableException extends ServletException {
* to report how long it will take to be restored to functionality. This can
* be indicated with a negative or zero value for the <code>seconds</code>
* argument.
- *
+ *
* @param msg
* a <code>String</code> specifying the descriptive message,
* which can be written to a log file or displayed for the user.
@@ -139,7 +139,7 @@ public class UnavailableException extends ServletException {
* Returns a <code>boolean</code> indicating whether the servlet is
* permanently unavailable. If so, something is wrong with the servlet, and
* the system administrator must take some corrective action.
- *
+ *
* @return <code>true</code> if the servlet is permanently unavailable;
* <code>false</code> if the servlet is available or temporarily
* unavailable
@@ -150,7 +150,7 @@ public class UnavailableException extends ServletException {
/**
* Returns the servlet that is reporting its unavailability.
- *
+ *
* @return the <code>Servlet</code> object that is throwing the
* <code>UnavailableException</code>
* @deprecated As of Java Servlet API 2.2, with no replacement.
@@ -169,7 +169,7 @@ public class UnavailableException extends ServletException {
* unavailable or cannot provide an estimate of how long it will be
* unavailable. No effort is made to correct for the time elapsed since the
* exception was first reported.
- *
+ *
* @return an integer specifying the number of seconds the servlet will be
* temporarily unavailable, or a negative number if the servlet is
* permanently unavailable or cannot make an estimate
diff --git a/java/javax/servlet/annotation/HandlesTypes.java b/java/javax/servlet/annotation/HandlesTypes.java
index 30330a6..117d10d 100644
--- a/java/javax/servlet/annotation/HandlesTypes.java
+++ b/java/javax/servlet/annotation/HandlesTypes.java
@@ -5,9 +5,9 @@
* 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.
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare an array of application classes which are
* passed to a {@link javax.servlet.ServletContainerInitializer}.
- *
+ *
* @since Servlet 3.0
*/
@Target(ElementType.TYPE)
diff --git a/java/javax/servlet/annotation/HttpConstraint.java b/java/javax/servlet/annotation/HttpConstraint.java
index 851acd3..eb4ff09 100644
--- a/java/javax/servlet/annotation/HttpConstraint.java
+++ b/java/javax/servlet/annotation/HttpConstraint.java
@@ -5,9 +5,9 @@
* 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.
@@ -28,7 +28,7 @@ import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
* requests with HTTP protocol method types that are not otherwise represented
* by a corresponding {@link javax.servlet.annotation.HttpMethodConstraint} in a
* {@link javax.servlet.annotation.ServletSecurity} annotation.
- *
+ *
* @since Servlet 3.0
*/
@Retention(RetentionPolicy.RUNTIME)
@@ -38,14 +38,14 @@ public @interface HttpConstraint {
/**
* The EmptyRoleSemantic determines the behaviour when the rolesAllowed list
* is empty.
- *
+ *
* @return empty role semantic
*/
EmptyRoleSemantic value() default EmptyRoleSemantic.PERMIT;
/**
* Determines whether SSL/TLS is required to process the current request.
- *
+ *
* @return transport guarantee
*/
TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
@@ -54,7 +54,7 @@ public @interface HttpConstraint {
* The authorized roles' names. The container may discard duplicate role
* names during processing of the annotation. N.B. The String "*" does not
* have a special meaning if it occurs as a role name.
- *
+ *
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
@@ -62,7 +62,7 @@ public @interface HttpConstraint {
* Otherwise, when the array contains one or more role names access
* is permitted if the user a member of at least one of the named
* roles. The EmptyRoleSemantic is not applied in this case.
- *
+ *
*/
String[] rolesAllowed() default {};
diff --git a/java/javax/servlet/annotation/HttpMethodConstraint.java b/java/javax/servlet/annotation/HttpMethodConstraint.java
index 84139d0..e8455ec 100644
--- a/java/javax/servlet/annotation/HttpMethodConstraint.java
+++ b/java/javax/servlet/annotation/HttpMethodConstraint.java
@@ -5,9 +5,9 @@
* 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.
@@ -27,9 +27,9 @@ import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
* Specific security constraints can be applied to different types of request,
* differentiated by the HTTP protocol method type by using this annotation
* inside the {@link javax.servlet.annotation.ServletSecurity} annotation.
- *
+ *
* @since Servlet 3.0
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
@@ -37,7 +37,7 @@ public @interface HttpMethodConstraint {
/**
* HTTP Protocol method name (e.g. POST, PUT)
- *
+ *
* @return method name
*/
String value();
@@ -45,14 +45,14 @@ public @interface HttpMethodConstraint {
/**
* The EmptyRoleSemantic determines the behaviour when the rolesAllowed list
* is empty.
- *
+ *
* @return empty role semantic
*/
EmptyRoleSemantic emptyRoleSemantic() default EmptyRoleSemantic.PERMIT;
/**
* Determines whether SSL/TLS is required to process the current request.
- *
+ *
* @return transport guarantee
*/
TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
@@ -61,7 +61,7 @@ public @interface HttpMethodConstraint {
* The authorized roles' names. The container may discard duplicate role
* names during processing of the annotation. N.B. The String "*" does not
* have a special meaning if it occurs as a role name.
- *
+ *
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
diff --git a/java/javax/servlet/annotation/MultipartConfig.java b/java/javax/servlet/annotation/MultipartConfig.java
index a0a8aec..70e0dcc 100644
--- a/java/javax/servlet/annotation/MultipartConfig.java
+++ b/java/javax/servlet/annotation/MultipartConfig.java
@@ -5,9 +5,9 @@
* 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.
@@ -26,19 +26,19 @@ import java.lang.annotation.Target;
* which it is declared expects requests to made using the {@code
* multipart/form-data} MIME type. <br>
* <br>
- *
+ *
* {@link javax.servlet.http.Part} components of a given {@code
* multipart/form-data} request are retrieved by a Servlet annotated with
* {@code MultipartConfig} by calling
* {@link javax.servlet.http.HttpServletRequest#getPart} or
* {@link javax.servlet.http.HttpServletRequest#getParts}.<br>
* <br>
- *
+ *
* E.g. <code>@WebServlet("/upload")}</code><br>
- *
+ *
* <code>@MultipartConfig()</code> <code>public class UploadServlet extends
* HttpServlet ... } </code><br>
- *
+ *
* @since Servlet 3.0
*/
@Target(ElementType.TYPE)
diff --git a/java/javax/servlet/annotation/ServletSecurity.java b/java/javax/servlet/annotation/ServletSecurity.java
index 5a7837a..356fa0b 100644
--- a/java/javax/servlet/annotation/ServletSecurity.java
+++ b/java/javax/servlet/annotation/ServletSecurity.java
@@ -5,9 +5,9 @@
* 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.
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
* The container applies constraints to the URL patterns mapped to each Servlet
* which declares this annotation.<br>
* <br>
- *
+ *
* @since Servlet 3.0
*/
@Inherited
@@ -75,7 +75,7 @@ public @interface ServletSecurity {
/**
* The default constraint to apply to requests not handled by specific
* method constraints
- *
+ *
* @return http constraint
*/
HttpConstraint value() default @HttpConstraint;
@@ -83,7 +83,7 @@ public @interface ServletSecurity {
/**
* An array of HttpMethodConstraint objects to which the security constraint
* will be applied
- *
+ *
* @return array of http method constraint
*/
HttpMethodConstraint[] httpMethodConstraints() default {};
diff --git a/java/javax/servlet/annotation/WebFilter.java b/java/javax/servlet/annotation/WebFilter.java
index 91df85e..ddaa08a 100644
--- a/java/javax/servlet/annotation/WebFilter.java
+++ b/java/javax/servlet/annotation/WebFilter.java
@@ -5,9 +5,9 @@
* 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.
@@ -27,35 +27,35 @@ import javax.servlet.DispatcherType;
/**
* The annotation used to declare a Servlet {@link javax.servlet.Filter}. <br>
* <br>
- *
+ *
* This annotation will be processed by the container during deployment, the
* Filter class in which it is found will be created as per the configuration
* and applied to the URL patterns, {@link javax.servlet.Servlet}s and
* {@link javax.servlet.DispatcherType}s.<br>
* <br>
- *
+ *
* If the name attribute is not defined, the fully qualified name of the class
* is used.<br>
* <br>
- *
+ *
* At least one URL pattern MUST be declared in either the {@code value} or
* {@code urlPattern} attribute of the annotation, but not both.<br>
* <br>
- *
+ *
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
* should be used.<br>
* <br>
- *
+ *
* The annotated class MUST implement {@link javax.servlet.Filter}.
- *
+ *
* E.g.
- *
+ *
* <code>@WebFilter("/path/*")</code><br>
* <code>public class AnExampleFilter implements Filter { ... </code><br>
- *
+ *
* @since Servlet 3.0 (Section 8.1.2)
- *
+ *
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -99,7 +99,7 @@ public @interface WebFilter {
/**
* A convenience method, to allow extremely simple annotation of a class.
- *
+ *
* @return array of URL patterns
* @see #urlPatterns()
*/
diff --git a/java/javax/servlet/annotation/WebInitParam.java b/java/javax/servlet/annotation/WebInitParam.java
index f53f82c..fe6c784 100644
--- a/java/javax/servlet/annotation/WebInitParam.java
+++ b/java/javax/servlet/annotation/WebInitParam.java
@@ -5,9 +5,9 @@
* 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.
@@ -28,11 +28,11 @@ import java.lang.annotation.Target;
* {@link javax.servlet.annotation.WebFilter} or
* {@link javax.servlet.annotation.WebServlet} annotation.<br>
* <br>
- *
+ *
* E.g.
* <code>&#064;WebServlet(name="TestServlet", urlPatterns={"/test"},initParams={&#064;WebInitParam(name="test", value="true")})
* public class TestServlet extends HttpServlet { ... </code><br>
- *
+ *
* @since Servlet 3.0
*/
@Target(ElementType.TYPE)
diff --git a/java/javax/servlet/annotation/WebListener.java b/java/javax/servlet/annotation/WebListener.java
index fb457cc..cf8419a 100644
--- a/java/javax/servlet/annotation/WebListener.java
+++ b/java/javax/servlet/annotation/WebListener.java
@@ -5,9 +5,9 @@
* 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.
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* The annotation used to declare a listener for various types of event, in a
* given web application context.<br>
* <br>
- *
+ *
* The class annotated MUST implement one, (or more), of the following
* interfaces: {@link javax.servlet.http.HttpSessionAttributeListener},
* {@link javax.servlet.http.HttpSessionListener},
@@ -35,10 +35,10 @@ import java.lang.annotation.Target;
* {@link javax.servlet.ServletRequestAttributeListener},
* {@link javax.servlet.ServletRequestListener} <br>
* <br>
- *
+ *
* E.g. <code>@WebListener</code><br>
* <code>public TestListener implements ServletContextListener {</code><br>
- *
+ *
* @since Servlet 3.0
*/
@Target(ElementType.TYPE)
diff --git a/java/javax/servlet/annotation/WebServlet.java b/java/javax/servlet/annotation/WebServlet.java
index 194d333..8e518b7 100644
--- a/java/javax/servlet/annotation/WebServlet.java
+++ b/java/javax/servlet/annotation/WebServlet.java
@@ -5,9 +5,9 @@
* 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.
@@ -25,33 +25,33 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare the configuration of an
* {@link javax.servlet.Servlet}. <br>
- *
+ *
* If the name attribute is not defined, the fully qualified name of the class
* is used.<br>
* <br>
- *
+ *
* At least one URL pattern MUST be declared in either the {@code value} or
* {@code urlPattern} attribute of the annotation, but not both.<br>
* <br>
- *
+ *
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
* should be used.<br>
* <br>
- *
+ *
* The class on which this annotation is declared MUST extend
* {@link javax.servlet.http.HttpServlet}. <br>
* <br>
- *
+ *
* E.g. <code>@WebServlet("/path")}<br>
* public class TestServlet extends HttpServlet ... {</code><br>
- *
+ *
* E.g.
* <code>@WebServlet(name="TestServlet", urlPatterns={"/path", "/alt"}) <br>
* public class TestServlet extends HttpServlet ... {</code><br>
- *
+ *
* @since Servlet 3.0 (Section 8.1.1)
- *
+ *
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -65,7 +65,7 @@ public @interface WebServlet {
/**
* A convenience method, to allow extremely simple annotation of a class.
- *
+ *
* @return array of URL patterns
* @see #urlPatterns()
*/
diff --git a/java/javax/servlet/descriptor/JspConfigDescriptor.java b/java/javax/servlet/descriptor/JspConfigDescriptor.java
index 8296d44..27b3cc7 100644
--- a/java/javax/servlet/descriptor/JspConfigDescriptor.java
+++ b/java/javax/servlet/descriptor/JspConfigDescriptor.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
index 25c71a9..ddee69b 100644
--- a/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/servlet/descriptor/TaglibDescriptor.java b/java/javax/servlet/descriptor/TaglibDescriptor.java
index f930c5d..b2e8e98 100644
--- a/java/javax/servlet/descriptor/TaglibDescriptor.java
+++ b/java/javax/servlet/descriptor/TaglibDescriptor.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java
index 8fc5581..4c449d1 100644
--- a/java/javax/servlet/http/HttpServletRequest.java
+++ b/java/javax/servlet/http/HttpServletRequest.java
@@ -60,7 +60,7 @@ public interface HttpServletRequest extends ServletRequest {
* returned.
* <p>
* Same as the value of the CGI variable AUTH_TYPE.
- *
+ *
* @return one of the static members BASIC_AUTH, FORM_AUTH, CLIENT_CERT_AUTH,
* DIGEST_AUTH (suitable for == comparison) or the
* container-specific string indicating the authentication scheme,
@@ -72,7 +72,7 @@ public interface HttpServletRequest extends ServletRequest {
* Returns an array containing all of the <code>Cookie</code> objects the
* client sent with this request. This method returns <code>null</code> if
* no cookies were sent.
- *
+ *
* @return an array of all the <code>Cookies</code> included with this
* request, or <code>null</code> if the request has no cookies
*/
@@ -89,7 +89,7 @@ public interface HttpServletRequest extends ServletRequest {
* If the request did not have a header of the specified name, this method
* returns -1. If the header can't be converted to a date, the method throws
* an <code>IllegalArgumentException</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the header
* @return a <code>long</code> value representing the date specified in the
@@ -108,7 +108,7 @@ public interface HttpServletRequest extends ServletRequest {
* multiple headers with the same name, this method returns the first head
* in the request. The header name is case insensitive. You can use this
* method with any request header.
- *
+ *
* @param name
* a <code>String</code> specifying the header name
* @return a <code>String</code> containing the value of the requested
@@ -128,7 +128,7 @@ public interface HttpServletRequest extends ServletRequest {
* If the request did not include any headers of the specified name, this
* method returns an empty <code>Enumeration</code>. The header name is case
* insensitive. You can use this method with any request header.
- *
+ *
* @param name
* a <code>String</code> specifying the header name
* @return an <code>Enumeration</code> containing the values of the requested
@@ -144,7 +144,7 @@ public interface HttpServletRequest extends ServletRequest {
* <p>
* Some servlet containers do not allow servlets to access headers using
* this method, in which case this method returns <code>null</code>
- *
+ *
* @return an enumeration of all the header names sent with this request; if
* the request has no headers, an empty enumeration; if the servlet
* container does not allow servlets to use this method,
@@ -159,7 +159,7 @@ public interface HttpServletRequest extends ServletRequest {
* throws a <code>NumberFormatException</code>.
* <p>
* The header name is case insensitive.
- *
+ *
* @param name
* a <code>String</code> specifying the name of a request header
* @return an integer expressing the value of the request header or -1 if the
@@ -174,7 +174,7 @@ public interface HttpServletRequest extends ServletRequest {
* Returns the name of the HTTP method with which this request was made, for
* example, GET, POST, or PUT. Same as the value of the CGI variable
* REQUEST_METHOD.
- *
+ *
* @return a <code>String</code> specifying the name of the method with
* which this request was made
*/
@@ -190,7 +190,7 @@ public interface HttpServletRequest extends ServletRequest {
* information.
* <p>
* Same as the value of the CGI variable PATH_INFO.
- *
+ *
* @return a <code>String</code>, decoded by the web container, specifying
* extra path information that comes after the servlet path but
* before the query string in the request URL; or <code>null</code>
@@ -207,7 +207,7 @@ public interface HttpServletRequest extends ServletRequest {
* <code>null</code> or the servlet container cannot translate the virtual
* path to a real path for any reason (such as when the web application is
* executed from an archive). The web container does not decode this string.
- *
+ *
* @return a <code>String</code> specifying the real path, or
* <code>null</code> if the URL does not have any extra path
* information
@@ -220,7 +220,7 @@ public interface HttpServletRequest extends ServletRequest {
* starts with a "/" character but does not end with a "/" character. For
* servlets in the default (root) context, this method returns "". The
* container does not decode this string.
- *
+ *
* @return a <code>String</code> specifying the portion of the request URI
* that indicates the context of the request
*/
@@ -230,7 +230,7 @@ public interface HttpServletRequest extends ServletRequest {
* Returns the query string that is contained in the request URL after the
* path. This method returns <code>null</code> if the URL does not have a
* query string. Same as the value of the CGI variable QUERY_STRING.
- *
+ *
* @return a <code>String</code> containing the query string or
* <code>null</code> if the URL contains no query string. The value
* is not decoded by the container.
@@ -243,7 +243,7 @@ public interface HttpServletRequest extends ServletRequest {
* authenticated. Whether the user name is sent with each subsequent request
* depends on the browser and type of authentication. Same as the value of
* the CGI variable REMOTE_USER.
- *
+ *
* @return a <code>String</code> specifying the login of the user making
* this request, or <code>null</code> if the user login is not known
*/
@@ -254,7 +254,7 @@ public interface HttpServletRequest extends ServletRequest {
* in the specified logical "role". Roles and role membership can be defined
* using deployment descriptors. If the user has not been authenticated, the
* method returns <code>false</code>.
- *
+ *
* @param role
* a <code>String</code> specifying the name of the role
* @return a <code>boolean</code> indicating whether the user making this
@@ -267,7 +267,7 @@ public interface HttpServletRequest extends ServletRequest {
* Returns a <code>java.security.Principal</code> object containing the name
* of the current authenticated user. If the user has not been
* authenticated, the method returns <code>null</code>.
- *
+ *
* @return a <code>java.security.Principal</code> containing the name of the
* user making this request; <code>null</code> if the user has not
* been authenticated
@@ -278,7 +278,7 @@ public interface HttpServletRequest extends ServletRequest {
* Returns the session ID specified by the client. This may not be the same
* as the ID of the current valid session for this request. If the client
* did not specify a session ID, this method returns <code>null</code>.
- *
+ *
* @return a <code>String</code> specifying the session ID, or
* <code>null</code> if the request did not specify a session ID
* @see #isRequestedSessionIdValid
@@ -309,7 +309,7 @@ public interface HttpServletRequest extends ServletRequest {
* <p>
* To reconstruct an URL with a scheme and host, use
* {@link #getRequestURL}.
- *
+ *
* @return a <code>String</code> containing the part of the URL from the
* protocol name up to the query string
* @see #getRequestURL
@@ -326,7 +326,7 @@ public interface HttpServletRequest extends ServletRequest {
* <p>
* This method is useful for creating redirect messages and for reporting
* errors.
- *
+ *
* @return a <code>StringBuffer</code> object containing the reconstructed
* URL
*/
@@ -340,7 +340,7 @@ public interface HttpServletRequest extends ServletRequest {
* <p>
* This method will return an empty string ("") if the servlet used to
* process this request was matched using the "/*" pattern.
- *
+ *
* @return a <code>String</code> containing the name or path of the servlet
* being called, as specified in the request URL, decoded, or an
* empty string if the servlet used to process the request is
@@ -361,7 +361,7 @@ public interface HttpServletRequest extends ServletRequest {
* cookies to maintain session integrity and is asked to create a new
* session when the response is committed, an IllegalStateException is
* thrown.
- *
+ *
* @param create
* <code>true</code> to create a new session for this request if
* necessary; <code>false</code> to return <code>null</code> if
@@ -376,7 +376,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Returns the current session associated with this request, or if the
* request does not have a session, creates one.
- *
+ *
* @return the <code>HttpSession</code> associated with this request
* @see #getSession(boolean)
*/
@@ -384,7 +384,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Checks whether the requested session ID is still valid.
- *
+ *
* @return <code>true</code> if this request has an id for a valid session
* in the current session context; <code>false</code> otherwise
* @see #getRequestedSessionId
@@ -394,7 +394,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Checks whether the requested session ID came in as a cookie.
- *
+ *
* @return <code>true</code> if the session ID came in as a cookie;
* otherwise, <code>false</code>
* @see #getSession
@@ -404,7 +404,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Checks whether the requested session ID came in as part of the request
* URL.
- *
+ *
* @return <code>true</code> if the session ID came in as part of a URL;
* otherwise, <code>false</code>
* @see #getSession
@@ -461,7 +461,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Return a collection of all uploaded Parts.
- *
+ *
* @return A collection of all uploaded Parts.
* @throws IOException
* if an I/O error occurs
@@ -477,7 +477,7 @@ public interface HttpServletRequest extends ServletRequest {
/**
* Gets the named Part or null if the Part does not exist. Triggers upload
* of all Parts.
- *
+ *
* @param name
* @return The named Part or null if the Part does not exist
* @throws IOException
diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java b/java/javax/servlet/http/HttpServletRequestWrapper.java
index 327529c..a4cf333 100644
--- a/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -28,7 +28,7 @@ import javax.servlet.ServletRequestWrapper;
* can be subclassed by developers wishing to adapt the request to a Servlet.
* This class implements the Wrapper or Decorator pattern. Methods default to
* calling through to the wrapped request object.
- *
+ *
* @see javax.servlet.http.HttpServletRequest
* @since v 2.3
*/
@@ -37,7 +37,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
/**
* Constructs a request object wrapping the given request.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the request is null
*/
@@ -268,7 +268,7 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements
/**
* 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
*/
@Override
diff --git a/java/javax/servlet/http/HttpServletResponse.java b/java/javax/servlet/http/HttpServletResponse.java
index 25bf4c6..c5c6f82 100644
--- a/java/javax/servlet/http/HttpServletResponse.java
+++ b/java/javax/servlet/http/HttpServletResponse.java
@@ -28,7 +28,7 @@ import javax.servlet.ServletResponse;
* <p>
* The servlet container creates an <code>HttpServletResponse</code> object and
* passes it as an argument to the servlet's service methods (<code>doGet</code>, <code>doPost</code>, etc).
- *
+ *
* @see javax.servlet.ServletResponse
*/
public interface HttpServletResponse extends ServletResponse {
@@ -36,7 +36,7 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Adds the specified cookie to the response. This method can be called
* multiple times to set more than one cookie.
- *
+ *
* @param cookie
* the Cookie to return to the client
*/
@@ -45,7 +45,7 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Returns a boolean indicating whether the named response header has
* already been set.
- *
+ *
* @param name
* the header name
* @return <code>true</code> if the named response header has already been
@@ -63,7 +63,7 @@ public interface HttpServletResponse extends ServletResponse {
* For robust session tracking, all URLs emitted by a servlet should be run
* through this method. Otherwise, URL rewriting cannot be used with
* browsers which do not support cookies.
- *
+ *
* @param url
* the url to be encoded.
* @return the encoded URL if encoding is needed; the unchanged URL
@@ -83,7 +83,7 @@ public interface HttpServletResponse extends ServletResponse {
* All URLs sent to the <code>HttpServletResponse.sendRedirect</code> method
* should be run through this method. Otherwise, URL rewriting cannot be
* used with browsers which do not support cookies.
- *
+ *
* @param url
* the url to be encoded.
* @return the encoded URL if encoding is needed; the unchanged URL
@@ -127,7 +127,7 @@ public interface HttpServletResponse extends ServletResponse {
* If the response has already been committed, this method throws an
* IllegalStateException. After using this method, the response should be
* considered to be committed and should not be written to.
- *
+ *
* @param sc
* the error status code
* @param msg
@@ -143,7 +143,7 @@ public interface HttpServletResponse extends ServletResponse {
* Sends an error response to the client using the specified status code and
* clears the buffer. This is equivalent to calling {@link #sendError(int,
* String)} with the same status code and <code>null</code> for the message.
- *
+ *
* @param sc
* the error status code
* @exception IOException
@@ -165,7 +165,7 @@ public interface HttpServletResponse extends ServletResponse {
* If the response has already been committed, this method throws an
* IllegalStateException. After using this method, the response should be
* considered to be committed and should not be written to.
- *
+ *
* @param location
* the redirect location URL
* @exception IOException
@@ -182,7 +182,7 @@ public interface HttpServletResponse extends ServletResponse {
* already been set, the new value overwrites the previous one. The
* <code>containsHeader</code> method can be used to test for the presence
* of a header before setting its value.
- *
+ *
* @param name
* the name of the header to set
* @param date
@@ -196,7 +196,7 @@ public interface HttpServletResponse extends ServletResponse {
* Adds a response header with the given name and date-value. The date is
* specified in terms of milliseconds since the epoch. This method allows
* response headers to have multiple values.
- *
+ *
* @param name
* the name of the header to set
* @param date
@@ -210,7 +210,7 @@ public interface HttpServletResponse extends ServletResponse {
* already been set, the new value overwrites the previous one. The
* <code>containsHeader</code> method can be used to test for the presence
* of a header before setting its value.
- *
+ *
* @param name
* the name of the header
* @param value
@@ -225,7 +225,7 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Adds a response header with the given name and value. This method allows
* response headers to have multiple values.
- *
+ *
* @param name
* the name of the header
* @param value
@@ -241,7 +241,7 @@ public interface HttpServletResponse extends ServletResponse {
* header had already been set, the new value overwrites the previous one.
* The <code>containsHeader</code> method can be used to test for the
* presence of a header before setting its value.
- *
+ *
* @param name
* the name of the header
* @param value
@@ -254,7 +254,7 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Adds a response header with the given name and integer value. This method
* allows response headers to have multiple values.
- *
+ *
* @param name
* the name of the header
* @param value
@@ -272,7 +272,7 @@ public interface HttpServletResponse extends ServletResponse {
* <p>
* The container clears the buffer and sets the Location header, preserving
* cookies and other headers.
- *
+ *
* @param sc
* the status code
* @see #sendError
@@ -281,7 +281,7 @@ public interface HttpServletResponse extends ServletResponse {
/**
* Sets the status code and message for this response.
- *
+ *
* @param sc
* the status code
* @param sm
diff --git a/java/javax/servlet/http/HttpServletResponseWrapper.java b/java/javax/servlet/http/HttpServletResponseWrapper.java
index 1b70b57..451c1f6 100644
--- a/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletResponseWrapper;
* that can be subclassed by developers wishing to adapt the response from a
* Servlet. This class implements the Wrapper or Decorator pattern. Methods
* default to calling through to the wrapped response object.
- *
+ *
* @author Various
* @since v 2.3
* @see javax.servlet.http.HttpServletResponse
@@ -36,7 +36,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper
/**
* Constructs a response adaptor wrapping the given response.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the response is null
*/
@@ -87,7 +87,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper
/**
* 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
*/
@Override
@@ -100,7 +100,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper
/**
* 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
*/
@Override
@@ -203,7 +203,7 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper
/**
* 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
*/
@Override
diff --git a/java/javax/servlet/http/HttpSessionActivationListener.java b/java/javax/servlet/http/HttpSessionActivationListener.java
index 99a9f03..eace111 100644
--- a/java/javax/servlet/http/HttpSessionActivationListener.java
+++ b/java/javax/servlet/http/HttpSessionActivationListener.java
@@ -26,12 +26,12 @@ import java.util.EventListener;
**
* @since 2.3
*/
-
-public interface HttpSessionActivationListener extends EventListener {
+
+public interface HttpSessionActivationListener extends EventListener {
/** Notification that the session is about to be passivated.*/
- public void sessionWillPassivate(HttpSessionEvent se);
+ public void sessionWillPassivate(HttpSessionEvent se);
/** Notification that the session has just been activated.*/
public void sessionDidActivate(HttpSessionEvent se);
-}
+}
diff --git a/java/javax/servlet/http/HttpSessionAttributeListener.java b/java/javax/servlet/http/HttpSessionAttributeListener.java
index 05554a1..0c8f9ca 100644
--- a/java/javax/servlet/http/HttpSessionAttributeListener.java
+++ b/java/javax/servlet/http/HttpSessionAttributeListener.java
@@ -21,7 +21,7 @@ import java.util.EventListener;
/**
* This listener interface can be implemented in order to get notifications of
* changes to the attribute lists of sessions within this web application.
- *
+ *
* @since v 2.3
*/
public interface HttpSessionAttributeListener extends EventListener {
diff --git a/java/javax/servlet/http/HttpSessionBindingEvent.java b/java/javax/servlet/http/HttpSessionBindingEvent.java
index ff74487..1bc7814 100644
--- a/java/javax/servlet/http/HttpSessionBindingEvent.java
+++ b/java/javax/servlet/http/HttpSessionBindingEvent.java
@@ -27,7 +27,7 @@ package javax.servlet.http;
* The session binds the object by a call to
* <code>HttpSession.setAttribute</code> and unbinds the object by a call to
* <code>HttpSession.removeAttribute</code>.
- *
+ *
* @author Various
* @see HttpSession
* @see HttpSessionBindingListener
@@ -47,7 +47,7 @@ public class HttpSessionBindingEvent extends HttpSessionEvent {
* Constructs an event that notifies an object that it has been bound to or
* unbound from a session. To receive the event, the object must implement
* {@link HttpSessionBindingListener}.
- *
+ *
* @param session
* the session to which the object is bound or unbound
* @param name
@@ -65,7 +65,7 @@ public class HttpSessionBindingEvent extends HttpSessionEvent {
* Constructs an event that notifies an object that it has been bound to or
* unbound from a session. To receive the event, the object must implement
* {@link HttpSessionBindingListener}.
- *
+ *
* @param session
* the session to which the object is bound or unbound
* @param name
@@ -89,7 +89,7 @@ public class HttpSessionBindingEvent extends HttpSessionEvent {
/**
* Returns the name with which the attribute is bound to or unbound from the
* session.
- *
+ *
* @return a string specifying the name with which the object is bound to or
* unbound from the session
*/
@@ -103,7 +103,7 @@ public class HttpSessionBindingEvent extends HttpSessionEvent {
* attribute. If the attribute was removed (or unbound), this is the value
* of the removed attribute. If the attribute was replaced, this is the old
* value of the attribute.
- *
+ *
* @since 2.3
*/
public Object getValue() {
diff --git a/java/javax/servlet/http/HttpSessionBindingListener.java b/java/javax/servlet/http/HttpSessionBindingListener.java
index bbc075f..c63ba2b 100644
--- a/java/javax/servlet/http/HttpSessionBindingListener.java
+++ b/java/javax/servlet/http/HttpSessionBindingListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
* This may be as a result of a servlet programmer explicitly unbinding an
* attribute from a session, due to a session being invalidated, or due to a
* session timing out.
- *
+ *
* @author Various
* @see HttpSession
* @see HttpSessionBindingEvent
@@ -35,7 +35,7 @@ public interface HttpSessionBindingListener extends EventListener {
/**
* Notifies the object that it is being bound to a session and identifies
* the session.
- *
+ *
* @param event
* the event that identifies the session
* @see #valueUnbound
@@ -45,7 +45,7 @@ public interface HttpSessionBindingListener extends EventListener {
/**
* Notifies the object that it is being unbound from a session and
* identifies the session.
- *
+ *
* @param event
* the event that identifies the session
* @see #valueBound
diff --git a/java/javax/servlet/http/HttpSessionEvent.java b/java/javax/servlet/http/HttpSessionEvent.java
index 79a34c5..ef83877 100644
--- a/java/javax/servlet/http/HttpSessionEvent.java
+++ b/java/javax/servlet/http/HttpSessionEvent.java
@@ -19,7 +19,7 @@ package javax.servlet.http;
/**
* This is the class representing event notifications for changes to sessions
* within a web application.
- *
+ *
* @since v 2.3
*/
public class HttpSessionEvent extends java.util.EventObject {
diff --git a/java/javax/servlet/http/HttpSessionListener.java b/java/javax/servlet/http/HttpSessionListener.java
index f7f862c..a0f1009 100644
--- a/java/javax/servlet/http/HttpSessionListener.java
+++ b/java/javax/servlet/http/HttpSessionListener.java
@@ -23,7 +23,7 @@ import java.util.EventListener;
* active sessions in a web application. To receive notification events, the
* implementation class must be configured in the deployment descriptor for the
* web application.
- *
+ *
* @see HttpSessionEvent
* @since v 2.3
*/
@@ -31,7 +31,7 @@ public interface HttpSessionListener extends EventListener {
/**
* Notification that a session was created.
- *
+ *
* @param se
* the notification event
*/
@@ -39,7 +39,7 @@ public interface HttpSessionListener extends EventListener {
/**
* Notification that a session is about to be invalidated.
- *
+ *
* @param se
* the notification event
*/
diff --git a/java/javax/servlet/http/HttpUtils.java b/java/javax/servlet/http/HttpUtils.java
index e7e1b91..5467ccf 100644
--- a/java/javax/servlet/http/HttpUtils.java
+++ b/java/javax/servlet/http/HttpUtils.java
@@ -25,7 +25,7 @@ import java.util.StringTokenizer;
import javax.servlet.ServletInputStream;
/**
- * @deprecated As of Java(tm) Servlet API 2.3.
+ * @deprecated As of Java(tm) Servlet API 2.3.
* These methods were only useful
* with the default encoding and have been moved
* to the request interfaces.
@@ -37,8 +37,8 @@ public class HttpUtils {
"javax.servlet.http.LocalStrings";
private static ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
-
-
+
+
/**
* Constructs an empty <code>HttpUtils</code> object.
*
@@ -52,18 +52,18 @@ public class HttpUtils {
*
* Parses a query string passed from the client to the
* server and builds a <code>HashTable</code> object
- * with key-value pairs.
+ * with key-value pairs.
* The query string should be in the form of a string
* packaged by the GET or POST method, that is, it
* should have key-value pairs in the form <i>key=value</i>,
* with each pair separated from the next by a & character.
*
* <p>A key can appear more than once in the query string
- * with different values. However, the key appears only once in
+ * with different values. However, the key appears only once in
* the hashtable, with its value being
* an array of strings containing the multiple values sent
* by the query string.
- *
+ *
* <p>The keys and values in the hashtable are stored in their
* decoded form, so
* any + characters are converted to spaces, and characters
@@ -75,14 +75,14 @@ public class HttpUtils {
* @return a <code>HashTable</code> object built
* from the parsed key-value pairs
*
- * @exception IllegalArgumentException if the query string
+ * @exception IllegalArgumentException if the query string
* is invalid
*
*/
public static Hashtable<String,String[]> parseQueryString(String s) {
String valArray[] = null;
-
+
if (s == null) {
throw new IllegalArgumentException();
}
@@ -102,7 +102,7 @@ public class HttpUtils {
if (ht.containsKey(key)) {
String oldVals[] = ht.get(key);
valArray = new String[oldVals.length + 1];
- for (int i = 0; i < oldVals.length; i++)
+ for (int i = 0; i < oldVals.length; i++)
valArray[i] = oldVals[i];
valArray[oldVals.length] = val;
} else {
@@ -117,13 +117,13 @@ public class HttpUtils {
/**
*
- * Parses data from an HTML form that the client sends to
- * the server using the HTTP POST method and the
+ * Parses data from an HTML form that the client sends to
+ * the server using the HTTP POST method and the
* <i>application/x-www-form-urlencoded</i> MIME type.
*
* <p>The data sent by the POST method contains key-value
* pairs. A key can appear more than once in the POST data
- * with different values. However, the key appears only once in
+ * with different values. However, the key appears only once in
* the hashtable, with its value being
* an array of strings containing the multiple values sent
* by the POST method.
@@ -137,7 +137,7 @@ public class HttpUtils {
*
*
* @param len an integer specifying the length,
- * in characters, of the
+ * in characters, of the
* <code>ServletInputStream</code>
* object that is also passed to this
* method
@@ -145,7 +145,7 @@ public class HttpUtils {
* @param in the <code>ServletInputStream</code>
* object that contains the data sent
* from the client
- *
+ *
* @return a <code>HashTable</code> object built
* from the parsed key-value pairs
*
@@ -154,24 +154,24 @@ public class HttpUtils {
* sent by the POST method is invalid
*
*/
- public static Hashtable<String,String[]> parsePostData(int len,
+ public static Hashtable<String,String[]> parsePostData(int len,
ServletInputStream in) {
// XXX
// should a length of 0 be an IllegalArgumentException
-
+
// cheap hack to return an empty hash
- if (len <=0)
+ if (len <=0)
return new Hashtable<String,String[]>();
if (in == null) {
throw new IllegalArgumentException();
}
-
+
// Make sure we read the entire POSTed body.
byte[] postedBytes = new byte [len];
try {
int offset = 0;
-
+
do {
int inputLen = in.read (postedBytes, offset, len - offset);
if (inputLen <= 0) {
@@ -205,14 +205,14 @@ public class HttpUtils {
private static String parseName(String s, StringBuilder sb) {
sb.setLength(0);
for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
+ char c = s.charAt(i);
switch (c) {
case '+':
sb.append(' ');
break;
case '%':
try {
- sb.append((char) Integer.parseInt(s.substring(i+1, i+3),
+ sb.append((char) Integer.parseInt(s.substring(i+1, i+3),
16));
i += 2;
} catch (NumberFormatException e) {
@@ -225,7 +225,7 @@ public class HttpUtils {
if (rest.length()==2)
i++;
}
-
+
break;
default:
sb.append(c);
@@ -243,7 +243,7 @@ public class HttpUtils {
* The returned URL contains a protocol, server name, port
* number, and server path, but it does not include query
* string parameters.
- *
+ *
* <p>Because this method returns a <code>StringBuffer</code>,
* not a string, you can modify the URL easily, for example,
* to append query parameters.
@@ -253,7 +253,7 @@ public class HttpUtils {
*
* @param req a <code>HttpServletRequest</code> object
* containing the client's request
- *
+ *
* @return a <code>StringBuffer</code> object containing
* the reconstructed URL
*
@@ -263,7 +263,7 @@ public class HttpUtils {
String scheme = req.getScheme ();
int port = req.getServerPort ();
String urlPath = req.getRequestURI();
-
+
url.append (scheme); // http, https
url.append ("://");
url.append (req.getServerName ());
diff --git a/java/javax/servlet/http/Part.java b/java/javax/servlet/http/Part.java
index cbb51c8..390c31e 100644
--- a/java/javax/servlet/http/Part.java
+++ b/java/javax/servlet/http/Part.java
@@ -81,7 +81,7 @@ public interface Part {
* Behaviour of other containers may be different.
*/
public void delete() throws IOException;
-
+
/**
* Obtains the value of the specified part header as a String. If there are
* multiple headers with the same name, this method returns the first header
diff --git a/java/javax/servlet/jsp/ErrorData.java b/java/javax/servlet/jsp/ErrorData.java
index a517ad7..45615fc 100644
--- a/java/javax/servlet/jsp/ErrorData.java
+++ b/java/javax/servlet/jsp/ErrorData.java
@@ -21,7 +21,7 @@ package javax.servlet.jsp;
* contained in this instance is meaningless if not used in the context of an
* error page. To indicate a JSP is an error page, the page author must set the
* isErrorPage attribute of the page directive to "true".
- *
+ *
* @see PageContext#getErrorData
* @since 2.0
*/
@@ -34,7 +34,7 @@ public final class ErrorData {
/**
* Creates a new ErrorData object.
- *
+ *
* @param throwable
* The Throwable that is the cause of the error
* @param statusCode
@@ -54,7 +54,7 @@ public final class ErrorData {
/**
* Returns the Throwable that caused the error.
- *
+ *
* @return The Throwable that caused the error
*/
public Throwable getThrowable() {
@@ -63,7 +63,7 @@ public final class ErrorData {
/**
* Returns the status code of the error.
- *
+ *
* @return The status code of the error
*/
public int getStatusCode() {
@@ -72,7 +72,7 @@ public final class ErrorData {
/**
* Returns the request URI.
- *
+ *
* @return The request URI
*/
public String getRequestURI() {
@@ -81,7 +81,7 @@ public final class ErrorData {
/**
* Returns the name of the servlet invoked.
- *
+ *
* @return The name of the servlet invoked
*/
public String getServletName() {
diff --git a/java/javax/servlet/jsp/HttpJspPage.java b/java/javax/servlet/jsp/HttpJspPage.java
index 0351a09..1ee74d2 100644
--- a/java/javax/servlet/jsp/HttpJspPage.java
+++ b/java/javax/servlet/jsp/HttpJspPage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp;
import java.io.IOException;
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
* The behaviour is identical to that of the JspPage, except for the signature
* of the _jspService method, which is now expressible in the Java type
* system and included explicitly in the interface.
- *
+ *
* @see JspPage
*/
@@ -48,8 +48,8 @@ public interface HttpJspPage extends JspPage {
*
* @param request Provides client request information to the JSP.
* @param response Assists the JSP in sending a response to the client.
- * @throws ServletException Thrown if an error occurred during the
- * processing of the JSP and that the container should take
+ * @throws ServletException Thrown if an error occurred during the
+ * processing of the JSP and that the container should take
* appropriate action to clean up the request.
* @throws IOException Thrown if an error occurred while writing the
* response for this page.
diff --git a/java/javax/servlet/jsp/JspApplicationContext.java b/java/javax/servlet/jsp/JspApplicationContext.java
index f9bf25f..ff0154c 100644
--- a/java/javax/servlet/jsp/JspApplicationContext.java
+++ b/java/javax/servlet/jsp/JspApplicationContext.java
@@ -24,7 +24,7 @@ import javax.el.ExpressionFactory;
* <p>
* Stores <i>application</i>-scoped information for the JSP container.
* </p>
- *
+ *
* @since 2.1
*/
public interface JspApplicationContext {
@@ -36,7 +36,7 @@ public interface JspApplicationContext {
* At the very least, any <code>ELContext</code> instantiated will have
* reference to the <code>JspContext</code> under
* <code>JspContext.class</code>.
- *
+ *
* @param listener The listener to add
*/
public void addELContextListener(ELContextListener listener);
@@ -58,7 +58,7 @@ public interface JspApplicationContext {
* <li><code>BeanELResolver</code></li>
* <li><code>ScopedAttributeELResolver</code></li>
* </ul>
- *
+ *
* @param resolver
* an additional resolver
* @throws IllegalStateException
@@ -72,7 +72,7 @@ public interface JspApplicationContext {
* Returns the JSP container's <code>ExpressionFactory</code> implementation
* for EL use.
* </p>
- *
+ *
* @return an <code>ExpressionFactory</code> implementation
*/
public ExpressionFactory getExpressionFactory();
diff --git a/java/javax/servlet/jsp/JspContext.java b/java/javax/servlet/jsp/JspContext.java
index e416405..0b8221b 100644
--- a/java/javax/servlet/jsp/JspContext.java
+++ b/java/javax/servlet/jsp/JspContext.java
@@ -13,7 +13,7 @@
* 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.jsp;
import java.util.Enumeration;
@@ -22,23 +22,23 @@ import javax.el.ELContext;
/**
* <p>
- * <code>JspContext</code> serves as the base class for the
+ * <code>JspContext</code> serves as the base class for the
* PageContext class and abstracts all information that is not specific
* to servlets. This allows for Simple Tag Extensions to be used
* outside of the context of a request/response Servlet.
* <p>
- * The JspContext provides a number of facilities to the
+ * The JspContext provides a number of facilities to the
* page/component author and page implementor, including:
* <ul>
* <li>a single API to manage the various scoped namespaces
* <li>a mechanism to obtain the JspWriter for output
- * <li>a mechanism to expose page directive attributes to the
+ * <li>a mechanism to expose page directive attributes to the
* scripting environment
* </ul>
*
* <p><B>Methods Intended for Container Generated Code</B>
* <p>
- * The following methods enable the <B>management of nested</B> JspWriter
+ * The following methods enable the <B>management of nested</B> JspWriter
* streams to implement Tag Extensions: <code>pushBody()</code> and
* <code>popBody()</code>
*
@@ -52,15 +52,15 @@ import javax.el.ELContext;
* The methods are:
* <code>setAttribute()</code>, <code>getAttribute()</code>,
* <code>findAttribute()</code>, <code>removeAttribute()</code>,
- * <code>getAttributesScope()</code> and
+ * <code>getAttributesScope()</code> and
* <code>getAttributeNamesInScope()</code>.
- *
+ *
* <p>
* The following methods provide <B>convenient access</B> to implicit objects:
* <code>getOut()</code>
*
* <p>
- * The following methods provide <B>programmatic access</b> to the
+ * The following methods provide <B>programmatic access</b> to the
* Expression Language evaluator:
* <code>getExpressionEvaluator()</code>, <code>getVariableResolver()</code>
*
@@ -70,17 +70,17 @@ import javax.el.ELContext;
public abstract class JspContext {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public JspContext() {
// NOOP by default
}
-
- /**
+
+ /**
* Register the name and value specified with page scope semantics.
- * If the value passed in is <code>null</code>, this has the same
- * effect as calling
+ * If the value passed in is <code>null</code>, this has the same
+ * effect as calling
* <code>removeAttribute( name, PageContext.PAGE_SCOPE )</code>.
*
* @param name the name of the attribute to set
@@ -92,19 +92,19 @@ public abstract class JspContext {
public abstract void setAttribute(String name, Object value);
/**
- * Register the name and value specified with appropriate
- * scope semantics. If the value passed in is <code>null</code>,
+ * Register the name and value specified with appropriate
+ * scope semantics. If the value passed in is <code>null</code>,
* this has the same effect as calling
* <code>removeAttribute( name, scope )</code>.
- *
+ *
* @param name the name of the attribute to set
* @param value the object to associate with the name, or null if
* the attribute is to be removed from the specified scope.
* @param scope the scope with which to associate the name/object
- *
+ *
* @throws NullPointerException if the name is null
* @throws IllegalArgumentException if the scope is invalid
- * @throws IllegalStateException if the scope is
+ * @throws IllegalStateException if the scope is
* PageContext.SESSION_SCOPE but the page that was requested
* does not participate in a session or the session has been
* invalidated.
@@ -117,9 +117,9 @@ public abstract class JspContext {
* if not found.
*
* @param name the name of the attribute to get
- * @return the object associated with the name in the page scope
+ * @return the object associated with the name in the page scope
* or null if not found.
- *
+ *
* @throws NullPointerException if the name is null
*/
@@ -133,10 +133,10 @@ public abstract class JspContext {
* @param scope the scope with which to associate the name/object
* @return the object associated with the name in the specified
* scope or null if not found.
- *
+ *
* @throws NullPointerException if the name is null
- * @throws IllegalArgumentException if the scope is invalid
- * @throws IllegalStateException if the scope is
+ * @throws IllegalArgumentException if the scope is invalid
+ * @throws IllegalStateException if the scope is
* PageContext.SESSION_SCOPE but the page that was requested
* does not participate in a session or the session has been
* invalidated.
@@ -173,7 +173,7 @@ public abstract class JspContext {
* @param name The name of the object to remove.
* @param scope The scope where to look.
* @throws IllegalArgumentException if the scope is invalid
- * @throws IllegalStateException if the scope is
+ * @throws IllegalStateException if the scope is
* PageContext.SESSION_SCOPE but the page that was requested
* does not participate in a session or the session has been
* invalidated.
@@ -196,10 +196,10 @@ public abstract class JspContext {
* Enumerate all the attributes in a given scope.
*
* @param scope the scope to enumerate all the attributes for
- * @return an enumeration of names (java.lang.String) of all the
+ * @return an enumeration of names (java.lang.String) of all the
* attributes the specified scope
* @throws IllegalArgumentException if the scope is invalid
- * @throws IllegalStateException if the scope is
+ * @throws IllegalStateException if the scope is
* PageContext.SESSION_SCOPE but the page that was requested
* does not participate in a session or the session has been
* invalidated.
@@ -213,10 +213,10 @@ public abstract class JspContext {
* @return the current JspWriter stream being used for client response
*/
public abstract JspWriter getOut();
-
+
/**
* Provides programmatic access to the ExpressionEvaluator.
- * The JSP Container must return a valid instance of an
+ * The JSP Container must return a valid instance of an
* ExpressionEvaluator that can parse EL expressions.
*
* @return A valid instance of an ExpressionEvaluator.
@@ -226,10 +226,10 @@ public abstract class JspContext {
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public abstract javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator();
-
-
+
+
public abstract ELContext getELContext();
-
+
/**
* Returns an instance of a VariableResolver that provides access to the
* implicit objects specified in the JSP specification using this JspContext
@@ -244,7 +244,7 @@ public abstract class JspContext {
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public abstract javax.servlet.jsp.el.VariableResolver getVariableResolver();
-
+
/**
* Return a new JspWriter object that sends output to the
* provided Writer. Saves the current "out" JspWriter,
@@ -268,7 +268,7 @@ public abstract class JspContext {
public JspWriter pushBody( java.io.Writer writer ) {
return null; // XXX to implement
}
-
+
/**
* Return the previous JspWriter "out" saved by the matching
* pushBody(), and update the value of the "out" attribute in
diff --git a/java/javax/servlet/jsp/JspEngineInfo.java b/java/javax/servlet/jsp/JspEngineInfo.java
index b07a0a3..e369b48 100644
--- a/java/javax/servlet/jsp/JspEngineInfo.java
+++ b/java/javax/servlet/jsp/JspEngineInfo.java
@@ -13,7 +13,7 @@
* 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.jsp;
/**
@@ -24,13 +24,13 @@ package javax.servlet.jsp;
public abstract class JspEngineInfo {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public JspEngineInfo() {
// NOOP by default
}
-
+
/**
* Return the version number of the JSP specification that is supported by
* this JSP engine.
diff --git a/java/javax/servlet/jsp/JspException.java b/java/javax/servlet/jsp/JspException.java
index 00d4b0e..67671f5 100644
--- a/java/javax/servlet/jsp/JspException.java
+++ b/java/javax/servlet/jsp/JspException.java
@@ -36,8 +36,8 @@ public class JspException extends Exception {
/**
* Constructs a new JSP exception with the
- * specified message. The message can be written
- * to the server log and/or displayed for the user.
+ * specified message. The message can be written
+ * to the server log and/or displayed for the user.
*
* @param msg a <code>String</code> specifying the text of the exception
* message
@@ -52,7 +52,7 @@ public class JspException extends Exception {
* message and cause. The cause is saved for later retrieval by the
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
- *
+ *
* @see java.lang.Exception#Exception(String, Throwable)
*
* @param message a <code>String</code> containing the text of the
@@ -62,7 +62,7 @@ public class JspException extends Exception {
* interfered with the JSP's normal operation,
* making this JSP exception necessary
*/
-
+
public JspException(String message, Throwable cause) {
super(message, cause);
}
@@ -73,7 +73,7 @@ public class JspException extends Exception {
* The cause is saved for later retrieval by the
* <code>java.lang.Throwable.getCause()</code> and {@link #getRootCause()}
* methods.
- *
+ *
* @see java.lang.Exception#Exception(Throwable)
*
* @param cause the <code>Throwable</code> exception that
@@ -85,12 +85,12 @@ public class JspException extends Exception {
super(cause);
}
-
+
/**
* Returns the exception that caused this JSP exception.
*
* @return the <code>Throwable</code> that caused this JSP exception
- *
+ *
* @deprecated As of JSP 2.1, replaced by
* <code>java.lang.Throwable.getCause()</code>
*/
diff --git a/java/javax/servlet/jsp/JspFactory.java b/java/javax/servlet/jsp/JspFactory.java
index 75cbc2a..6ebf094 100644
--- a/java/javax/servlet/jsp/JspFactory.java
+++ b/java/javax/servlet/jsp/JspFactory.java
@@ -25,11 +25,11 @@ import javax.servlet.ServletResponse;
* <p>
* The JspFactory is an abstract class that defines a number of factory
* methods available to a JSP page at runtime for the purposes of creating
- * instances of various interfaces and classes used to support the JSP
+ * instances of various interfaces and classes used to support the JSP
* implementation.
* <p>
* A conformant JSP Engine implementation will, during it's initialization
- * instantiate an implementation dependent subclass of this class, and make
+ * instantiate an implementation dependent subclass of this class, and make
* it globally available for use by JSP implementation classes by registering
* the instance created with this class via the
* static <code> setDefaultFactory() </code> method.
@@ -43,9 +43,9 @@ import javax.servlet.ServletResponse;
public abstract class JspFactory {
private static volatile JspFactory deflt = null;
-
+
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public JspFactory() {
@@ -77,14 +77,14 @@ public abstract class JspFactory {
/**
* <p>
- * obtains an instance of an implementation dependent
+ * obtains an instance of an implementation dependent
* javax.servlet.jsp.PageContext abstract class for the calling Servlet
* and currently pending request and response.
* </p>
*
* <p>
- * This method is typically called early in the processing of the
- * _jspService() method of a JSP implementation class in order to
+ * This method is typically called early in the processing of the
+ * _jspService() method of a JSP implementation class in order to
* obtain a PageContext object for the request being processed.
* </p>
* <p>
@@ -138,16 +138,16 @@ public abstract class JspFactory {
*
* @return a JspEngineInfo object describing the current JSP engine
*/
-
+
public abstract JspEngineInfo getEngineInfo();
-
+
/**
* <p>
* Obtain the <code>JspApplicationContext</code> instance that was
* associated within the passed <code>ServletContext</code> for this web
* application.
* </p>
- *
+ *
* @param context the current web application's <code>ServletContext</code>
* @return <code>JspApplicationContext</code> instance
* @since 2.1
diff --git a/java/javax/servlet/jsp/JspPage.java b/java/javax/servlet/jsp/JspPage.java
index bcc9a92..ddeb9a9 100644
--- a/java/javax/servlet/jsp/JspPage.java
+++ b/java/javax/servlet/jsp/JspPage.java
@@ -13,7 +13,7 @@
* 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.jsp;
import javax.servlet.Servlet;
@@ -79,7 +79,7 @@ public interface JspPage extends Servlet {
/**
* The jspDestroy() method is invoked when the JSP page is about to be
* destroyed.
- *
+ *
* A JSP page can override this method by including a definition for it
* in a declaration element.
*
diff --git a/java/javax/servlet/jsp/JspTagException.java b/java/javax/servlet/jsp/JspTagException.java
index 64d8697..ce554b6 100644
--- a/java/javax/servlet/jsp/JspTagException.java
+++ b/java/javax/servlet/jsp/JspTagException.java
@@ -28,7 +28,7 @@ public class JspTagException extends JspException {
/**
* Constructs a new JspTagException with the specified message. The message
* can be written to the server log and/or displayed for the user.
- *
+ *
* @param msg
* a <code>String</code> specifying the text of the exception
* message
@@ -48,7 +48,7 @@ public class JspTagException extends JspException {
* Constructs a new JspTagException when the JSP Tag needs to throw an
* exception and include a message about the "root cause" exception that
* interfered with its normal operation, including a description message.
- *
+ *
* @param message
* a <code>String</code> containing the text of the exception
* message
@@ -72,7 +72,7 @@ public class JspTagException extends JspException {
* <code>Throwable</code> exception to get a localized exception message.
* When subclassing <code>JspTagException</code>, this method can be
* overridden to create an exception message designed for a specific locale.
- *
+ *
* @param rootCause
* the <code>Throwable</code> exception that interfered with the
* JSP Tag's normal operation, making the JSP Tag exception
diff --git a/java/javax/servlet/jsp/JspWriter.java b/java/javax/servlet/jsp/JspWriter.java
index 4348c43..691f354 100644
--- a/java/javax/servlet/jsp/JspWriter.java
+++ b/java/javax/servlet/jsp/JspWriter.java
@@ -72,7 +72,7 @@ import java.io.IOException;
* without a flush. If autoflush="false" then all the I/O operations on this
* class shall throw an IOException if performing the current operation would
* result in a buffer overflow condition.
- *
+ *
* @see java.io.Writer
* @see java.io.BufferedWriter
* @see java.io.PrintWriter
@@ -98,7 +98,7 @@ public abstract class JspWriter extends java.io.Writer {
/**
* Protected constructor.
- *
+ *
* @param bufferSize
* the size of the buffer to be used by the JspWriter
* @param autoFlush
@@ -113,7 +113,7 @@ public abstract class JspWriter extends java.io.Writer {
* Write a line separator. The line separator string is defined by the
* system property <tt>line.separator</tt>, and is not necessarily a single
* newline ('\n') character.
- *
+ *
* @exception IOException
* If an I/O error occurs
*/
@@ -124,7 +124,7 @@ public abstract class JspWriter extends java.io.Writer {
* java.lang.String#valueOf(boolean)}</code>
* is written to the JspWriter's buffer or, if no buffer is used, directly
* to the underlying writer.
- *
+ *
* @param b
* The <code>boolean</code> to be printed
* @throws java.io.IOException
@@ -135,7 +135,7 @@ public abstract class JspWriter extends java.io.Writer {
/**
* Print a character. The character is written to the JspWriter's buffer or,
* if no buffer is used, directly to the underlying writer.
- *
+ *
* @param c
* The <code>char</code> to be printed
* @throws java.io.IOException
@@ -148,7 +148,7 @@ public abstract class JspWriter extends java.io.Writer {
* java.lang.String#valueOf(int)}</code>
* is written to the JspWriter's buffer or, if no buffer is used, directly
* to the underlying writer.
- *
+ *
* @param i
* The <code>int</code> to be printed
* @see java.lang.Integer#toString(int)
@@ -162,7 +162,7 @@ public abstract class JspWriter extends java.io.Writer {
* java.lang.String#valueOf(long)}</code>
* is written to the JspWriter's buffer or, if no buffer is used, directly
* to the underlying writer.
- *
+ *
* @param l
* The <code>long</code> to be printed
* @see java.lang.Long#toString(long)
@@ -176,7 +176,7 @@ public abstract class JspWriter extends java.io.Writer {
* java.lang.String#valueOf(float)}</code>
* is written to the JspWriter's buffer or, if no buffer is used, directly
* to the underlying writer.
- *
+ *
* @param f
* The <code>float</code> to be printed
* @see java.lang.Float#toString(float)
@@ -190,7 +190,7 @@ public abstract class JspWriter extends java.io.Writer {
* <code>{@link java.lang.String#valueOf(double)}</code> is written to the
* JspWriter's buffer or, if no buffer is used, directly to the underlying
* writer.
- *
+ *
* @param d
* The <code>double</code> to be printed
* @see java.lang.Double#toString(double)
@@ -203,7 +203,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print an array of characters. The characters are written to the
* JspWriter's buffer or, if no buffer is used, directly to the underlying
* writer.
- *
+ *
* @param s
* The array of chars to be printed
* @throws NullPointerException
@@ -218,7 +218,7 @@ public abstract class JspWriter extends java.io.Writer {
* <code>"null"</code> is printed. Otherwise, the string's characters are
* written to the JspWriter's buffer or, if no buffer is used, directly to
* the underlying writer.
- *
+ *
* @param s
* The <code>String</code> to be printed
* @throws java.io.IOException
@@ -231,7 +231,7 @@ public abstract class JspWriter extends java.io.Writer {
* java.lang.String#valueOf(Object)}</code>
* method is written to the JspWriter's buffer or, if no buffer is used,
* directly to the underlying writer.
- *
+ *
* @param obj
* The <code>Object</code> to be printed
* @see java.lang.Object#toString()
@@ -245,7 +245,7 @@ public abstract class JspWriter extends java.io.Writer {
* separator string is defined by the system property
* <code>line.separator</code>, and is not necessarily a single newline
* character (<code>'\n'</code>).
- *
+ *
* @throws java.io.IOException
* If an error occurred while writing
*/
@@ -255,7 +255,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print a boolean value and then terminate the line. This method behaves as
* though it invokes <code>{@link #print(boolean)}</code> and then
* <code>{@link #println()}</code>.
- *
+ *
* @param x
* the boolean to write
* @throws java.io.IOException
@@ -268,7 +268,7 @@ public abstract class JspWriter extends java.io.Writer {
* though it invokes <code>{@link #print(char)}</code> and then <code>{@link
* #println()}</code>
* .
- *
+ *
* @param x
* the char to write
* @throws java.io.IOException
@@ -281,7 +281,7 @@ public abstract class JspWriter extends java.io.Writer {
* though it invokes <code>{@link #print(int)}</code> and then <code>{@link
* #println()}</code>
* .
- *
+ *
* @param x
* the int to write
* @throws java.io.IOException
@@ -293,7 +293,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print a long integer and then terminate the line. This method behaves as
* though it invokes <code>{@link #print(long)}</code> and then
* <code>{@link #println()}</code>.
- *
+ *
* @param x
* the long to write
* @throws java.io.IOException
@@ -305,7 +305,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print a floating-point number and then terminate the line. This method
* behaves as though it invokes <code>{@link #print(float)}</code> and then
* <code>{@link #println()}</code>.
- *
+ *
* @param x
* the float to write
* @throws java.io.IOException
@@ -318,7 +318,7 @@ public abstract class JspWriter extends java.io.Writer {
* line. This method behaves as though it invokes <code>{@link
* #print(double)}</code> and
* then <code>{@link #println()}</code>.
- *
+ *
* @param x
* the double to write
* @throws java.io.IOException
@@ -330,7 +330,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print an array of characters and then terminate the line. This method
* behaves as though it invokes <code>print(char[])</code> and then
* <code>println()</code>.
- *
+ *
* @param x
* the char[] to write
* @throws java.io.IOException
@@ -342,7 +342,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print a String and then terminate the line. This method behaves as though
* it invokes <code>{@link #print(String)}</code> and then
* <code>{@link #println()}</code>.
- *
+ *
* @param x
* the String to write
* @throws java.io.IOException
@@ -354,7 +354,7 @@ public abstract class JspWriter extends java.io.Writer {
* Print an Object and then terminate the line. This method behaves as
* though it invokes <code>{@link #print(Object)}</code> and then
* <code>{@link #println()}</code>.
- *
+ *
* @param x
* the Object to write
* @throws java.io.IOException
@@ -367,7 +367,7 @@ public abstract class JspWriter extends java.io.Writer {
* flushed then the clear operation shall throw an IOException to signal the
* fact that some data has already been irrevocably written to the client
* response stream.
- *
+ *
* @throws IOException
* If an I/O error occurs
*/
@@ -377,7 +377,7 @@ public abstract class JspWriter extends java.io.Writer {
* Clears the current contents of the buffer. Unlike clear(), this method
* will not throw an IOException if the buffer has already been flushed. It
* merely clears the current content of the buffer and returns.
- *
+ *
* @throws IOException
* If an I/O error occurs
*/
@@ -394,7 +394,7 @@ public abstract class JspWriter extends java.io.Writer {
* <p>
* Once a stream has been closed, further write() or flush() invocations
* will cause an IOException to be thrown.
- *
+ *
* @exception IOException
* If an I/O error occurs
*/
@@ -409,7 +409,7 @@ public abstract class JspWriter extends java.io.Writer {
* to close().
* <p>
* Closing a previously-closed stream, unlike flush(), has no effect.
- *
+ *
* @exception IOException
* If an I/O error occurs
*/
@@ -418,7 +418,7 @@ public abstract class JspWriter extends java.io.Writer {
/**
* This method returns the size of the buffer used by the JspWriter.
- *
+ *
* @return the size of the buffer in bytes, or 0 is unbuffered.
*/
public int getBufferSize() {
@@ -427,14 +427,14 @@ public abstract class JspWriter extends java.io.Writer {
/**
* This method returns the number of unused bytes in the buffer.
- *
+ *
* @return the number of bytes unused in the buffer
*/
public abstract int getRemaining();
/**
* This method indicates whether the JspWriter is autoFlushing.
- *
+ *
* @return if this JspWriter is auto flushing or throwing IOExceptions on
* buffer overflow conditions
*/
diff --git a/java/javax/servlet/jsp/PageContext.java b/java/javax/servlet/jsp/PageContext.java
index b320a02..598b4f0 100644
--- a/java/javax/servlet/jsp/PageContext.java
+++ b/java/javax/servlet/jsp/PageContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp;
import java.io.IOException;
@@ -41,7 +41,7 @@ import javax.servlet.jsp.tagext.BodyContent;
*
* <p> The <code> PageContext </code> class is an abstract class, designed to be
* extended to provide implementation dependent implementations thereof, by
- * conformant JSP engine runtime environments. A PageContext instance is
+ * conformant JSP engine runtime environments. A PageContext instance is
* obtained by a JSP implementation class by calling the
* JspFactory.getPageContext() method, and is released by calling
* JspFactory.releasePageContext().
@@ -50,29 +50,29 @@ import javax.servlet.jsp.tagext.BodyContent;
* used within a JSP Page Implementation object is given elsewhere.
*
* <p>
- * The PageContext provides a number of facilities to the page/component
+ * The PageContext provides a number of facilities to the page/component
* author and page implementor, including:
* <ul>
* <li>a single API to manage the various scoped namespaces
* <li>a number of convenience API's to access various public objects
* <li>a mechanism to obtain the JspWriter for output
* <li>a mechanism to manage session usage by the page
- * <li>a mechanism to expose page directive attributes to the scripting
+ * <li>a mechanism to expose page directive attributes to the scripting
* environment
- * <li>mechanisms to forward or include the current request to other active
+ * <li>mechanisms to forward or include the current request to other active
* components in the application
* <li>a mechanism to handle errorpage exception processing
* </ul>
*
* <p><B>Methods Intended for Container Generated Code</B>
* <p>Some methods are intended to be used by the code generated by the
- * container, not by code written by JSP page authors, or JSP tag library
+ * container, not by code written by JSP page authors, or JSP tag library
* authors.
* <p>The methods supporting <B>lifecycle</B> are <code>initialize()</code>
* and <code>release()</code>
*
* <p>
- * The following methods enable the <B>management of nested</B> JspWriter
+ * The following methods enable the <B>management of nested</B> JspWriter
* streams to implement Tag Extensions: <code>pushBody()</code>
*
* <p><B>Methods Intended for JSP authors</B>
@@ -90,18 +90,18 @@ import javax.servlet.jsp.tagext.BodyContent;
* and <code>handlePageException()</code>.
*/
-public abstract class PageContext
+public abstract class PageContext
extends JspContext
{
-
+
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public PageContext() {
// NOOP by default
}
-
+
/**
* Page scope: (this is the default) the named reference remains available
* in this PageContext until the return from the current Servlet.service()
@@ -111,8 +111,8 @@ public abstract class PageContext
public static final int PAGE_SCOPE = 1;
/**
- * Request scope: the named reference remains available from the
- * ServletRequest associated with the Servlet until the current request
+ * Request scope: the named reference remains available from the
+ * ServletRequest associated with the Servlet until the current request
* is completed.
*/
@@ -127,7 +127,7 @@ public abstract class PageContext
public static final int SESSION_SCOPE = 3;
/**
- * Application scope: named reference remains available in the
+ * Application scope: named reference remains available in the
* ServletContext until it is reclaimed.
*/
@@ -181,7 +181,7 @@ public abstract class PageContext
public static final String APPLICATION = "javax.servlet.jsp.jspApplication";
/**
- * Name used to store uncaught exception in ServletRequest attribute
+ * Name used to store uncaught exception in ServletRequest attribute
* list and PageContext name table.
*/
@@ -207,13 +207,13 @@ public abstract class PageContext
* @param servlet The Servlet that is associated with this PageContext
* @param request The currently pending request for this Servlet
* @param response The currently pending response for this Servlet
- * @param errorPageURL The value of the errorpage attribute from the page
+ * @param errorPageURL The value of the errorpage attribute from the page
* directive or null
- * @param needsSession The value of the session attribute from the
+ * @param needsSession The value of the session attribute from the
* page directive
- * @param bufferSize The value of the buffer attribute from the page
+ * @param bufferSize The value of the buffer attribute from the page
* directive
- * @param autoFlush The value of the autoflush attribute from the page
+ * @param autoFlush The value of the autoflush attribute from the page
* directive
*
* @throws IOException during creation of JspWriter
@@ -221,10 +221,10 @@ public abstract class PageContext
* @throws IllegalArgumentException If one of the given parameters
* is invalid
*/
-
- public abstract void initialize(Servlet servlet, ServletRequest request,
- ServletResponse response, String errorPageURL, boolean needsSession,
- int bufferSize, boolean autoFlush)
+
+ public abstract void initialize(Servlet servlet, ServletRequest request,
+ ServletResponse response, String errorPageURL, boolean needsSession,
+ int bufferSize, boolean autoFlush)
throws IOException, IllegalStateException, IllegalArgumentException;
/**
@@ -253,10 +253,10 @@ public abstract class PageContext
public abstract HttpSession getSession();
/**
- * The current value of the page object (In a Servlet environment,
+ * The current value of the page object (In a Servlet environment,
* this is an instance of javax.servlet.Servlet).
*
- * @return the Page implementation class instance associated
+ * @return the Page implementation class instance associated
* with this PageContext
*/
@@ -297,7 +297,7 @@ public abstract class PageContext
/**
* The ServletContext instance.
- *
+ *
* @return the ServletContext for this PageContext
*/
@@ -305,14 +305,14 @@ public abstract class PageContext
/**
* <p>
- * This method is used to re-direct, or "forward" the current
- * ServletRequest and ServletResponse to another active component in
+ * This method is used to re-direct, or "forward" the current
+ * ServletRequest and ServletResponse to another active component in
* the application.
* </p>
* <p>
* If the <I> relativeUrlPath </I> begins with a "/" then the URL specified
* is calculated relative to the DOCROOT of the <code> ServletContext </code>
- * for this JSP. If the path does not begin with a "/" then the URL
+ * for this JSP. If the path does not begin with a "/" then the URL
* specified is calculated relative to the URL of the request that was
* mapped to the calling JSP.
* </p>
@@ -324,21 +324,21 @@ public abstract class PageContext
* Once this method has been called successfully, it is illegal for the
* calling <code> Thread </code> to attempt to modify the <code>
* ServletResponse </code> object. Any such attempt to do so, shall result
- * in undefined behavior. Typically, callers immediately return from
+ * in undefined behavior. Typically, callers immediately return from
* <code> _jspService(...) </code> after calling this method.
* </p>
*
- * @param relativeUrlPath specifies the relative URL path to the target
+ * @param relativeUrlPath specifies the relative URL path to the target
* resource as described above
*
- * @throws IllegalStateException if <code> ServletResponse </code> is not
+ * @throws IllegalStateException if <code> ServletResponse </code> is not
* in a state where a forward can be performed
* @throws ServletException if the page that was forwarded to throws
* a ServletException
* @throws IOException if an I/O error occurred while forwarding
*/
- public abstract void forward(String relativeUrlPath)
+ public abstract void forward(String relativeUrlPath)
throws ServletException, IOException;
/**
@@ -355,7 +355,7 @@ public abstract class PageContext
* <p>
* If the <I> relativeUrlPath </I> begins with a "/" then the URL specified
* is calculated relative to the DOCROOT of the <code>ServletContext</code>
- * for this JSP. If the path does not begin with a "/" then the URL
+ * for this JSP. If the path does not begin with a "/" then the URL
* specified is calculated relative to the URL of the request that was
* mapped to the calling JSP.
* </p>
@@ -364,14 +364,14 @@ public abstract class PageContext
* executing within a <code> _jspService(...) </code> method of a JSP.
* </p>
*
- * @param relativeUrlPath specifies the relative URL path to the target
+ * @param relativeUrlPath specifies the relative URL path to the target
* resource to be included
*
* @throws ServletException if the page that was forwarded to throws
* a ServletException
* @throws IOException if an I/O error occurred while forwarding
*/
- public abstract void include(String relativeUrlPath)
+ public abstract void include(String relativeUrlPath)
throws ServletException, IOException;
/**
@@ -382,14 +382,14 @@ public abstract class PageContext
* directly to the current JspWriter returned by a call to getOut().
* </p>
* <p>
- * If flush is true, The current JspWriter "out" for this JSP
- * is flushed as a side-effect of this call, prior to processing
+ * If flush is true, The current JspWriter "out" for this JSP
+ * is flushed as a side-effect of this call, prior to processing
* the include. Otherwise, the JspWriter "out" is not flushed.
* </p>
* <p>
* If the <i>relativeUrlPath</i> begins with a "/" then the URL specified
* is calculated relative to the DOCROOT of the <code>ServletContext</code>
- * for this JSP. If the path does not begin with a "/" then the URL
+ * for this JSP. If the path does not begin with a "/" then the URL
* specified is calculated relative to the URL of the request that was
* mapped to the calling JSP.
* </p>
@@ -398,7 +398,7 @@ public abstract class PageContext
* executing within a <code> _jspService(...) </code> method of a JSP.
* </p>
*
- * @param relativeUrlPath specifies the relative URL path to the
+ * @param relativeUrlPath specifies the relative URL path to the
* target resource to be included
* @param flush True if the JspWriter is to be flushed before the include,
* or false if not.
@@ -408,7 +408,7 @@ public abstract class PageContext
* @throws IOException if an I/O error occurred while forwarding
* @since 2.0
*/
- public abstract void include(String relativeUrlPath, boolean flush)
+ public abstract void include(String relativeUrlPath, boolean flush)
throws ServletException, IOException;
/**
@@ -428,7 +428,7 @@ public abstract class PageContext
* <p>
* A JSP implementation class shall typically clean up any local state
* prior to invoking this and will return immediately thereafter. It is
- * illegal to generate any output to the client, or to modify any
+ * illegal to generate any output to the client, or to modify any
* ServletResponse state after invoking this call.
*
* <p>
@@ -445,7 +445,7 @@ public abstract class PageContext
* @see #handlePageException(Throwable)
*/
- public abstract void handlePageException(Exception e)
+ public abstract void handlePageException(Exception e)
throws ServletException, IOException;
/**
@@ -471,7 +471,7 @@ public abstract class PageContext
* <p>
* A JSP implementation class shall typically clean up any local state
* prior to invoking this and will return immediately thereafter. It is
- * illegal to generate any output to the client, or to modify any
+ * illegal to generate any output to the client, or to modify any
* ServletResponse state after invoking this call.
*
* @param t the throwable to be handled
@@ -484,7 +484,7 @@ public abstract class PageContext
* @see #handlePageException(Exception)
*/
- public abstract void handlePageException(Throwable t)
+ public abstract void handlePageException(Throwable t)
throws ServletException, IOException;
/**
@@ -498,13 +498,13 @@ public abstract class PageContext
public BodyContent pushBody() {
return null; // XXX to implement
}
-
+
/**
* Provides convenient access to error information.
*
- * @return an ErrorData instance containing information about the
- * error, as obtained from the request attributes, as per the
+ * @return an ErrorData instance containing information about the
+ * error, as obtained from the request attributes, as per the
* Servlet specification. If this is not an error page (that is,
* if the isErrorPage attribute of the page directive is not set
* to "true"), the information is meaningless.
@@ -513,15 +513,15 @@ public abstract class PageContext
*/
public ErrorData getErrorData() {
int status = 0;
-
- Integer status_code = (Integer)getRequest().getAttribute(
+
+ Integer status_code = (Integer)getRequest().getAttribute(
RequestDispatcher.ERROR_STATUS_CODE);
// Avoid NPE if attribute is not set
if (status_code != null) {
status = status_code.intValue();
}
- return new ErrorData(
+ return new ErrorData(
(Throwable)getRequest().getAttribute(
RequestDispatcher.ERROR_EXCEPTION),
status,
@@ -531,5 +531,5 @@ public abstract class PageContext
RequestDispatcher.ERROR_SERVLET_NAME)
);
}
-
+
}
diff --git a/java/javax/servlet/jsp/SkipPageException.java b/java/javax/servlet/jsp/SkipPageException.java
index ba0e15a..2098c9b 100644
--- a/java/javax/servlet/jsp/SkipPageException.java
+++ b/java/javax/servlet/jsp/SkipPageException.java
@@ -26,7 +26,7 @@ package javax.servlet.jsp;
* should not be thrown manually in a JSP page or tag file - the behavior is
* undefined. The exception is intended to be thrown inside SimpleTag handlers
* and in JSP fragments.
- *
+ *
* @see javax.servlet.jsp.tagext.SimpleTag#doTag
* @see javax.servlet.jsp.tagext.JspFragment#invoke
* @see javax.servlet.jsp.tagext.Tag#doEndTag
@@ -45,7 +45,7 @@ public class SkipPageException extends JspException {
/**
* Creates a SkipPageException with the provided message.
- *
+ *
* @param message
* the detail message
*/
@@ -55,7 +55,7 @@ public class SkipPageException extends JspException {
/**
* Creates a SkipPageException with the provided message and root cause.
- *
+ *
* @param message
* the detail message
* @param rootCause
@@ -67,7 +67,7 @@ public class SkipPageException extends JspException {
/**
* Creates a SkipPageException with the provided root cause.
- *
+ *
* @param rootCause
* the originating cause of this exception
*/
diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java
index cf3bd19..132cc7d 100644
--- a/java/javax/servlet/jsp/el/ELException.java
+++ b/java/javax/servlet/jsp/el/ELException.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.el;
/**
* Represents any of the exception conditions that arise during the operation
* evaluation of the evaluator.
- *
+ *
* @since 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ELException
*/
@@ -38,7 +38,7 @@ public class ELException extends Exception {
/**
* Creates an ELException with the provided detail message.
- *
+ *
* @param pMessage
* the detail message
**/
@@ -48,7 +48,7 @@ public class ELException extends Exception {
/**
* Creates an ELException with the given root cause.
- *
+ *
* @param pRootCause
* the originating cause of this exception
**/
@@ -59,7 +59,7 @@ public class ELException extends Exception {
// -------------------------------------
/**
* Creates an ELException with the given detail message and root cause.
- *
+ *
* @param pMessage
* the detail message
* @param pRootCause
@@ -72,7 +72,7 @@ public class ELException extends Exception {
// -------------------------------------
/**
* Returns the root cause.
- *
+ *
* @return the root cause of this exception
*/
public Throwable getRootCause() {
diff --git a/java/javax/servlet/jsp/el/Expression.java b/java/javax/servlet/jsp/el/Expression.java
index 8d446aa..51635bc 100644
--- a/java/javax/servlet/jsp/el/Expression.java
+++ b/java/javax/servlet/jsp/el/Expression.java
@@ -22,11 +22,11 @@ package javax.servlet.jsp.el;
/**
* <p>The abstract class for a prepared expression.</p>
*
- * <p>An instance of an Expression can be obtained via from an
+ * <p>An instance of an Expression can be obtained via from an
* ExpressionEvaluator instance.</p>
*
* <p>An Expression may or not have done a syntactic parse of the expression.
- * A client invoking the evaluate() method should be ready for the case
+ * A client invoking the evaluate() method should be ready for the case
* where ELParseException exceptions are raised. </p>
*
* @since 2.0
@@ -35,19 +35,19 @@ package javax.servlet.jsp.el;
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public abstract class Expression {
- /**
- * Evaluates an expression that was previously prepared. In some
- * implementations preparing an expression involves full syntactic
- * validation, but others may not do so. Evaluating the expression may
- * raise an ELParseException as well as other ELExceptions due to
+ /**
+ * Evaluates an expression that was previously prepared. In some
+ * implementations preparing an expression involves full syntactic
+ * validation, but others may not do so. Evaluating the expression may
+ * raise an ELParseException as well as other ELExceptions due to
* run-time evaluation.
*
- * @param vResolver A VariableResolver instance that can be used at
+ * @param vResolver A VariableResolver instance that can be used at
* runtime to resolve the name of implicit objects into Objects.
* @return The result of the expression evaluation.
*
* @exception ELException Thrown if the expression evaluation failed.
- */
+ */
public abstract Object evaluate( VariableResolver vResolver )
throws ELException;
}
diff --git a/java/javax/servlet/jsp/el/ExpressionEvaluator.java b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
index 8dad1b5..82b8190 100644
--- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
@@ -50,7 +50,7 @@ package javax.servlet.jsp.el;
* <li><code>${8 * 8}</code></li>
* <li><code>${my:reverse('hello')}</code></li>
* </ul>
- *
+ *
* @since 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory
*/
@@ -62,7 +62,7 @@ public abstract class ExpressionEvaluator {
* Prepare an expression for later evaluation. This method should perform
* syntactic validation of the expression; if in doing so it detects errors,
* it should raise an ELParseException.
- *
+ *
* @param expression
* The expression to be evaluated.
* @param expectedType
@@ -91,7 +91,7 @@ public abstract class ExpressionEvaluator {
* validation and, if so, it should raise an ELParseException error if it
* encounters syntactic errors. EL evaluation errors should cause an
* ELException to be raised.
- *
+ *
* @param expression
* The expression to be evaluated.
* @param expectedType
diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java b/java/javax/servlet/jsp/el/FunctionMapper.java
index 3a8e940..900820f 100644
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -31,11 +31,11 @@ public interface FunctionMapper {
/**
* Resolves the specified local name and prefix into a Java.lang.Method.
* Returns null if the prefix and local name are not found.
- *
+ *
* @param prefix the prefix of the function, or "" if no prefix.
* @param localName the short name of the function
* @return the result of the method mapping. Null means no entry found.
**/
- public java.lang.reflect.Method resolveFunction(String prefix,
+ public java.lang.reflect.Method resolveFunction(String prefix,
String localName);
}
diff --git a/java/javax/servlet/jsp/el/VariableResolver.java b/java/javax/servlet/jsp/el/VariableResolver.java
index db0ef59..011e27f 100644
--- a/java/javax/servlet/jsp/el/VariableResolver.java
+++ b/java/javax/servlet/jsp/el/VariableResolver.java
@@ -28,7 +28,7 @@ package javax.servlet.jsp.el;
* An instance of this class includes the context against which resolution will
* happen
* </p>
- *
+ *
* @since 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ELResolver
*/
@@ -39,7 +39,7 @@ public interface VariableResolver {
/**
* Resolves the specified variable. Returns null if the variable is not
* found.
- *
+ *
* @param pName
* the name of the variable to resolve
* @return the result of the variable resolution
diff --git a/java/javax/servlet/jsp/el/package.html b/java/javax/servlet/jsp/el/package.html
index ba5a629..38618f3 100644
--- a/java/javax/servlet/jsp/el/package.html
+++ b/java/javax/servlet/jsp/el/package.html
@@ -27,11 +27,11 @@ The JavaServer Pages(tm) (JSP) 2.0 specification provides a portable
API for evaluating "EL Expressions". As of JSP 2.0, EL expressions can
be placed directly in the template text of JSP pages and tag files.
<p>
-This package contains a number of classes and interfaces that describe
-and define programmatic access to the Expression Language evaluator.
-This API can also be used by an implementation of JSP to evaluate the
-expressions, but other implementations, like open-coding into Java
-bytecodes, are allowed. This package is intended to have no dependencies
-on other portions of the JSP 2.0 specification.
+This package contains a number of classes and interfaces that describe
+and define programmatic access to the Expression Language evaluator.
+This API can also be used by an implementation of JSP to evaluate the
+expressions, but other implementations, like open-coding into Java
+bytecodes, are allowed. This package is intended to have no dependencies
+on other portions of the JSP 2.0 specification.
</body>
</html>
diff --git a/java/javax/servlet/jsp/resources/jsp_2_1.xsd b/java/javax/servlet/jsp/resources/jsp_2_1.xsd
index 1f4f8ff..ec26e7e 100644
--- a/java/javax/servlet/jsp/resources/jsp_2_1.xsd
+++ b/java/javax/servlet/jsp/resources/jsp_2_1.xsd
@@ -23,12 +23,12 @@
** This XSD contains only the functional elements for programatic use.
-->
-<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"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
+<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"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
version="2.1">
<xsd:include schemaLocation="javaee_5.xsd" />
diff --git a/java/javax/servlet/jsp/resources/jsp_2_2.xsd b/java/javax/servlet/jsp/resources/jsp_2_2.xsd
index 2d64da3..b6f62f4 100644
--- a/java/javax/servlet/jsp/resources/jsp_2_2.xsd
+++ b/java/javax/servlet/jsp/resources/jsp_2_2.xsd
@@ -10,9 +10,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -22,7 +22,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -32,9 +32,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -46,7 +46,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -63,11 +63,11 @@
This is the XML Schema for the JSP 2.2 deployment descriptor
types. The JSP 2.2 schema contains all the special
structures and datatypes that are necessary to use JSP files
- from a web application.
-
- The contents of this schema is used by the web-common_3_0.xsd
- file to define JSP specific content.
-
+ from a web application.
+
+ The contents of this schema is used by the web-common_3_0.xsd
+ file to define JSP specific content.
+
</xsd:documentation>
</xsd:annotation>
@@ -76,7 +76,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -85,7 +85,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -101,7 +101,7 @@
The jsp-configType is used to provide global configuration
information for the JSP files in a web application. It has
two subelements, taglib and jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -127,7 +127,7 @@
The jsp-file element contains the full path to a JSP file
within the web application beginning with a `/'.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -146,7 +146,7 @@
files so they can be given global property information.
All files so described are deemed to be JSP files. The
following additional properties can be described:
-
+
- Control whether EL is ignored.
- Control whether scripting elements are invalid.
- Indicate pageEncoding information.
@@ -160,7 +160,7 @@
- Indicate the default buffering model for JspWriter
- Control whether error should be raised for the use of
undeclared namespaces in a JSP page.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -179,7 +179,7 @@
EL evaluation is enabled for Web Applications using
a Servlet 2.4 or greater web.xml, and disabled
otherwise.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -200,7 +200,7 @@
in a JSP configuration element matching the document.
It is legal to name the same encoding through
mulitple mechanisms.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -213,7 +213,7 @@
Can be used to easily disable scripting in a
group of JSP pages. By default, scripting is
enabled.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -229,7 +229,7 @@
If false, the resources are assumed to not
be JSP documents, unless there is another
property group that indicates otherwise.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -246,7 +246,7 @@
the given path will be automatically included (as
in an include directive) at the beginning of each
JSP page in this jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -263,7 +263,7 @@
the given path will be automatically included (as
in an include directive) at the end of each
JSP page in this jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -278,7 +278,7 @@
character sequence is used as a String literal, unless
this element is enabled (true). Disabled (false) by
default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -292,7 +292,7 @@
must be removed from the response output. It has no
effect on JSP documents (XML syntax). Disabled (false)
by default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -306,7 +306,7 @@
contentType page directive. It specifies the default
response contentType if the page directive does not include
a contentType attribute.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -320,7 +320,7 @@
buffer page directive. It specifies if buffering should be
used for the output to response, and if so, the size of the
buffer to use.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -335,7 +335,7 @@
set to true, then an error must be raised during the translation
time when an undeclared tag is used in a JSP page. Disabled
(false) by default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -356,7 +356,7 @@
available to the application. This can be done
to override implicit map entries from TLD files and
from the container.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -371,7 +371,7 @@
absolute URI specification, or a relative URI.
There should be no entries in web.xml with the
same taglib-uri value.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -384,7 +384,7 @@
(as a resource relative to the root of the web
application) where to find the Tag Library
Description file for the tag library.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
diff --git a/java/javax/servlet/jsp/resources/jspxml.dtd b/java/javax/servlet/jsp/resources/jspxml.dtd
index cb91a1c..c6f0998 100644
--- a/java/javax/servlet/jsp/resources/jspxml.dtd
+++ b/java/javax/servlet/jsp/resources/jspxml.dtd
@@ -18,7 +18,7 @@
thanks to Bob Foster, WebGain
-->
-<!--
+<!--
This DTD is not conditional on any parameter entities in the internal
subset and does not export any general entities.
-->
diff --git a/java/javax/servlet/jsp/resources/jspxml.xsd b/java/javax/servlet/jsp/resources/jspxml.xsd
index 90f66f4..0e5eba0 100644
--- a/java/javax/servlet/jsp/resources/jspxml.xsd
+++ b/java/javax/servlet/jsp/resources/jspxml.xsd
@@ -115,7 +115,7 @@
<xsd:enumeration value = "false"/>
<xsd:enumeration value = "yes"/>
<xsd:enumeration value = "no"/>
- </xsd:restriction>
+ </xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name = "Identifier">
@@ -128,7 +128,7 @@
<xsd:pattern value = "&Identifier;"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:simpleType name = "TypeName">
<xsd:annotation>
<xsd:documentation>
@@ -140,7 +140,7 @@
<xsd:pattern value = "&TypeName;"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:simpleType name = "ImportList">
<xsd:annotation>
<xsd:documentation>
@@ -152,7 +152,7 @@
<xsd:pattern value = "&ImportList;"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:simpleType name = "SetProp">
<xsd:annotation>
<xsd:documentation>
@@ -163,7 +163,7 @@
<xsd:pattern value = "&SetProp;"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:simpleType name = "RelativeURL">
<xsd:annotation>
<xsd:documentation>
@@ -190,14 +190,14 @@
<xsd:pattern value = "&Length;"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:simpleType name = "ExplicitBufferSize">
<xsd:annotation>
<xsd:documentation>
Buffer Size with an explicit value
</xsd:documentation>
- </xsd:annotation>
+ </xsd:annotation>
<xsd:restriction base = "xsd:string">
<xsd:pattern value = "&Buffer;"/>
</xsd:restriction>
@@ -208,7 +208,7 @@
<xsd:documentation>
Buffer Size with a "none" value
</xsd:documentation>
- </xsd:annotation>
+ </xsd:annotation>
<xsd:restriction base = "xsd:string">
<xsd:enumeration value = "none"/>
</xsd:restriction>
@@ -222,7 +222,7 @@
</xsd:annotation>
<xsd:union memberTypes = "ExplicitBufferSize NoneBufferSize"/>
</xsd:simpleType>
-
+
<xsd:simpleType name = "ContentType">
<xsd:annotation>
<xsd:documentation>
@@ -292,7 +292,7 @@
<xsd:annotation>
<xsd:documentation>
The root element of all JSP documents is named root.
-
+
Authors may, if they wish, include schema location information.
If specified, the information may appear as attributes of
the root element as follows:
@@ -312,7 +312,7 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "directive.page">
<xsd:annotation>
<xsd:documentation>
@@ -335,7 +335,7 @@
<xsd:attribute name = "isELIgnored" type = "Bool"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "directive.include">
<xsd:annotation>
<xsd:documentation>
@@ -355,7 +355,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
-
+
<xsd:element name = "declaration" type = "xsd:string">
<xsd:annotation>
<xsd:documentation>
@@ -363,7 +363,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
-
+
<xsd:element name = "expression" type = "xsd:string">
<xsd:annotation>
<xsd:documentation>
@@ -371,7 +371,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
-
+
<xsd:element name = "text" type = "xsd:string">
<xsd:annotation>
<xsd:documentation>
@@ -384,11 +384,11 @@
<xsd:annotation>
<xsd:documentation>
useBean instantiates or accesses a bean in the specified scope.
-
+
Constraint: The allowed combinations of attributes are:
-
+
class [type] | type [( class | beanName)]
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -403,12 +403,12 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "setProperty">
<xsd:annotation>
<xsd:documentation>
setProperty changes the value of an object property.
-
+
Constraint: The object named by the name must have been
"introduced" to the JSP processor using either the
jsp:useBean action or a custom action with an associated
@@ -420,7 +420,7 @@
name="Identifier" property="*"
name="Identifier" property="Identfiier" param="string"
name="Identifier" property="Identifier" value="string"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
@@ -435,12 +435,12 @@
<xsd:annotation>
<xsd:documentation>
getProperty obtains the value of an object property.
-
+
Constraint: The object named by the name must have been
"introduced" to the JSP processor using either the
jsp:useBean action or a custom action with an associated
VariableInfo entry for this name.
-
+
???The spec is interpreted as restricting the values of
property to Identifier.
</xsd:documentation>
@@ -450,7 +450,7 @@
<xsd:attribute name = "property" use = "required" type = "Identifier"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "include">
<xsd:complexType>
<xsd:sequence>
@@ -469,7 +469,7 @@
<xsd:attribute name = "page" use = "required" type = "RTERelativeURL"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "plugin">
<xsd:complexType> <!-- content only! -->
<xsd:sequence>
@@ -495,7 +495,7 @@
<xsd:attribute name = "iepluginurl" type = "xsd:anyURI"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name = "params">
<xsd:complexType>
<xsd:sequence>
@@ -510,5 +510,5 @@
<xsd:attribute name = "value" use = "required" type = "xsd:string"/>
</xsd:complexType>
</xsd:element>
-
+
</xsd:schema>
diff --git a/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd b/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
index 46b8922..2714f78 100644
--- a/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
+++ b/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
@@ -24,11 +24,11 @@
** XSD.
-->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/javaee"
- xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
+<xsd:schema targetNamespace="http://java.sun.com/xml/ns/javaee"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
version="2.1">
<xsd:include schemaLocation="javaee_5.xsd" />
diff --git a/java/javax/servlet/jsp/tagext/BodyContent.java b/java/javax/servlet/jsp/tagext/BodyContent.java
index f700cb6..92c23e2 100644
--- a/java/javax/servlet/jsp/tagext/BodyContent.java
+++ b/java/javax/servlet/jsp/tagext/BodyContent.java
@@ -48,7 +48,7 @@ public abstract class BodyContent extends JspWriter {
/**
* Protected constructor. Unbounded buffer, no autoflushing.
- *
+ *
* @param e
* the enclosing JspWriter
*/
@@ -62,7 +62,7 @@ public abstract class BodyContent extends JspWriter {
* <p>
* It is not valid to flush a BodyContent because there is no backing stream
* behind it.
- *
+ *
* @throws IOException
* always thrown
*/
@@ -85,14 +85,14 @@ public abstract class BodyContent extends JspWriter {
/**
* Return the value of this BodyContent as a Reader.
- *
+ *
* @return the value of this BodyContent as a Reader
*/
public abstract Reader getReader();
/**
* Return the value of the BodyContent as a String.
- *
+ *
* @return the value of the BodyContent as a String
*/
public abstract String getString();
@@ -100,7 +100,7 @@ public abstract class BodyContent extends JspWriter {
/**
* Write the contents of this BodyContent into a Writer. Subclasses may
* optimize common invocation patterns.
- *
+ *
* @param out
* The writer into which to place the contents of this body
* evaluation
@@ -112,7 +112,7 @@ public abstract class BodyContent extends JspWriter {
/**
* Get the enclosing JspWriter.
- *
+ *
* @return the enclosing JspWriter passed at construction time
*/
public JspWriter getEnclosingWriter() {
diff --git a/java/javax/servlet/jsp/tagext/BodyTag.java b/java/javax/servlet/jsp/tagext/BodyTag.java
index 837111d..a9fe835 100644
--- a/java/javax/servlet/jsp/tagext/BodyTag.java
+++ b/java/javax/servlet/jsp/tagext/BodyTag.java
@@ -104,7 +104,7 @@ public interface BodyTag extends IterationTag {
* Deprecated constant that has the same value as EVAL_BODY_BUFFERED and
* EVAL_BODY_AGAIN. This name has been marked as deprecated to encourage the
* use of the two different terms, which are much more descriptive.
- *
+ *
* @deprecated As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED or
* IterationTag.EVAL_BODY_AGAIN.
*/
@@ -135,7 +135,7 @@ public interface BodyTag extends IterationTag {
* The BodyContent object is available and with the appropriate content
* until after the invocation of the doEndTag method, at which case it may
* be reused.
- *
+ *
* @param b
* the BodyContent
* @see #doInitBody
@@ -153,7 +153,7 @@ public interface BodyTag extends IterationTag {
* The JSP container will resynchronize the values of any AT_BEGIN and
* NESTED variables (defined by the associated TagExtraInfo or TLD) after
* the invocation of doInitBody().
- *
+ *
* @throws JspException
* if an error occurred while processing this tag
* @see #doAfterBody
diff --git a/java/javax/servlet/jsp/tagext/BodyTagSupport.java b/java/javax/servlet/jsp/tagext/BodyTagSupport.java
index 740a73b..ba2dfd3 100644
--- a/java/javax/servlet/jsp/tagext/BodyTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/BodyTagSupport.java
@@ -44,7 +44,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Default processing of the start tag returning EVAL_BODY_BUFFERED.
- *
+ *
* @return EVAL_BODY_BUFFERED
* @throws JspException
* if an error occurred while processing this tag
@@ -57,7 +57,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Default processing of the end tag returning EVAL_PAGE.
- *
+ *
* @return EVAL_PAGE
* @throws JspException
* if an error occurred while processing this tag
@@ -72,7 +72,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Prepare for evaluation of the body: stash the bodyContent away.
- *
+ *
* @param b
* the BodyContent
* @see #doAfterBody
@@ -87,7 +87,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Prepare for evaluation of the body just before the first body evaluation:
* no action.
- *
+ *
* @throws JspException
* if an error occurred while processing this tag
* @see #setBodyContent
@@ -102,7 +102,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* After the body evaluation: do not reevaluate and continue with the page.
* By default nothing is done with the bodyContent data (if any).
- *
+ *
* @return SKIP_BODY
* @throws JspException
* if an error occurred while processing this tag
@@ -116,7 +116,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Release state.
- *
+ *
* @see Tag#release
*/
@Override
@@ -128,7 +128,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Get current bodyContent.
- *
+ *
* @return the body content.
*/
public BodyContent getBodyContent() {
@@ -137,7 +137,7 @@ public class BodyTagSupport extends TagSupport implements BodyTag {
/**
* Get surrounding out JspWriter.
- *
+ *
* @return the enclosing JspWriter, from the bodyContent.
*/
public JspWriter getPreviousOut() {
diff --git a/java/javax/servlet/jsp/tagext/DynamicAttributes.java b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
index be77f64..4ddefad 100644
--- a/java/javax/servlet/jsp/tagext/DynamicAttributes.java
+++ b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
@@ -20,33 +20,33 @@ import javax.servlet.jsp.JspException;
/**
* For a tag to declare that it accepts dynamic attributes, it must implement
- * this interface. The entry for the tag in the Tag Library Descriptor must
+ * this interface. The entry for the tag in the Tag Library Descriptor must
* also be configured to indicate dynamic attributes are accepted.
* <br>
* For any attribute that is not declared in the Tag Library Descriptor for
- * this tag, instead of getting an error at translation time, the
+ * this tag, instead of getting an error at translation time, the
* <code>setDynamicAttribute()</code> method is called, with the name and
- * value of the attribute. It is the responsibility of the tag to
+ * value of the attribute. It is the responsibility of the tag to
* remember the names and values of the dynamic attributes.
*
* @since 2.0
*/
public interface DynamicAttributes {
-
+
/**
* Called when a tag declared to accept dynamic attributes is passed
* an attribute that is not declared in the Tag Library Descriptor.
- *
+ *
* @param uri the namespace of the attribute, or null if in the default
* namespace.
* @param localName the name of the attribute being set.
* @param value the value of the attribute
* @throws JspException if the tag handler wishes to
- * signal that it does not accept the given attribute. The
+ * signal that it does not accept the given attribute. The
* container must not call doStartTag() or doTag() for this tag.
*/
public void setDynamicAttribute(
- String uri, String localName, Object value )
+ String uri, String localName, Object value )
throws JspException;
-
+
}
diff --git a/java/javax/servlet/jsp/tagext/FunctionInfo.java b/java/javax/servlet/jsp/tagext/FunctionInfo.java
index 56e2341..9df9c64 100644
--- a/java/javax/servlet/jsp/tagext/FunctionInfo.java
+++ b/java/javax/servlet/jsp/tagext/FunctionInfo.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
* Information for a function in a Tag Library.
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
- *
+ *
* @since 2.0
*/
public class FunctionInfo {
diff --git a/java/javax/servlet/jsp/tagext/IterationTag.java b/java/javax/servlet/jsp/tagext/IterationTag.java
index ef0e2a3..9443e23 100644
--- a/java/javax/servlet/jsp/tagext/IterationTag.java
+++ b/java/javax/servlet/jsp/tagext/IterationTag.java
@@ -55,7 +55,7 @@ import javax.servlet.jsp.JspException;
*
* <p><B>Empty and Non-Empty Action</B>
* <p> If the TagLibraryDescriptor file indicates that the action must
- * always have an empty element body, by a <body-content> entry of
+ * always have an empty element body, by a <body-content> entry of
* "empty", then the doStartTag() method must return SKIP_BODY.
*
* <p>Note that which methods are invoked after the doStartTag() depends on
@@ -68,8 +68,8 @@ import javax.servlet.jsp.JspException;
*
* <p>
* If EVAL_BODY_INCLUDE is returned, and the custom action element is not
- * empty, the body is evaluated and "passed through" to the current out,
- * then doAfterBody() is invoked and, after zero or more iterations,
+ * empty, the body is evaluated and "passed through" to the current out,
+ * then doAfterBody() is invoked and, after zero or more iterations,
* doEndTag() is invoked.
*/
@@ -81,9 +81,9 @@ public interface IterationTag extends Tag {
*
* For compatibility with JSP 1.1, the value is carefully selected
* to be the same as the, now deprecated, BodyTag.EVAL_BODY_TAG,
- *
+ *
*/
-
+
public static final int EVAL_BODY_AGAIN = 2;
/**
@@ -100,7 +100,7 @@ public interface IterationTag extends Tag {
*
* <p>
* If this tag handler implements BodyTag and doAfterBody returns
- * SKIP_BODY, the value of out will be restored using the popBody
+ * SKIP_BODY, the value of out will be restored using the popBody
* method in pageContext prior to invoking doEndTag.
*
* <p>
diff --git a/java/javax/servlet/jsp/tagext/JspFragment.java b/java/javax/servlet/jsp/tagext/JspFragment.java
index c5b3b08..90a45b3 100644
--- a/java/javax/servlet/jsp/tagext/JspFragment.java
+++ b/java/javax/servlet/jsp/tagext/JspFragment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
import java.io.IOException;
@@ -24,31 +24,31 @@ import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.JspException;
/**
- * Encapsulates a portion of JSP code in an object that
- * can be invoked as many times as needed. JSP Fragments are defined
- * using JSP syntax as the body of a tag for an invocation to a SimpleTag
+ * Encapsulates a portion of JSP code in an object that
+ * can be invoked as many times as needed. JSP Fragments are defined
+ * using JSP syntax as the body of a tag for an invocation to a SimpleTag
* handler, or as the body of a <jsp:attribute> standard action
* specifying the value of an attribute that is declared as a fragment,
* or to be of type JspFragment in the TLD.
* <p>
- * The definition of the JSP fragment must only contain template
+ * The definition of the JSP fragment must only contain template
* text and JSP action elements. In other words, it must not contain
- * scriptlets or scriptlet expressions. At translation time, the
+ * scriptlets or scriptlet expressions. At translation time, the
* container generates an implementation of the JspFragment abstract class
* capable of executing the defined fragment.
* <p>
- * A tag handler can invoke the fragment zero or more times, or
+ * A tag handler can invoke the fragment zero or more times, or
* pass it along to other tags, before returning. To communicate values
- * to/from a JSP fragment, tag handlers store/retrieve values in
+ * to/from a JSP fragment, tag handlers store/retrieve values in
* the JspContext associated with the fragment.
* <p>
* Note that tag library developers and page authors should not generate
* JspFragment implementations manually.
* <p>
- * <i>Implementation Note</i>: It is not necessary to generate a
- * separate class for each fragment. One possible implementation is
- * to generate a single helper class for each page that implements
- * JspFragment. Upon construction, a discriminator can be passed to
+ * <i>Implementation Note</i>: It is not necessary to generate a
+ * separate class for each fragment. One possible implementation is
+ * to generate a single helper class for each page that implements
+ * JspFragment. Upon construction, a discriminator can be passed to
* select which fragment that instance will execute.
*
* @since 2.0
@@ -60,7 +60,7 @@ public abstract class JspFragment {
* or the JspWriter returned by the getOut() method of the JspContext
* associated with the fragment if out is null.
*
- * @param out The Writer to output the fragment to, or null if
+ * @param out The Writer to output the fragment to, or null if
* output should be sent to JspContext.getOut().
* @throws javax.servlet.jsp.JspException Thrown if an error occurred
* while invoking this fragment.
@@ -69,7 +69,7 @@ public abstract class JspFragment {
* invoked this fragment is to cease evaluation. The container
* must throw this exception if a Classic Tag Handler returned
* Tag.SKIP_PAGE or if a Simple Tag Handler threw SkipPageException.
- * @throws java.io.IOException If there was an error writing to the
+ * @throws java.io.IOException If there was an error writing to the
* stream.
*/
public abstract void invoke( Writer out )
diff --git a/java/javax/servlet/jsp/tagext/JspTag.java b/java/javax/servlet/jsp/tagext/JspTag.java
index 3c8d138..2be75fd 100644
--- a/java/javax/servlet/jsp/tagext/JspTag.java
+++ b/java/javax/servlet/jsp/tagext/JspTag.java
@@ -17,7 +17,7 @@
package javax.servlet.jsp.tagext;
/**
- * Serves as a base class for Tag and SimpleTag.
+ * Serves as a base class for Tag and SimpleTag.
* This is mostly for organizational and type-safety purposes.
*
* @since 2.0
diff --git a/java/javax/servlet/jsp/tagext/PageData.java b/java/javax/servlet/jsp/tagext/PageData.java
index 9f6343c..737d394 100644
--- a/java/javax/servlet/jsp/tagext/PageData.java
+++ b/java/javax/servlet/jsp/tagext/PageData.java
@@ -32,18 +32,18 @@ import java.io.InputStream;
public abstract class PageData {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public PageData() {
// NOOP by default
}
-
+
/**
* Returns an input stream on the XML view of a JSP page.
- * The stream is encoded in UTF-8. Recall that the XML view of a
+ * The stream is encoded in UTF-8. Recall that the XML view of a
* JSP page has the include directives expanded.
- *
+ *
* @return An input stream on the document.
*/
public abstract InputStream getInputStream();
diff --git a/java/javax/servlet/jsp/tagext/SimpleTag.java b/java/javax/servlet/jsp/tagext/SimpleTag.java
index 25569a7..48a5ac7 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTag.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTag.java
@@ -20,59 +20,59 @@ import javax.servlet.jsp.JspContext;
/**
* Interface for defining Simple Tag Handlers.
- *
- * <p>Simple Tag Handlers differ from Classic Tag Handlers in that instead
- * of supporting <code>doStartTag()</code> and <code>doEndTag()</code>,
- * the <code>SimpleTag</code> interface provides a simple
- * <code>doTag()</code> method, which is called once and only once for any
- * given tag invocation. All tag logic, iteration, body evaluations, etc.
- * are to be performed in this single method. Thus, simple tag handlers
- * have the equivalent power of <code>BodyTag</code>, but with a much
+ *
+ * <p>Simple Tag Handlers differ from Classic Tag Handlers in that instead
+ * of supporting <code>doStartTag()</code> and <code>doEndTag()</code>,
+ * the <code>SimpleTag</code> interface provides a simple
+ * <code>doTag()</code> method, which is called once and only once for any
+ * given tag invocation. All tag logic, iteration, body evaluations, etc.
+ * are to be performed in this single method. Thus, simple tag handlers
+ * have the equivalent power of <code>BodyTag</code>, but with a much
* simpler lifecycle and interface.</p>
*
- * <p>To support body content, the <code>setJspBody()</code>
- * method is provided. The container invokes the <code>setJspBody()</code>
- * method with a <code>JspFragment</code> object encapsulating the body of
- * the tag. The tag handler implementation can call
+ * <p>To support body content, the <code>setJspBody()</code>
+ * method is provided. The container invokes the <code>setJspBody()</code>
+ * method with a <code>JspFragment</code> object encapsulating the body of
+ * the tag. The tag handler implementation can call
* <code>invoke()</code> on that fragment to evaluate the body as
* many times as it needs.</p>
*
* <p>A SimpleTag handler must have a public no-args constructor. Most
* SimpleTag handlers should extend SimpleTagSupport.</p>
- *
+ *
* <p><b>Lifecycle</b></p>
*
- * <p>The following is a non-normative, brief overview of the
+ * <p>The following is a non-normative, brief overview of the
* SimpleTag lifecycle. Refer to the JSP Specification for details.</p>
*
* <ol>
- * <li>A new tag handler instance is created each time by the container
+ * <li>A new tag handler instance is created each time by the container
* by calling the provided zero-args constructor. Unlike classic
* tag handlers, simple tag handlers are never cached and reused by
* the JSP container.</li>
- * <li>The <code>setJspContext()</code> and <code>setParent()</code>
+ * <li>The <code>setJspContext()</code> and <code>setParent()</code>
* methods are called by the container. The <code>setParent()</code>
- * method is only called if the element is nested within another tag
+ * method is only called if the element is nested within another tag
* invocation.</li>
* <li>The setters for each attribute defined for this tag are called
* by the container.</li>
- * <li>If a body exists, the <code>setJspBody()</code> method is called
- * by the container to set the body of this tag, as a
+ * <li>If a body exists, the <code>setJspBody()</code> method is called
+ * by the container to set the body of this tag, as a
* <code>JspFragment</code>. If the action element is empty in
* the page, this method is not called at all.</li>
* <li>The <code>doTag()</code> method is called by the container. All
- * tag logic, iteration, body evaluations, etc. occur in this
+ * tag logic, iteration, body evaluations, etc. occur in this
* method.</li>
* <li>The <code>doTag()</code> method returns and all variables are
* synchronized.</li>
* </ol>
- *
+ *
* @see SimpleTagSupport
* @since 2.0
*/
public interface SimpleTag extends JspTag {
-
- /**
+
+ /**
* Called by the container to invoke this tag.
* The implementation of this method is provided by the tag library
* developer, and handles all tag processing, body iteration, etc.
@@ -81,60 +81,60 @@ public interface SimpleTag extends JspTag {
* The JSP container will resynchronize any AT_BEGIN and AT_END
* variables (defined by the associated tag file, TagExtraInfo, or TLD)
* after the invocation of doTag().
- *
- * @throws javax.servlet.jsp.JspException If an error occurred
+ *
+ * @throws javax.servlet.jsp.JspException If an error occurred
* while processing this tag.
* @throws javax.servlet.jsp.SkipPageException If the page that
* (either directly or indirectly) invoked this tag is to
- * cease evaluation. A Simple Tag Handler generated from a
- * tag file must throw this exception if an invoked Classic
+ * cease evaluation. A Simple Tag Handler generated from a
+ * tag file must throw this exception if an invoked Classic
* Tag Handler returned SKIP_PAGE or if an invoked Simple
* Tag Handler threw SkipPageException or if an invoked Jsp Fragment
* threw a SkipPageException.
* @throws java.io.IOException If there was an error writing to the
* output stream.
- */
- public void doTag()
+ */
+ public void doTag()
throws javax.servlet.jsp.JspException, java.io.IOException;
-
+
/**
* Sets the parent of this tag, for collaboration purposes.
* <p>
- * The container invokes this method only if this tag invocation is
+ * The container invokes this method only if this tag invocation is
* nested within another tag invocation.
*
* @param parent the tag that encloses this tag
*/
public void setParent( JspTag parent );
-
+
/**
* Returns the parent of this tag, for collaboration purposes.
*
* @return the parent of this tag
- */
+ */
public JspTag getParent();
-
+
/**
* Called by the container to provide this tag handler with
* the <code>JspContext</code> for this invocation.
* An implementation should save this value.
- *
+ *
* @param pc the page context for this invocation
* @see Tag#setPageContext
*/
public void setJspContext( JspContext pc );
-
- /**
- * Provides the body of this tag as a JspFragment object, able to be
- * invoked zero or more times by the tag handler.
+
+ /**
+ * Provides the body of this tag as a JspFragment object, able to be
+ * invoked zero or more times by the tag handler.
* <p>
- * This method is invoked by the JSP page implementation
+ * This method is invoked by the JSP page implementation
* object prior to <code>doTag()</code>. If the action element is
* empty in the page, this method is not called at all.
- *
+ *
* @param jspBody The fragment encapsulating the body of this tag.
- */
+ */
public void setJspBody( JspFragment jspBody );
-
+
}
diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
index 0ee1755..4cbadf7 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
@@ -35,42 +35,42 @@ import javax.servlet.jsp.JspException;
public class SimpleTagSupport implements SimpleTag {
/** Reference to the enclosing tag. */
private JspTag parentTag;
-
+
/** The JSP context for the upcoming tag invocation. */
private JspContext jspContext;
-
+
/** The body of the tag. */
private JspFragment jspBody;
-
+
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public SimpleTagSupport() {
// NOOP by default
}
-
- /**
+
+ /**
* Default processing of the tag does nothing.
*
* @throws JspException Subclasses can throw JspException to indicate
* an error occurred while processing this tag.
* @throws javax.servlet.jsp.SkipPageException If the page that
* (either directly or indirectly) invoked this tag is to
- * cease evaluation. A Simple Tag Handler generated from a
- * tag file must throw this exception if an invoked Classic
+ * cease evaluation. A Simple Tag Handler generated from a
+ * tag file must throw this exception if an invoked Classic
* Tag Handler returned SKIP_PAGE or if an invoked Simple
* Tag Handler threw SkipPageException or if an invoked Jsp Fragment
* threw a SkipPageException.
* @throws IOException Subclasses can throw IOException if there was
* an error writing to the output stream
* @see SimpleTag#doTag()
- */
+ */
@Override
public void doTag() throws JspException, IOException {
// NOOP by default
}
-
+
/**
* Sets the parent of this tag, for collaboration purposes.
* <p>
@@ -83,22 +83,22 @@ public class SimpleTagSupport implements SimpleTag {
public void setParent( JspTag parent ) {
this.parentTag = parent;
}
-
+
/**
* Returns the parent of this tag, for collaboration purposes.
*
* @return the parent of this tag
- */
+ */
@Override
public JspTag getParent() {
return this.parentTag;
}
-
+
/**
* Stores the provided JSP context in the private jspContext field.
- * Subclasses can access the <code>JspContext</code> via
+ * Subclasses can access the <code>JspContext</code> via
* <code>getJspContext()</code>.
- *
+ *
* @param pc the page context for this invocation
* @see SimpleTag#setJspContext
*/
@@ -106,9 +106,9 @@ public class SimpleTagSupport implements SimpleTag {
public void setJspContext( JspContext pc ) {
this.jspContext = pc;
}
-
+
/**
- * Returns the page context passed in by the container via
+ * Returns the page context passed in by the container via
* setJspContext.
*
* @return the page context for this invocation
@@ -116,20 +116,20 @@ public class SimpleTagSupport implements SimpleTag {
protected JspContext getJspContext() {
return this.jspContext;
}
-
- /**
+
+ /**
* Stores the provided JspFragment.
*
* @param jspBody The fragment encapsulating the body of this tag.
- * If the action element is empty in the page, this method is
+ * If the action element is empty in the page, this method is
* not called at all.
* @see SimpleTag#setJspBody
- */
+ */
@Override
public void setJspBody( JspFragment jspBody ) {
this.jspBody = jspBody;
}
-
+
/**
* Returns the body passed in by the container via setJspBody.
*
@@ -144,7 +144,7 @@ public class SimpleTagSupport implements SimpleTag {
* Find the instance of a given class type that is closest to a given
* instance.
* This method uses the getParent method from the Tag and/or SimpleTag
- * interfaces. This method is used for coordination among
+ * interfaces. This method is used for coordination among
* cooperating tags.
*
* <p> For every instance of TagAdapter
@@ -172,7 +172,7 @@ public class SimpleTagSupport implements SimpleTag {
* should adhere to that constraint. Specifically, the Class
* passed to findAncestorWithClass should be a subtype of the
* observable type.
- *
+ *
*
* @param from The instance from where to start looking.
* @param klass The subclass of JspTag or interface to be matched
@@ -180,7 +180,7 @@ public class SimpleTagSupport implements SimpleTag {
* or is an instance of the class specified
*/
public static final JspTag findAncestorWithClass(
- JspTag from, Class<?> klass)
+ JspTag from, Class<?> klass)
{
boolean isInterface = false;
@@ -213,5 +213,5 @@ public class SimpleTagSupport implements SimpleTag {
from = parent;
}
- }
+ }
}
diff --git a/java/javax/servlet/jsp/tagext/Tag.java b/java/javax/servlet/jsp/tagext/Tag.java
index 5573d50..6bfce7e 100644
--- a/java/javax/servlet/jsp/tagext/Tag.java
+++ b/java/javax/servlet/jsp/tagext/Tag.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
import javax.servlet.jsp.JspException;
@@ -22,9 +22,9 @@ import javax.servlet.jsp.PageContext;
/**
- * The interface of a classic tag handler that does not want to manipulate
- * its body. The Tag interface defines the basic protocol between a Tag
- * handler and JSP page implementation class. It defines the life cycle
+ * The interface of a classic tag handler that does not want to manipulate
+ * its body. The Tag interface defines the basic protocol between a Tag
+ * handler and JSP page implementation class. It defines the life cycle
* and the methods to be invoked at start and end tag.
*
* <p><B>Properties</B></p>
@@ -55,11 +55,11 @@ import javax.servlet.jsp.PageContext;
* or not.
* <li> [2] This transition happens if and only if the tag ends normally
* without raising an exception
- * <li> [3] Some setters may be called again before a tag handler is
- * reused. For instance, <code>setParent()</code> is called if it's
- * reused within the same page but at a different level,
- * <code>setPageContext()</code> is called if it's used in another page,
- * and attribute setters are called if the values differ or are expressed
+ * <li> [3] Some setters may be called again before a tag handler is
+ * reused. For instance, <code>setParent()</code> is called if it's
+ * reused within the same page but at a different level,
+ * <code>setPageContext()</code> is called if it's used in another page,
+ * and attribute setters are called if the values differ or are expressed
* as request-time attribute values.
* <li> Check the TryCatchFinally interface for additional details related
* to exception handling and resource management.
@@ -67,7 +67,7 @@ import javax.servlet.jsp.PageContext;
*
* <IMG src="doc-files/TagProtocol.gif"
* alt="Lifecycle Details Transition Diagram for Tag">
- *
+ *
* <p>Once all invocations on the tag handler
* are completed, the release method is invoked on it. Once a release
* method is invoked <em>all</em> properties, including parent and
@@ -84,7 +84,7 @@ import javax.servlet.jsp.PageContext;
* EVAL_BODY_INCLUDE.</p>
*
* <p>If SKIP_BODY is returned the body, if present, is not evaluated.</p>
- *
+ *
* <p>If EVAL_BODY_INCLUDE is returned, the body is evaluated and
* "passed through" to the current out.</p>
*/
@@ -95,14 +95,14 @@ public interface Tag extends JspTag {
* Skip body evaluation.
* Valid return value for doStartTag and doAfterBody.
*/
-
+
public static final int SKIP_BODY = 0;
-
+
/**
* Evaluate body into existing out stream.
* Valid return value for doStartTag.
*/
-
+
public static final int EVAL_BODY_INCLUDE = 1;
/**
@@ -214,14 +214,14 @@ public interface Tag extends JspTag {
* implementing BodyTag whose doStartTag() method returns
* BodyTag.EVAL_BODY_BUFFERED.
*
- * @return EVAL_BODY_INCLUDE if the tag wants to process body, SKIP_BODY
+ * @return EVAL_BODY_INCLUDE if the tag wants to process body, SKIP_BODY
* if it does not want to process it.
* @throws JspException if an error occurred while processing this tag
* @see BodyTag
*/
-
+
int doStartTag() throws JspException;
-
+
/**
* Process the end tag for this instance.
@@ -236,7 +236,7 @@ public interface Tag extends JspTag {
* <p>
* If this method returns EVAL_PAGE, the rest of the page continues
* to be evaluated. If this method returns SKIP_PAGE, the rest of
- * the page is not evaluated, the request is completed, and
+ * the page is not evaluated, the request is completed, and
* the doEndTag() methods of enclosing tags are not invoked. If this
* request was forwarded or included from another page (or Servlet),
* only the current page evaluation is stopped.
diff --git a/java/javax/servlet/jsp/tagext/TagAdapter.java b/java/javax/servlet/jsp/tagext/TagAdapter.java
index 3d2f19c..1ae8bb8 100644
--- a/java/javax/servlet/jsp/tagext/TagAdapter.java
+++ b/java/javax/servlet/jsp/tagext/TagAdapter.java
@@ -29,7 +29,7 @@ import javax.servlet.jsp.PageContext;
* created to wrap the SimpleTag parent, and the adapter is passed to
* setParent() instead. A classic Tag Handler can call getAdaptee() to retrieve
* the encapsulated SimpleTag instance.
- *
+ *
* @since 2.0
*/
public class TagAdapter implements Tag {
@@ -45,7 +45,7 @@ public class TagAdapter implements Tag {
/**
* Creates a new TagAdapter that wraps the given SimpleTag and returns the
* parent tag when getParent() is called.
- *
+ *
* @param adaptee
* The SimpleTag being adapted as a Tag.
*/
@@ -59,7 +59,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @param pc
* ignored.
* @throws UnsupportedOperationException
@@ -74,7 +74,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called. The parent of this tag is always
* getAdaptee().getParent().
- *
+ *
* @param parentTag
* ignored.
* @throws UnsupportedOperationException
@@ -91,7 +91,7 @@ public class TagAdapter implements Tag {
* This will either be the enclosing Tag (if getAdaptee().getParent()
* implements Tag), or an adapter to the enclosing Tag (if
* getAdaptee().getParent() does not implement Tag).
- *
+ *
* @return The parent of the tag being adapted.
*/
@Override
@@ -116,7 +116,7 @@ public class TagAdapter implements Tag {
* Gets the tag that is being adapted to the Tag interface. This should be
* an instance of SimpleTag in JSP 2.0, but room is left for other kinds of
* tags in future spec versions.
- *
+ *
* @return the tag that is being adapted
*/
public JspTag getAdaptee() {
@@ -125,7 +125,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @return always throws UnsupportedOperationException
* @throws UnsupportedOperationException
* Must not be called
@@ -140,7 +140,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @return always throws UnsupportedOperationException
* @throws UnsupportedOperationException
* Must not be called
@@ -155,7 +155,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @throws UnsupportedOperationException
* Must not be called
*/
diff --git a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
index 690cb88..d2ff2f0 100644
--- a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.tagext;
/**
* Information on the attributes of a Tag, available at translation time. This
* class is instantiated from the Tag Library Descriptor file (TLD).
- *
+ *
* <p>
* Only the information needed to generate code is included here. Other
* information like SCHEMA for validation belongs elsewhere.
@@ -38,7 +38,7 @@ public class TagAttributeInfo {
* Constructor for TagAttributeInfo. This class is to be instantiated only
* from the TagLibrary code under request from some JSP code that is parsing
* a TLD (Tag Library Descriptor).
- *
+ *
* @param name
* The name of the attribute.
* @param required
@@ -57,7 +57,7 @@ public class TagAttributeInfo {
* JSP 2.0 Constructor for TagAttributeInfo. This class is to be
* instantiated only from the TagLibrary code under request from some JSP
* code that is parsing a TLD (Tag Library Descriptor).
- *
+ *
* @param name
* The name of the attribute.
* @param required
@@ -68,7 +68,7 @@ public class TagAttributeInfo {
* Whether this attribute holds a request-time Attribute.
* @param fragment
* Whether this attribute is of type JspFragment
- *
+ *
* @since 2.0
*/
public TagAttributeInfo(String name, boolean required, String type,
@@ -126,7 +126,7 @@ public class TagAttributeInfo {
/**
* The name of this attribute.
- *
+ *
* @return the name of the attribute
*/
@@ -136,7 +136,7 @@ public class TagAttributeInfo {
/**
* The type (as a String) of this attribute.
- *
+ *
* @return the type of the attribute
*/
@@ -146,7 +146,7 @@ public class TagAttributeInfo {
/**
* Whether this attribute can hold a request-time value.
- *
+ *
* @return if the attribute can hold a request-time value.
*/
@@ -156,7 +156,7 @@ public class TagAttributeInfo {
/**
* Whether this attribute is required.
- *
+ *
* @return if the attribute is required.
*/
public boolean isRequired() {
@@ -166,7 +166,7 @@ public class TagAttributeInfo {
/**
* Convenience static method that goes through an array of TagAttributeInfo
* objects and looks for "id".
- *
+ *
* @param a
* An array of TagAttributeInfo
* @return The TagAttributeInfo reference with name "id"
@@ -182,9 +182,9 @@ public class TagAttributeInfo {
/**
* Whether this attribute is of type JspFragment.
- *
+ *
* @return if the attribute is of type JspFragment
- *
+ *
* @since 2.0
*/
public boolean isFragment() {
@@ -194,7 +194,7 @@ public class TagAttributeInfo {
/**
* Returns a String representation of this TagAttributeInfo, suitable for
* debugging purposes.
- *
+ *
* @return a String representation of this TagAttributeInfo
*/
@Override
diff --git a/java/javax/servlet/jsp/tagext/TagData.java b/java/javax/servlet/jsp/tagext/TagData.java
index 886f441..1c9c0c5 100644
--- a/java/javax/servlet/jsp/tagext/TagData.java
+++ b/java/javax/servlet/jsp/tagext/TagData.java
@@ -23,8 +23,8 @@ import java.util.Hashtable;
* The (translation-time only) attribute/value information for a tag instance.
*
* <p>
- * TagData is only used as an argument to the isValid, validate, and
- * getVariableInfo methods of TagExtraInfo, which are invoked at
+ * TagData is only used as an argument to the isValid, validate, and
+ * getVariableInfo methods of TagExtraInfo, which are invoked at
* translation time.
*/
@@ -72,7 +72,7 @@ public class TagData implements Cloneable {
* Constructor for a TagData.
*
* If you already have the attributes in a hashtable, use this
- * constructor.
+ * constructor.
*
* @param attrs A hashtable to get the values from.
*/
@@ -99,9 +99,9 @@ public class TagData implements Cloneable {
* action. The distinguished object REQUEST_TIME_VALUE is only returned if
* the value is specified as a request-time attribute expression
* or via the <jsp:attribute> action with a body that contains
- * dynamic content (scriptlets, scripting expressions, EL expressions,
- * standard actions, or custom actions). Returns null if the attribute
- * is not set.
+ * dynamic content (scriptlets, scripting expressions, EL expressions,
+ * standard actions, or custom actions). Returns null if the attribute
+ * is not set.
*
* @param attName the name of the attribute
* @return the attribute's value
diff --git a/java/javax/servlet/jsp/tagext/TagExtraInfo.java b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
index b6c298a..027e7c2 100644
--- a/java/javax/servlet/jsp/tagext/TagExtraInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -36,7 +36,7 @@ package javax.servlet.jsp.tagext;
* object for the tag being translated. If an explicit call to
* setTagInfo() is done, then the object passed will be returned in
* subsequent calls to getTagInfo().
- *
+ *
* <p>
* The only way to affect the value returned by getTagInfo()
* is through a setTagInfo() call, and thus, TagExtraInfo.setTagInfo() is
@@ -55,13 +55,13 @@ package javax.servlet.jsp.tagext;
public abstract class TagExtraInfo {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public TagExtraInfo() {
// NOOP by default
}
-
+
/**
* information on scripting variables defined by the tag associated with
* this TagExtraInfo instance.
@@ -76,7 +76,7 @@ public abstract class TagExtraInfo {
}
/**
- * Translation-time validation of the attributes.
+ * Translation-time validation of the attributes.
* Request-time attributes are indicated as such in the TagData parameter.
* Note that the preferred way to do validation is with the validate()
* method, since it can return more detailed information.
@@ -93,17 +93,17 @@ public abstract class TagExtraInfo {
/**
* Translation-time validation of the attributes.
* Request-time attributes are indicated as such in the TagData parameter.
- * Because of the higher quality validation messages possible,
- * this is the preferred way to do validation (although isValid()
- * still works).
- *
+ * Because of the higher quality validation messages possible,
+ * this is the preferred way to do validation (although isValid()
+ * still works).
+ *
* <p>JSP 2.0 and higher containers call validate() instead of isValid().
- * The default implementation of this method is to call isValid(). If
+ * The default implementation of this method is to call isValid(). If
* isValid() returns false, a generic ValidationMessage[] is returned
* indicating isValid() returned false.</p>
*
* @param data The TagData instance.
- * @return A null object, or zero length array if no errors, an
+ * @return A null object, or zero length array if no errors, an
* array of ValidationMessages otherwise.
* @since 2.0
*/
@@ -135,7 +135,7 @@ public abstract class TagExtraInfo {
public final TagInfo getTagInfo() {
return tagInfo;
}
-
+
// private data
private TagInfo tagInfo;
diff --git a/java/javax/servlet/jsp/tagext/TagFileInfo.java b/java/javax/servlet/jsp/tagext/TagFileInfo.java
index e825c91..dfa15f6 100644
--- a/java/javax/servlet/jsp/tagext/TagFileInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagFileInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -39,7 +39,7 @@ public class TagFileInfo {
* design error, which may be fixed in the future.
*
* @param name The unique action name of this tag
- * @param path Where to find the .tag file implementing this
+ * @param path Where to find the .tag file implementing this
* action, relative to the location of the TLD file.
* @param tagInfo The detailed information about this tag, as parsed
* from the directives in the tag file.
@@ -62,7 +62,7 @@ public class TagFileInfo {
/**
* Where to find the .tag file implementing this action.
*
- * @return The path of the tag file, relative to the TLD, or "." if
+ * @return The path of the tag file, relative to the TLD, or "." if
* the tag file was defined in an implicit tag file.
*/
public String getPath() {
@@ -70,7 +70,7 @@ public class TagFileInfo {
}
/**
- * Returns information about this tag, parsed from the directives
+ * Returns information about this tag, parsed from the directives
* in the tag file.
*
* @return a TagInfo object containing information about this tag
diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java b/java/javax/servlet/jsp/tagext/TagInfo.java
index 1bc1ff1..8c8784e 100644
--- a/java/javax/servlet/jsp/tagext/TagInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -23,7 +23,7 @@ package javax.servlet.jsp.tagext;
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
*
- *
+ *
*/
public class TagInfo {
@@ -46,12 +46,12 @@ public class TagInfo {
*/
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";
/**
@@ -93,7 +93,7 @@ public class TagInfo {
if (tagExtraInfo != null)
tagExtraInfo.setTagInfo(this);
}
-
+
/**
* Constructor for TagInfo from data in the JSP 1.2 format for TLD.
* This class is to be instantiated only from the TagLibrary code
@@ -144,7 +144,7 @@ public class TagInfo {
if (tagExtraInfo != null)
tagExtraInfo.setTagInfo(this);
}
-
+
/**
* Constructor for TagInfo from data in the JSP 2.0 format for TLD.
* This class is to be instantiated only from the TagLibrary code
@@ -243,7 +243,7 @@ public class TagInfo {
}
/**
- * Translation-time validation of the attributes.
+ * Translation-time validation of the attributes.
* This is a convenience method on the associated TagExtraInfo class.
*
* @param data The translation-time TagData instance.
@@ -276,7 +276,7 @@ public class TagInfo {
/**
* Set the instance for extra tag information.
- *
+ *
* @param tei the TagExtraInfo instance
*/
public void setTagExtraInfo(TagExtraInfo tei) {
@@ -286,7 +286,7 @@ public class TagInfo {
/**
* The instance (if any) for extra tag information.
- *
+ *
* @return The TagExtraInfo instance, if any.
*/
public TagExtraInfo getTagExtraInfo() {
@@ -299,7 +299,7 @@ public class TagInfo {
*
* @return The name of the tag handler class.
*/
-
+
public String getTagClassName() {
return tagClassName;
}
@@ -321,7 +321,7 @@ public class TagInfo {
/**
* The information string for the tag.
*
- * @return the info string, or null if
+ * @return the info string, or null if
* not defined
*/
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
index 7e78658..79eb9c2 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
@@ -27,7 +27,7 @@ public abstract class TagLibraryInfo {
/**
* Constructor. This will invoke the constructors for TagInfo, and
* TagAttributeInfo after parsing the TLD file.
- *
+ *
* @param prefix
* the prefix actually used by the taglib directive
* @param uri
@@ -43,7 +43,7 @@ public abstract class TagLibraryInfo {
/**
* The value of the uri attribute from the taglib directive for this
* library.
- *
+ *
* @return the value of the uri attribute
*/
public String getURI() {
@@ -52,7 +52,7 @@ public abstract class TagLibraryInfo {
/**
* The prefix assigned to this taglib from the taglib directive
- *
+ *
* @return the prefix assigned to this taglib from the taglib directive
*/
public String getPrefixString() {
@@ -65,7 +65,7 @@ public abstract class TagLibraryInfo {
* The preferred short name (prefix) as indicated in the TLD. This may be
* used by authoring tools as the preferred prefix to use when creating an
* taglib directive for this library.
- *
+ *
* @return the preferred short name for the library
*/
public String getShortName() {
@@ -76,7 +76,7 @@ public abstract class TagLibraryInfo {
* The "reliable" URN indicated in the TLD (the uri element). This may be
* used by authoring tools as a global identifier to use when creating a
* taglib directive for this library.
- *
+ *
* @return a reliable URN to a TLD like this
*/
public String getReliableURN() {
@@ -85,7 +85,7 @@ public abstract class TagLibraryInfo {
/**
* Information (documentation) for this TLD.
- *
+ *
* @return the info string for this tag lib
*/
public String getInfoString() {
@@ -94,7 +94,7 @@ public abstract class TagLibraryInfo {
/**
* A string describing the required version of the JSP container.
- *
+ *
* @return the (minimal) required version of the JSP container.
* @see javax.servlet.jsp.JspEngineInfo
*/
@@ -104,7 +104,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tags that are defined in this tag library.
- *
+ *
* @return the TagInfo objects corresponding to the tags defined by this tag
* library, or a zero length array if this tag library defines no
* tags
@@ -115,7 +115,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tag files that are defined in this tag library.
- *
+ *
* @return the TagFileInfo objects corresponding to the tag files defined by
* this tag library, or a zero length array if this tag library
* defines no tags files
@@ -128,7 +128,7 @@ public abstract class TagLibraryInfo {
/**
* Get the TagInfo for a given tag name, looking through all the tags in
* this tag library.
- *
+ *
* @param shortname
* The short name (no prefix) of the tag
* @return the TagInfo for the tag with the specified short name, or null if
@@ -152,7 +152,7 @@ public abstract class TagLibraryInfo {
/**
* Get the TagFileInfo for a given tag name, looking through all the tag
* files in this tag library.
- *
+ *
* @param shortname
* The short name (no prefix) of the tag
* @return the TagFileInfo for the specified Tag file, or null if no Tag
@@ -176,7 +176,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the functions that are defined in this tag library.
- *
+ *
* @return the functions defined in this tag library, or a zero length array
* if the tag library defines no functions.
* @since 2.0
@@ -188,7 +188,7 @@ public abstract class TagLibraryInfo {
/**
* Get the FunctionInfo for a given function name, looking through all the
* functions in this tag library.
- *
+ *
* @param name
* The name (no prefix) of the function
* @return the FunctionInfo for the function with the given name, or null if
@@ -216,7 +216,7 @@ public abstract class TagLibraryInfo {
* If a tag library is imported more than once and bound to different
* prefixes, only the TagLibraryInfo bound to the first prefix must be
* included in the returned array.
- *
+ *
* @return Array of TagLibraryInfo objects representing the entire set of
* tag libraries (including this TagLibraryInfo) imported by taglib
* directives in the translation unit that references this
@@ -245,14 +245,14 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tag files that are defined in this tag library.
- *
+ *
* @since 2.0
*/
protected TagFileInfo[] tagFiles;
/**
* An array describing the functions that are defined in this tag library.
- *
+ *
* @since 2.0
*/
protected FunctionInfo[] functions;
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryValidator.java b/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
index 4217f39..0ed8d14 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.tagext;
import java.util.Map;
/**
- * Translation-time validator class for a JSP page.
+ * Translation-time validator class for a JSP page.
* A validator operates on the XML view associated with the JSP page.
*
* <p>
@@ -40,12 +40,12 @@ import java.util.Map;
* be invoked, where the first two arguments are the prefix
* and uri for this tag library in the XML View. The prefix is intended
* to make it easier to produce an error message. However, it is not
- * always accurate. In the case where a single URI is mapped to more
+ * always accurate. In the case where a single URI is mapped to more
* than one prefix in the XML view, the prefix of the first URI is provided.
- * Therefore, to provide high quality error messages in cases where the
- * tag elements themselves are checked, the prefix parameter should be
- * ignored and the actual prefix of the element should be used instead.
- * TagLibraryValidators should always use the uri to identify elements
+ * Therefore, to provide high quality error messages in cases where the
+ * tag elements themselves are checked, the prefix parameter should be
+ * ignored and the actual prefix of the element should be used instead.
+ * TagLibraryValidators should always use the uri to identify elements
* as belonging to the tag library, not the prefix.
*
* <p>
@@ -73,7 +73,7 @@ import java.util.Map;
* of an error.
*
* <p>
- * The actual prefix of the <code>id</code> attribute may or may not be
+ * The actual prefix of the <code>id</code> attribute may or may not be
* <code>jsp</code> but it will always map to the namespace
* <code>http://java.sun.com/JSP/Page</code>. A TagLibraryValidator
* implementation must rely on the uri, not the prefix, of the <code>id</code>
@@ -83,13 +83,13 @@ import java.util.Map;
public abstract class TagLibraryValidator {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public TagLibraryValidator() {
// NOOP by default
}
-
+
/**
* Set the init data in the TLD for this validator.
* Parameter names are keys, and parameter values are the values.
@@ -118,15 +118,15 @@ public abstract class TagLibraryValidator {
* the method should return an array of ValidationMessage objects.
* An array of length zero is also interpreted as no errors.
*
- * @param prefix the first prefix with which the tag library is
- * associated, in the XML view. Note that some tags may use
+ * @param prefix the first prefix with which the tag library is
+ * associated, in the XML view. Note that some tags may use
* a different prefix if the namespace is redefined.
* @param uri the tag library's unique identifier
* @param page the JspData page object
* @return A null object, or zero length array if no errors, an array
* of ValidationMessages otherwise.
*/
- public ValidationMessage[] validate(String prefix, String uri,
+ public ValidationMessage[] validate(String prefix, String uri,
PageData page) {
return null;
}
diff --git a/java/javax/servlet/jsp/tagext/TagSupport.java b/java/javax/servlet/jsp/tagext/TagSupport.java
index 4355e71..9a8934d 100644
--- a/java/javax/servlet/jsp/tagext/TagSupport.java
+++ b/java/javax/servlet/jsp/tagext/TagSupport.java
@@ -34,7 +34,7 @@ import javax.servlet.jsp.PageContext;
* facilitate coordination among cooperating tags.
*
* <p> Many tag handlers will extend TagSupport and only redefine a
- * few methods.
+ * few methods.
*/
public class TagSupport implements IterationTag, Serializable {
@@ -66,7 +66,7 @@ public class TagSupport implements IterationTag, Serializable {
* should adhere to that constraint. Specifically, the Class
* passed to findAncestorWithClass should be a subtype of the
* observable type.
- *
+ *
*
* @param from The instance from where to start looking.
* @param klass The subclass of Tag or interface to be matched
diff --git a/java/javax/servlet/jsp/tagext/TagVariableInfo.java b/java/javax/servlet/jsp/tagext/TagVariableInfo.java
index 87a7540..70ac7bf 100644
--- a/java/javax/servlet/jsp/tagext/TagVariableInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagVariableInfo.java
@@ -26,7 +26,7 @@ public class TagVariableInfo {
/**
* Constructor for TagVariableInfo.
- *
+ *
* @param nameGiven
* value of <name-given>
* @param nameFromAttribute
@@ -49,7 +49,7 @@ public class TagVariableInfo {
/**
* The body of the <name-given> element.
- *
+ *
* @return The variable name as a constant
*/
public String getNameGiven() {
@@ -61,7 +61,7 @@ public class TagVariableInfo {
* an attribute whose (translation-time) value will give the name of the
* variable. One of <name-given> or <name-from-attribute> is
* required.
- *
+ *
* @return The attribute whose value defines the variable name
*/
public String getNameFromAttribute() {
@@ -70,7 +70,7 @@ public class TagVariableInfo {
/**
* The body of the <variable-class> element.
- *
+ *
* @return The name of the class of the variable or 'java.lang.String' if
* not defined in the TLD.
*/
@@ -80,7 +80,7 @@ public class TagVariableInfo {
/**
* The body of the <declare> element.
- *
+ *
* @return Whether the variable is to be declared or not. If not defined in
* the TLD, 'true' will be returned.
*/
@@ -90,7 +90,7 @@ public class TagVariableInfo {
/**
* The body of the <scope> element.
- *
+ *
* @return The scope to give the variable. NESTED scope will be returned if
* not defined in the TLD.
*/
diff --git a/java/javax/servlet/jsp/tagext/TryCatchFinally.java b/java/javax/servlet/jsp/tagext/TryCatchFinally.java
index 64621f0..46b0d4e 100644
--- a/java/javax/servlet/jsp/tagext/TryCatchFinally.java
+++ b/java/javax/servlet/jsp/tagext/TryCatchFinally.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
@@ -33,7 +33,7 @@ package javax.servlet.jsp.tagext;
* h.setPageContext(pc); // initialize as desired
* h.setParent(null);
* h.setFoo("foo");
- *
+ *
* // tag invocation protocol; see Tag.java
* try {
* doStartTag()...
@@ -46,7 +46,7 @@ package javax.servlet.jsp.tagext;
* // restore data invariants and release per-invocation resources
* h.doFinally();
* }
- *
+ *
* ... other invocations perhaps with some new setters
* ...
* h.release(); // release long-term resources
@@ -72,10 +72,10 @@ public interface TryCatchFinally {
* condition.
*
* @param t The throwable exception navigating through this tag.
- * @throws Throwable if the exception is to be rethrown further up
+ * @throws Throwable if the exception is to be rethrown further up
* the nest chain.
*/
-
+
void doCatch(Throwable t) throws Throwable;
/**
diff --git a/java/javax/servlet/jsp/tagext/ValidationMessage.java b/java/javax/servlet/jsp/tagext/ValidationMessage.java
index 9859074..4c0b34c 100644
--- a/java/javax/servlet/jsp/tagext/ValidationMessage.java
+++ b/java/javax/servlet/jsp/tagext/ValidationMessage.java
@@ -42,7 +42,7 @@ public class ValidationMessage {
* element, or if no jsp:id attributes were passed on. If non-null, the
* value of id must be the value of a jsp:id attribute for the PageData
* passed into the validate() method.
- *
+ *
* @param id
* Either null, or the value of a jsp:id attribute.
* @param message
@@ -55,7 +55,7 @@ public class ValidationMessage {
/**
* Get the jsp:id. Null means that there is no information available.
- *
+ *
* @return The jsp:id information.
*/
public String getId() {
@@ -64,7 +64,7 @@ public class ValidationMessage {
/**
* Get the localized validation message.
- *
+ *
* @return A validation message
*/
public String getMessage() {
diff --git a/java/javax/servlet/jsp/tagext/VariableInfo.java b/java/javax/servlet/jsp/tagext/VariableInfo.java
index 55994fc..d71032f 100644
--- a/java/javax/servlet/jsp/tagext/VariableInfo.java
+++ b/java/javax/servlet/jsp/tagext/VariableInfo.java
@@ -187,7 +187,7 @@ public class VariableInfo {
/**
* Constructor These objects can be created (at translation time) by the
* TagExtraInfo instances.
- *
+ *
* @param varName
* The name of the scripting variable
* @param className
@@ -210,7 +210,7 @@ public class VariableInfo {
/**
* Returns the name of the scripting variable.
- *
+ *
* @return the name of the scripting variable
*/
public String getVarName() {
@@ -219,7 +219,7 @@ public class VariableInfo {
/**
* Returns the type of this variable.
- *
+ *
* @return the type of this variable
*/
public String getClassName() {
@@ -229,7 +229,7 @@ public class VariableInfo {
/**
* Returns whether this is a new variable. If so, in some languages this
* will require a declaration.
- *
+ *
* @return whether this is a new variable.
*/
public boolean getDeclare() {
@@ -238,7 +238,7 @@ public class VariableInfo {
/**
* Returns the lexical scope of the variable.
- *
+ *
* @return the lexical scope of the variable, either AT_BEGIN, AT_END, or
* NESTED.
* @see #AT_BEGIN
diff --git a/java/javax/servlet/jsp/tagext/package.html b/java/javax/servlet/jsp/tagext/package.html
index 62c5e89..51bad0a 100644
--- a/java/javax/servlet/jsp/tagext/package.html
+++ b/java/javax/servlet/jsp/tagext/package.html
@@ -29,10 +29,10 @@ mechanism for the description of tag libraries.
A JSP tag library contains
<ul>
<li>A Tag Library Descriptor</li>
-<li>A number of Tag Files or Tag handler classes defining
+<li>A number of Tag Files or Tag handler classes defining
request-time behavior</li>
<li>Additional classes and resources used at runtime</li>
-<li>Possibly some additional classes to provide extra translation
+<li>Possibly some additional classes to provide extra translation
information</li>
</ul>
<p>
diff --git a/java/javax/servlet/resources/XMLSchema.dtd b/java/javax/servlet/resources/XMLSchema.dtd
index f4ff5bf..5d215ee 100644
--- a/java/javax/servlet/resources/XMLSchema.dtd
+++ b/java/javax/servlet/resources/XMLSchema.dtd
@@ -146,7 +146,7 @@
because at the Infoset level where schemas operate,
xmlns(:prefix) is NOT an attribute! -->
<!-- The declaration of xmlns is a convenience for schema authors -->
-
+
<!-- The id attribute here and below is for use in external references
from non-schemas using simple fragment identifiers.
It is NOT used for schema-to-schema reference, internal or
@@ -190,7 +190,7 @@
id ID #IMPLIED
%simpleContentAttrs;>
-<!-- restriction should use the simple branch from part2, not the
+<!-- restriction should use the simple branch from part2, not the
one defined above; extension should have no particle -->
<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
@@ -230,7 +230,7 @@
<!-- default and fixed are mutually exclusive -->
<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group;
+<!ATTLIST %group;
name %NCName; #IMPLIED
ref %QName; #IMPLIED
minOccurs %nonNegativeInteger; #IMPLIED
diff --git a/java/javax/servlet/resources/datatypes.dtd b/java/javax/servlet/resources/datatypes.dtd
index 2ae0de4..b8b4d51 100644
--- a/java/javax/servlet/resources/datatypes.dtd
+++ b/java/javax/servlet/resources/datatypes.dtd
@@ -102,7 +102,7 @@
"%pattern; | %enumeration; | %whiteSpace; | %length; |
%maxLength; | %minLength;">
<!ENTITY % facet "%ordered; | %unordered;">
-<!ENTITY % facetAttr
+<!ENTITY % facetAttr
"value CDATA #REQUIRED
id ID #IMPLIED">
<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
diff --git a/java/javax/servlet/resources/javaee_6.xsd b/java/javax/servlet/resources/javaee_6.xsd
index 9ce6da6..b516350 100644
--- a/java/javax/servlet/resources/javaee_6.xsd
+++ b/java/javax/servlet/resources/javaee_6.xsd
@@ -9,9 +9,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -21,7 +21,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -31,9 +31,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -45,7 +45,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -62,20 +62,20 @@
The following definitions that appear in the common
shareable schema(s) of Java EE deployment descriptors should be
interpreted with respect to the context they are included:
-
+
Deployment Component may indicate one of the following:
java ee application;
application client;
web application;
enterprise bean;
- resource adapter;
-
+ resource adapter;
+
Deployment File may indicate one of the following:
ear file;
war file;
jar file;
rar file;
-
+
</xsd:documentation>
</xsd:annotation>
@@ -90,10 +90,10 @@
This group keeps the usage of the contained description related
elements consistent across Java EE deployment descriptors.
-
+
All elements may occur multiple times with different languages,
to support localization of the content.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -118,7 +118,7 @@
This group keeps the usage of the contained JNDI environment
reference elements consistent across Java EE deployment descriptors.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -176,7 +176,7 @@
This group collects elements that are common to most
JNDI resource elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -188,7 +188,7 @@
<xsd:documentation>
The JNDI name to be looked up to resolve a resource reference.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -202,7 +202,7 @@
This group collects elements that are common to all the
JNDI resource elements. It does not include the lookup-name
element, that is only applicable to some resource elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -221,13 +221,13 @@
names to names of resources known to the application
server. This mapped name is often a global JNDI name,
but may be a name of any form.
-
+
Application servers are not required to support any
particular form or type of mapped name, nor the ability
to use mapped names. The mapped name is
product-dependent and often installation-dependent. No
use of a mapped name is portable.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -246,7 +246,7 @@
<xsd:documentation>
Configuration of a DataSource.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -257,7 +257,7 @@
<xsd:documentation>
Description of this DataSource.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -268,7 +268,7 @@
The name element specifies the JNDI name of the
data source being defined.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -280,7 +280,7 @@
DataSource, XADataSource or ConnectionPoolDataSource
implementation class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -291,7 +291,7 @@
<xsd:documentation>
Database server name.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -302,7 +302,7 @@
<xsd:documentation>
Port number where a server is listening for requests.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -313,7 +313,7 @@
<xsd:documentation>
Name of a database on a server.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -328,7 +328,7 @@
such as <code>serverName</code>, <code>databaseName</code>
and <code>portNumber</code>, the more specific properties will
take precedence and <code>url</code> will be ignored.
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -340,7 +340,7 @@
<xsd:documentation>
User name to use for connection authentication.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -351,7 +351,7 @@
<xsd:documentation>
Password to use for connection authentication.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -364,7 +364,7 @@
JDBC DataSource property. This may be a vendor-specific
property or a less commonly used DataSource property.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -376,7 +376,7 @@
Sets the maximum time in seconds that this data source
will wait while attempting to connect to a database.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -388,7 +388,7 @@
Set to false if connections should not participate in
transactions.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -399,7 +399,7 @@
<xsd:documentation>
Isolation level for connections.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -411,7 +411,7 @@
Number of connections that should be created when a
connection pool is initialized.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -423,7 +423,7 @@
Maximum number of connections that should be concurrently
allocated for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -435,7 +435,7 @@
Minimum number of connections that should be concurrently
allocated for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -448,7 +448,7 @@
The number of seconds that a physical connection should
remain unused in the pool before the connection is
closed for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -460,7 +460,7 @@
The total number of statements that a connection pool
should keep open.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -485,10 +485,10 @@
tools used by such a Deployment File consumer will display
the description when processing the parent element that
contains the description.
-
+
The lang attribute defines the language that the
- description is provided in. The default value is "en" (English).
-
+ description is provided in. The default value is "en" (English).
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -503,8 +503,8 @@
<xsd:documentation>
This type defines a dewey decimal that is used
- to describe versions of documents.
-
+ to describe versions of documents.
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -522,16 +522,16 @@
The display-name type contains a short name that is intended
to be displayed by tools. It is used by display-name
elements. The display name need not be unique.
-
- Example:
-
+
+ Example:
+
...
<display-name xml:lang="en">
Employee Self Service
</display-name>
-
- The value of the xml:lang attribute is "en" (English) by default.
-
+
+ The value of the xml:lang attribute is "en" (English) by default.
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -552,11 +552,11 @@
The ejb-linkType is used by ejb-link
elements in the ejb-ref or ejb-local-ref elements to specify
that an EJB reference is linked to enterprise bean.
-
+
The value of the ejb-link element must be the ejb-name of an
enterprise bean in the same ejb-jar file or in another ejb-jar
- file in the same Java EE application unit.
-
+ file in the same Java EE application unit.
+
Alternatively, the name in the ejb-link element may be
composed of a path name specifying the ejb-jar containing the
referenced enterprise bean with the ejb-name of the target
@@ -565,13 +565,13 @@
Deployment Component that is referencing the enterprise
bean. This allows multiple enterprise beans with the same
ejb-name to be uniquely identified.
-
+
Examples:
-
+
<ejb-link>EmployeeRecord</ejb-link>
-
+
<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -591,22 +591,22 @@
the declaration of a reference to an enterprise bean's local
home or to the local business interface of a 3.0 bean.
The declaration consists of:
-
+
- an optional description
- - the EJB reference name used in the code of the Deployment
+ - the EJB reference name used in the code of the Deployment
Component that's referencing the enterprise bean.
- the optional expected type of the referenced enterprise bean
- - the optional expected local interface of the referenced
- enterprise bean or the local business interface of the
+ - the optional expected local interface of the referenced
+ enterprise bean or the local business interface of the
referenced enterprise bean.
- - the optional expected local home interface of the referenced
+ - the optional expected local home interface of the referenced
enterprise bean. Not applicable if this ejb-local-ref refers
to the local business interface of a 3.0 bean.
- - optional ejb-link information, used to specify the
+ - optional ejb-link information, used to specify the
referenced enterprise bean
- - optional elements to define injection of the named enterprise
+ - optional elements to define injection of the named enterprise
bean into a component field or property.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -646,13 +646,13 @@
Deployment Component's environment and is relative to the
java:comp/env context. The name must be unique within the
Deployment Component.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
Example:
-
+
<ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -670,25 +670,25 @@
The ejb-refType is used by ejb-ref elements for the
declaration of a reference to an enterprise bean's home or
- to the remote business interface of a 3.0 bean.
+ to the remote business interface of a 3.0 bean.
The declaration consists of:
-
+
- an optional description
- the EJB reference name used in the code of
the Deployment Component that's referencing the enterprise
- bean.
+ bean.
- the optional expected type of the referenced enterprise bean
- the optional remote interface of the referenced enterprise bean
- or the remote business interface of the referenced enterprise
+ or the remote business interface of the referenced enterprise
bean
- - the optional expected home interface of the referenced
+ - the optional expected home interface of the referenced
enterprise bean. Not applicable if this ejb-ref
refers to the remote business interface of a 3.0 bean.
- optional ejb-link information, used to specify the
referenced enterprise bean
- optional elements to define injection of the named enterprise
bean into a component field or property
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -725,13 +725,13 @@
The ejb-ref-typeType contains the expected type of the
referenced enterprise bean.
-
+
The ejb-ref-type designates a value
that must be one of the following:
-
+
Entity
Session
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -750,8 +750,8 @@
<xsd:documentation>
This type is used to designate an empty
- element when used.
-
+ element when used.
+
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
@@ -770,21 +770,21 @@
description, the name of the environment entry, a type
(optional if the value is injected, otherwise required), and
an optional value.
-
+
It also includes optional elements to define injection of
the named resource into fields or JavaBeans properties.
-
+
If a value is not specified and injection is requested,
no injection will occur and no entry of the specified name
will be created. This allows an initial value to be
specified in the source code without being incorrectly
changed when no override has been specified.
-
+
If a value is not specified and no injection is requested,
- a value must be supplied during deployment.
-
+ a value must be supplied during deployment.
+
This type is used by env-entry elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -800,15 +800,15 @@
The env-entry-name element contains the name of a
Deployment Component's environment entry. The name
is a JNDI name relative to the java:comp/env
- context. The name must be unique within a
+ context. The name must be unique within a
Deployment Component. The uniqueness
constraints must be defined within the declared
context.
-
+
Example:
-
+
<env-entry-name>minAmount</env-entry-name>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -825,11 +825,11 @@
be omitted, or must match the type of the injection
target. If no injection target is specified, the type
is required.
-
+
Example:
-
+
<env-entry-type>java.lang.Integer</env-entry-type>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -846,11 +846,11 @@
constructor of the specified type that takes a
single String parameter, or for java.lang.Character,
a single character.
-
+
Example:
-
+
<env-entry-value>100.00</env-entry-value>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -871,9 +871,9 @@
This type contains the fully-qualified Java type of the
environment entry value that is expected by the
application's code.
-
+
The following are the legal values of env-entry-type-valuesType:
-
+
java.lang.Boolean
java.lang.Byte
java.lang.Character
@@ -885,13 +885,13 @@
java.lang.Double
java.lang.Class
any enumeration type (i.e. a subclass of java.lang.Enum)
-
+
Examples:
-
+
<env-entry-type>java.lang.Boolean</env-entry-type>
<env-entry-type>java.lang.Class</env-entry-type>
<env-entry-type>com.example.Color</env-entry-type>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -913,7 +913,7 @@
of name used in Class.forName(). Tools that need the
canonical name (the name used in source code) will need
to convert this binary name to the canonical name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -929,9 +929,9 @@
<xsd:documentation>
This type defines four different values which can designate
- boolean values. This includes values yes and no which are
+ boolean values. This includes values yes and no which are
not designated by xsd:boolean
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -954,12 +954,12 @@
The icon type contains small-icon and large-icon elements
that specify the file names for small and large GIF, JPEG,
or PNG icon images used to represent the parent element in a
- GUI tool.
-
+ GUI tool.
+
The xml:lang attribute defines the language that the
icon file names are provided in. Its value is "en" (English)
- by default.
-
+ by default.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
... 51646 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org