From 4e61ff934640218226430facab7eb4de024fc780 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 21 Oct 2006 23:30:39 +0000 Subject: [PATCH] Update license header in TC6 trunk to comply with: http://www.apache.org/legal/src-headers.html#headers It does compile but I need to check the commit message carefully to ensure the script hasn't changed anything it shouldn't have done. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@466609 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/annotation/Generated.java | 11 +- java/javax/annotation/PostConstruct.java | 11 +- java/javax/annotation/PreDestroy.java | 11 +- java/javax/annotation/Resource.java | 11 +- java/javax/annotation/Resources.java | 11 +- java/javax/annotation/security/DeclareRoles.java | 11 +- java/javax/annotation/security/DenyAll.java | 11 +- java/javax/annotation/security/PermitAll.java | 11 +- java/javax/annotation/security/RolesAllowed.java | 11 +- java/javax/annotation/security/RunAs.java | 11 +- java/javax/ejb/EJB.java | 11 +- java/javax/ejb/EJBs.java | 11 +- java/javax/el/ArrayELResolver.java | 11 +- java/javax/el/BeanELResolver.java | 11 +- java/javax/el/CompositeELResolver.java | 11 +- java/javax/el/ELContext.java | 11 +- java/javax/el/ELContextEvent.java | 11 +- java/javax/el/ELContextListener.java | 11 +- java/javax/el/ELException.java | 11 +- java/javax/el/ELResolver.java | 11 +- java/javax/el/Expression.java | 11 +- java/javax/el/ExpressionFactory.java | 11 +- java/javax/el/FunctionMapper.java | 11 +- java/javax/el/ListELResolver.java | 11 +- java/javax/el/LocalStrings.properties | 11 +- java/javax/el/MapELResolver.java | 11 +- java/javax/el/MethodExpression.java | 11 +- java/javax/el/MethodInfo.java | 11 +- java/javax/el/MethodNotFoundException.java | 11 +- java/javax/el/PropertyNotFoundException.java | 11 +- java/javax/el/PropertyNotWritableException.java | 11 +- java/javax/el/ResourceBundleELResolver.java | 11 +- java/javax/el/ValueExpression.java | 11 +- java/javax/el/VariableMapper.java | 11 +- java/javax/persistence/PersistenceContext.java | 11 +- java/javax/persistence/PersistenceContexts.java | 11 +- java/javax/persistence/PersistenceUnit.java | 11 +- java/javax/persistence/PersistenceUnits.java | 11 +- java/javax/servlet/Filter.java | 11 +- java/javax/servlet/FilterChain.java | 11 +- java/javax/servlet/FilterConfig.java | 11 +- java/javax/servlet/GenericServlet.java | 11 +- java/javax/servlet/LocalStrings.properties | 11 +- java/javax/servlet/LocalStrings_fr.properties | 11 +- java/javax/servlet/LocalStrings_ja.properties | 11 +- java/javax/servlet/RequestDispatcher.java | 11 +- java/javax/servlet/Servlet.java | 11 +- java/javax/servlet/ServletConfig.java | 11 +- java/javax/servlet/ServletContext.java | 11 +- .../servlet/ServletContextAttributeEvent.java | 11 +- .../servlet/ServletContextAttributeListener.java | 11 +- java/javax/servlet/ServletContextEvent.java | 11 +- java/javax/servlet/ServletContextListener.java | 11 +- java/javax/servlet/ServletException.java | 11 +- java/javax/servlet/ServletInputStream.java | 11 +- java/javax/servlet/ServletOutputStream.java | 11 +- java/javax/servlet/ServletRequest.java | 11 +- .../servlet/ServletRequestAttributeEvent.java | 11 +- .../servlet/ServletRequestAttributeListener.java | 11 +- java/javax/servlet/ServletRequestEvent.java | 11 +- java/javax/servlet/ServletRequestListener.java | 11 +- java/javax/servlet/ServletRequestWrapper.java | 11 +- java/javax/servlet/ServletResponse.java | 11 +- java/javax/servlet/ServletResponseWrapper.java | 11 +- java/javax/servlet/SingleThreadModel.java | 11 +- java/javax/servlet/UnavailableException.java | 11 +- java/javax/servlet/http/Cookie.java | 11 +- java/javax/servlet/http/HttpServlet.java | 11 +- java/javax/servlet/http/HttpServletRequest.java | 11 +- .../servlet/http/HttpServletRequestWrapper.java | 11 +- java/javax/servlet/http/HttpServletResponse.java | 11 +- .../servlet/http/HttpServletResponseWrapper.java | 11 +- java/javax/servlet/http/HttpSession.java | 11 +- .../http/HttpSessionActivationListener.java | 11 +- .../servlet/http/HttpSessionAttributeListener.java | 11 +- .../servlet/http/HttpSessionBindingEvent.java | 11 +- .../servlet/http/HttpSessionBindingListener.java | 11 +- java/javax/servlet/http/HttpSessionContext.java | 11 +- java/javax/servlet/http/HttpSessionEvent.java | 11 +- java/javax/servlet/http/HttpSessionListener.java | 11 +- java/javax/servlet/http/HttpUtils.java | 11 +- java/javax/servlet/http/LocalStrings.properties | 11 +- java/javax/servlet/http/LocalStrings_es.properties | 11 +- java/javax/servlet/http/LocalStrings_fr.properties | 11 +- java/javax/servlet/http/LocalStrings_ja.properties | 11 +- java/javax/servlet/jsp/ErrorData.java | 11 +- java/javax/servlet/jsp/HttpJspPage.java | 11 +- java/javax/servlet/jsp/JspApplicationContext.java | 11 +- java/javax/servlet/jsp/JspContext.java | 11 +- java/javax/servlet/jsp/JspEngineInfo.java | 11 +- java/javax/servlet/jsp/JspException.java | 11 +- java/javax/servlet/jsp/JspFactory.java | 11 +- java/javax/servlet/jsp/JspPage.java | 11 +- java/javax/servlet/jsp/JspTagException.java | 11 +- java/javax/servlet/jsp/JspWriter.java | 11 +- java/javax/servlet/jsp/PageContext.java | 11 +- java/javax/servlet/jsp/SkipPageException.java | 11 +- java/javax/servlet/jsp/el/ELException.java | 11 +- java/javax/servlet/jsp/el/ELParseException.java | 11 +- java/javax/servlet/jsp/el/Expression.java | 11 +- java/javax/servlet/jsp/el/ExpressionEvaluator.java | 11 +- java/javax/servlet/jsp/el/FunctionMapper.java | 11 +- .../servlet/jsp/el/ImplicitObjectELResolver.java | 11 +- .../servlet/jsp/el/ScopedAttributeELResolver.java | 11 +- java/javax/servlet/jsp/el/VariableResolver.java | 11 +- java/javax/servlet/jsp/resources/jsp_2_0.xsd | 11 +- java/javax/servlet/jsp/resources/jspxml.dtd | 11 +- java/javax/servlet/jsp/resources/jspxml.xsd | 11 +- .../jsp/resources/web-jsptaglibrary_1_1.dtd | 11 +- .../jsp/resources/web-jsptaglibrary_1_2.dtd | 11 +- .../jsp/resources/web-jsptaglibrary_2_0.xsd | 11 +- java/javax/servlet/jsp/tagext/BodyContent.java | 11 +- java/javax/servlet/jsp/tagext/BodyTag.java | 11 +- java/javax/servlet/jsp/tagext/BodyTagSupport.java | 11 +- .../servlet/jsp/tagext/DynamicAttributes.java | 11 +- java/javax/servlet/jsp/tagext/FunctionInfo.java | 11 +- java/javax/servlet/jsp/tagext/IterationTag.java | 11 +- java/javax/servlet/jsp/tagext/JspFragment.java | 11 +- java/javax/servlet/jsp/tagext/JspTag.java | 11 +- java/javax/servlet/jsp/tagext/PageData.java | 11 +- java/javax/servlet/jsp/tagext/SimpleTag.java | 11 +- .../javax/servlet/jsp/tagext/SimpleTagSupport.java | 11 +- java/javax/servlet/jsp/tagext/Tag.java | 11 +- java/javax/servlet/jsp/tagext/TagAdapter.java | 11 +- .../javax/servlet/jsp/tagext/TagAttributeInfo.java | 11 +- java/javax/servlet/jsp/tagext/TagData.java | 11 +- java/javax/servlet/jsp/tagext/TagExtraInfo.java | 11 +- java/javax/servlet/jsp/tagext/TagFileInfo.java | 11 +- java/javax/servlet/jsp/tagext/TagInfo.java | 11 +- java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 11 +- .../servlet/jsp/tagext/TagLibraryValidator.java | 11 +- java/javax/servlet/jsp/tagext/TagSupport.java | 11 +- java/javax/servlet/jsp/tagext/TagVariableInfo.java | 11 +- java/javax/servlet/jsp/tagext/TryCatchFinally.java | 11 +- .../servlet/jsp/tagext/ValidationMessage.java | 11 +- java/javax/servlet/jsp/tagext/VariableInfo.java | 11 +- java/javax/servlet/resources/datatypes.dtd | 11 +- java/javax/servlet/resources/j2ee_1_4.xsd | 11 +- .../servlet/resources/j2ee_web_services_1_1.xsd | 11 +- .../resources/j2ee_web_services_client_1_1.xsd | 11 +- java/javax/servlet/resources/web-app_2_2.dtd | 11 +- java/javax/servlet/resources/web-app_2_3.dtd | 11 +- java/javax/servlet/resources/web-app_2_4.xsd | 11 +- java/javax/servlet/resources/web-app_2_5.xsd | 11 +- java/javax/servlet/resources/xml.xsd | 11 +- java/javax/xml/ws/WebServiceRef.java | 11 +- java/javax/xml/ws/WebServiceRefs.java | 11 +- java/org/apache/AnnotationProcessor.java | 11 +- java/org/apache/PeriodicEventListener.java | 11 +- java/org/apache/catalina/Authenticator.java | 11 +- java/org/apache/catalina/Cluster.java | 11 +- java/org/apache/catalina/CometEvent.java | 11 +- java/org/apache/catalina/CometFilter.java | 11 +- java/org/apache/catalina/CometFilterChain.java | 11 +- java/org/apache/catalina/CometProcessor.java | 11 +- java/org/apache/catalina/Contained.java | 11 +- java/org/apache/catalina/Container.java | 11 +- java/org/apache/catalina/ContainerEvent.java | 11 +- java/org/apache/catalina/ContainerListener.java | 11 +- java/org/apache/catalina/ContainerServlet.java | 11 +- java/org/apache/catalina/Context.java | 11 +- java/org/apache/catalina/Engine.java | 11 +- java/org/apache/catalina/Globals.java | 11 +- java/org/apache/catalina/Group.java | 11 +- java/org/apache/catalina/Host.java | 11 +- java/org/apache/catalina/InstanceEvent.java | 11 +- java/org/apache/catalina/InstanceListener.java | 11 +- java/org/apache/catalina/Lifecycle.java | 11 +- java/org/apache/catalina/LifecycleEvent.java | 11 +- java/org/apache/catalina/LifecycleException.java | 11 +- java/org/apache/catalina/LifecycleListener.java | 11 +- java/org/apache/catalina/Loader.java | 11 +- java/org/apache/catalina/Manager.java | 11 +- java/org/apache/catalina/Pipeline.java | 11 +- java/org/apache/catalina/Realm.java | 11 +- java/org/apache/catalina/Role.java | 11 +- java/org/apache/catalina/Server.java | 11 +- java/org/apache/catalina/ServerFactory.java | 11 +- java/org/apache/catalina/Service.java | 11 +- java/org/apache/catalina/Session.java | 11 +- java/org/apache/catalina/SessionEvent.java | 11 +- java/org/apache/catalina/SessionListener.java | 11 +- java/org/apache/catalina/Store.java | 11 +- java/org/apache/catalina/User.java | 11 +- java/org/apache/catalina/UserDatabase.java | 11 +- java/org/apache/catalina/Valve.java | 11 +- java/org/apache/catalina/Wrapper.java | 11 +- .../apache/catalina/ant/AbstractCatalinaTask.java | 11 +- .../catalina/ant/BaseRedirectorHelperTask.java | 11 +- java/org/apache/catalina/ant/DeployTask.java | 11 +- java/org/apache/catalina/ant/InstallTask.java | 11 +- .../apache/catalina/ant/JKStatusUpdateTask.java | 11 +- java/org/apache/catalina/ant/JMXGetTask.java | 11 +- java/org/apache/catalina/ant/JMXQueryTask.java | 11 +- java/org/apache/catalina/ant/JMXSetTask.java | 11 +- java/org/apache/catalina/ant/ListTask.java | 11 +- java/org/apache/catalina/ant/ReloadTask.java | 11 +- java/org/apache/catalina/ant/RemoveTask.java | 11 +- java/org/apache/catalina/ant/ResourcesTask.java | 11 +- java/org/apache/catalina/ant/RolesTask.java | 11 +- java/org/apache/catalina/ant/ServerinfoTask.java | 11 +- java/org/apache/catalina/ant/SessionsTask.java | 11 +- java/org/apache/catalina/ant/StartTask.java | 11 +- java/org/apache/catalina/ant/StopTask.java | 11 +- java/org/apache/catalina/ant/UndeployTask.java | 11 +- java/org/apache/catalina/ant/ValidatorTask.java | 11 +- java/org/apache/catalina/ant/jmx/Arg.java | 11 +- .../catalina/ant/jmx/JMXAccessorCondition.java | 11 +- .../catalina/ant/jmx/JMXAccessorCreateTask.java | 11 +- .../ant/jmx/JMXAccessorEqualsCondition.java | 11 +- .../catalina/ant/jmx/JMXAccessorGetTask.java | 11 +- .../catalina/ant/jmx/JMXAccessorInvokeTask.java | 11 +- .../catalina/ant/jmx/JMXAccessorQueryTask.java | 11 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 11 +- .../apache/catalina/ant/jmx/JMXAccessorTask.java | 11 +- .../ant/jmx/JMXAccessorUnregisterTask.java | 11 +- .../catalina/authenticator/AuthenticatorBase.java | 11 +- .../catalina/authenticator/BasicAuthenticator.java | 11 +- .../apache/catalina/authenticator/Constants.java | 11 +- .../authenticator/DigestAuthenticator.java | 11 +- .../catalina/authenticator/FormAuthenticator.java | 11 +- .../authenticator/NonLoginAuthenticator.java | 11 +- .../catalina/authenticator/SSLAuthenticator.java | 11 +- .../catalina/authenticator/SavedRequest.java | 11 +- .../catalina/authenticator/SingleSignOn.java | 11 +- .../catalina/authenticator/SingleSignOnEntry.java | 11 +- .../catalina/connector/ClientAbortException.java | 11 +- .../apache/catalina/connector/CometEventImpl.java | 11 +- java/org/apache/catalina/connector/Connector.java | 11 +- java/org/apache/catalina/connector/Constants.java | 11 +- .../apache/catalina/connector/CoyoteAdapter.java | 11 +- .../catalina/connector/CoyoteInputStream.java | 11 +- .../catalina/connector/CoyoteOutputStream.java | 11 +- .../apache/catalina/connector/CoyotePrincipal.java | 11 +- .../apache/catalina/connector/CoyoteReader.java | 11 +- .../apache/catalina/connector/CoyoteWriter.java | 11 +- .../org/apache/catalina/connector/InputBuffer.java | 11 +- .../apache/catalina/connector/MapperListener.java | 11 +- .../apache/catalina/connector/OutputBuffer.java | 11 +- java/org/apache/catalina/connector/Request.java | 11 +- .../apache/catalina/connector/RequestFacade.java | 11 +- java/org/apache/catalina/connector/Response.java | 11 +- .../apache/catalina/connector/ResponseFacade.java | 11 +- .../apache/catalina/core/ApplicationContext.java | 11 +- .../catalina/core/ApplicationContextFacade.java | 11 +- .../catalina/core/ApplicationDispatcher.java | 11 +- .../catalina/core/ApplicationFilterChain.java | 11 +- .../catalina/core/ApplicationFilterConfig.java | 11 +- .../catalina/core/ApplicationFilterFactory.java | 11 +- .../catalina/core/ApplicationHttpRequest.java | 11 +- .../catalina/core/ApplicationHttpResponse.java | 11 +- .../apache/catalina/core/ApplicationRequest.java | 11 +- .../apache/catalina/core/ApplicationResponse.java | 11 +- .../apache/catalina/core/AprLifecycleListener.java | 11 +- java/org/apache/catalina/core/Constants.java | 11 +- java/org/apache/catalina/core/ContainerBase.java | 11 +- java/org/apache/catalina/core/DummyRequest.java | 11 +- java/org/apache/catalina/core/DummyResponse.java | 11 +- java/org/apache/catalina/core/JasperListener.java | 11 +- .../catalina/core/NamingContextListener.java | 11 +- java/org/apache/catalina/core/StandardContext.java | 11 +- .../apache/catalina/core/StandardContextValve.java | 11 +- java/org/apache/catalina/core/StandardEngine.java | 11 +- .../apache/catalina/core/StandardEngineValve.java | 11 +- java/org/apache/catalina/core/StandardHost.java | 11 +- .../apache/catalina/core/StandardHostValve.java | 11 +- .../org/apache/catalina/core/StandardPipeline.java | 11 +- java/org/apache/catalina/core/StandardServer.java | 11 +- java/org/apache/catalina/core/StandardService.java | 11 +- java/org/apache/catalina/core/StandardWrapper.java | 11 +- .../catalina/core/StandardWrapperFacade.java | 11 +- .../apache/catalina/core/StandardWrapperValve.java | 11 +- .../catalina/deploy/ApplicationParameter.java | 11 +- java/org/apache/catalina/deploy/ContextEjb.java | 11 +- .../apache/catalina/deploy/ContextEnvironment.java | 11 +- .../apache/catalina/deploy/ContextLocalEjb.java | 11 +- .../apache/catalina/deploy/ContextResource.java | 11 +- .../catalina/deploy/ContextResourceEnvRef.java | 11 +- .../catalina/deploy/ContextResourceLink.java | 11 +- .../org/apache/catalina/deploy/ContextService.java | 11 +- .../apache/catalina/deploy/ContextTransaction.java | 11 +- java/org/apache/catalina/deploy/ErrorPage.java | 11 +- java/org/apache/catalina/deploy/FilterDef.java | 11 +- java/org/apache/catalina/deploy/FilterMap.java | 11 +- java/org/apache/catalina/deploy/LoginConfig.java | 11 +- .../apache/catalina/deploy/MessageDestination.java | 11 +- .../catalina/deploy/MessageDestinationRef.java | 11 +- .../apache/catalina/deploy/NamingResources.java | 11 +- java/org/apache/catalina/deploy/ResourceBase.java | 11 +- .../apache/catalina/deploy/SecurityCollection.java | 11 +- .../apache/catalina/deploy/SecurityConstraint.java | 11 +- java/org/apache/catalina/ha/CatalinaCluster.java | 259 +- java/org/apache/catalina/ha/ClusterDeployer.java | 241 +- java/org/apache/catalina/ha/ClusterListener.java | 227 +- java/org/apache/catalina/ha/ClusterManager.java | 223 +- java/org/apache/catalina/ha/ClusterMessage.java | 67 +- java/org/apache/catalina/ha/ClusterRuleSet.java | 389 +-- java/org/apache/catalina/ha/ClusterSession.java | 79 +- java/org/apache/catalina/ha/ClusterValve.java | 79 +- java/org/apache/catalina/ha/Constants.java | 61 +- .../catalina/ha/context/ReplicatedContext.java | 249 +- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 1493 +++++----- .../catalina/ha/deploy/FileChangeListener.java | 47 +- .../org/apache/catalina/ha/deploy/FileMessage.java | 225 +- .../catalina/ha/deploy/FileMessageFactory.java | 621 ++-- .../apache/catalina/ha/deploy/UndeployMessage.java | 227 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 475 +-- .../apache/catalina/ha/session/BackupManager.java | 563 ++-- .../catalina/ha/session/ClusterManagerBase.java | 147 +- .../ha/session/ClusterSessionListener.java | 215 +- java/org/apache/catalina/ha/session/Constants.java | 63 +- .../apache/catalina/ha/session/DeltaManager.java | 3039 ++++++++++---------- .../apache/catalina/ha/session/DeltaRequest.java | 773 ++--- .../apache/catalina/ha/session/DeltaSession.java | 1503 +++++----- .../catalina/ha/session/JvmRouteBinderValve.java | 1087 +++---- .../session/JvmRouteSessionIDBinderListener.java | 333 +-- .../catalina/ha/session/ReplicatedSession.java | 571 ++-- .../catalina/ha/session/SerializablePrincipal.java | 385 +-- .../catalina/ha/session/SessionIDMessage.java | 257 +- .../apache/catalina/ha/session/SessionMessage.java | 207 +- .../catalina/ha/session/SessionMessageImpl.java | 315 +- .../ha/session/SimpleTcpReplicationManager.java | 1369 ++++----- java/org/apache/catalina/ha/tcp/Constants.java | 65 +- .../apache/catalina/ha/tcp/ReplicationValve.java | 1315 ++++----- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 1911 ++++++------ .../apache/catalina/ha/util/IDynamicProperty.java | 115 +- java/org/apache/catalina/loader/Constants.java | 11 +- java/org/apache/catalina/loader/Reloader.java | 11 +- java/org/apache/catalina/loader/ResourceEntry.java | 11 +- .../catalina/loader/StandardClassLoader.java | 11 +- .../catalina/loader/StandardClassLoaderMBean.java | 11 +- .../apache/catalina/loader/WebappClassLoader.java | 11 +- java/org/apache/catalina/loader/WebappLoader.java | 11 +- java/org/apache/catalina/manager/Constants.java | 11 +- .../catalina/manager/HTMLManagerServlet.java | 11 +- .../apache/catalina/manager/JMXProxyServlet.java | 11 +- .../apache/catalina/manager/ManagerServlet.java | 11 +- .../catalina/manager/StatusManagerServlet.java | 11 +- .../apache/catalina/manager/StatusTransformer.java | 11 +- .../apache/catalina/manager/host/Constants.java | 11 +- .../manager/host/HTMLHostManagerServlet.java | 11 +- .../catalina/manager/host/HostManagerServlet.java | 11 +- .../org/apache/catalina/mbeans/ClassNameMBean.java | 11 +- .../org/apache/catalina/mbeans/ConnectorMBean.java | 11 +- .../catalina/mbeans/ContextEnvironmentMBean.java | 11 +- .../catalina/mbeans/ContextResourceLinkMBean.java | 11 +- .../catalina/mbeans/ContextResourceMBean.java | 11 +- .../catalina/mbeans/DefaultContextMBean.java | 11 +- .../mbeans/GlobalResourcesLifecycleListener.java | 11 +- java/org/apache/catalina/mbeans/GroupMBean.java | 11 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 11 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 11 +- .../catalina/mbeans/MemoryUserDatabaseMBean.java | 11 +- .../catalina/mbeans/NamingResourcesMBean.java | 11 +- java/org/apache/catalina/mbeans/RoleMBean.java | 11 +- .../catalina/mbeans/ServerLifecycleListener.java | 11 +- .../catalina/mbeans/StandardContextMBean.java | 11 +- .../catalina/mbeans/StandardEngineMBean.java | 11 +- .../apache/catalina/mbeans/StandardHostMBean.java | 11 +- .../catalina/mbeans/StandardServerMBean.java | 11 +- .../catalina/mbeans/StandardServiceMBean.java | 11 +- java/org/apache/catalina/mbeans/UserMBean.java | 11 +- java/org/apache/catalina/realm/Constants.java | 11 +- .../org/apache/catalina/realm/DataSourceRealm.java | 11 +- .../apache/catalina/realm/GenericPrincipal.java | 11 +- .../apache/catalina/realm/JAASCallbackHandler.java | 11 +- .../catalina/realm/JAASMemoryLoginModule.java | 11 +- java/org/apache/catalina/realm/JAASRealm.java | 11 +- java/org/apache/catalina/realm/JDBCRealm.java | 11 +- java/org/apache/catalina/realm/JNDIRealm.java | 11 +- java/org/apache/catalina/realm/MemoryRealm.java | 11 +- java/org/apache/catalina/realm/MemoryRuleSet.java | 11 +- java/org/apache/catalina/realm/RealmBase.java | 11 +- .../apache/catalina/realm/UserDatabaseRealm.java | 11 +- .../catalina/security/SecurityClassLoad.java | 11 +- .../apache/catalina/security/SecurityConfig.java | 11 +- .../org/apache/catalina/security/SecurityUtil.java | 11 +- java/org/apache/catalina/servlets/CGIServlet.java | 11 +- java/org/apache/catalina/servlets/Constants.java | 11 +- .../apache/catalina/servlets/DefaultServlet.java | 11 +- .../catalina/servlets/InvokerHttpRequest.java | 11 +- .../apache/catalina/servlets/InvokerServlet.java | 11 +- .../apache/catalina/servlets/WebdavServlet.java | 11 +- java/org/apache/catalina/session/Constants.java | 11 +- java/org/apache/catalina/session/FileStore.java | 11 +- java/org/apache/catalina/session/JDBCStore.java | 11 +- java/org/apache/catalina/session/ManagerBase.java | 11 +- .../apache/catalina/session/PersistentManager.java | 11 +- .../catalina/session/PersistentManagerBase.java | 11 +- .../apache/catalina/session/StandardManager.java | 11 +- .../apache/catalina/session/StandardSession.java | 11 +- .../catalina/session/StandardSessionFacade.java | 11 +- java/org/apache/catalina/session/StoreBase.java | 11 +- .../catalina/ssi/ByteArrayServletOutputStream.java | 11 +- .../catalina/ssi/ResponseIncludeWrapper.java | 11 +- java/org/apache/catalina/startup/Bootstrap.java | 11 +- java/org/apache/catalina/startup/Catalina.java | 11 +- .../catalina/startup/CatalinaProperties.java | 11 +- .../catalina/startup/ClassLoaderFactory.java | 11 +- .../catalina/startup/ClusterRuleSetFactory.java | 11 +- .../catalina/startup/ConnectorCreateRule.java | 11 +- java/org/apache/catalina/startup/Constants.java | 11 +- .../org/apache/catalina/startup/ContextConfig.java | 11 +- .../apache/catalina/startup/ContextRuleSet.java | 11 +- .../startup/CopyParentClassLoaderRule.java | 11 +- .../apache/catalina/startup/DigesterFactory.java | 11 +- java/org/apache/catalina/startup/Embedded.java | 11 +- java/org/apache/catalina/startup/EngineConfig.java | 11 +- .../org/apache/catalina/startup/EngineRuleSet.java | 11 +- java/org/apache/catalina/startup/ExpandWar.java | 11 +- .../apache/catalina/startup/HomesUserDatabase.java | 11 +- java/org/apache/catalina/startup/HostConfig.java | 11 +- java/org/apache/catalina/startup/HostRuleSet.java | 11 +- .../catalina/startup/LifecycleListenerRule.java | 11 +- .../org/apache/catalina/startup/NamingRuleSet.java | 11 +- .../catalina/startup/PasswdUserDatabase.java | 11 +- .../catalina/startup/SetAllPropertiesRule.java | 11 +- .../catalina/startup/SetContextPropertiesRule.java | 11 +- .../apache/catalina/startup/SetNextNamingRule.java | 11 +- java/org/apache/catalina/startup/TldConfig.java | 11 +- java/org/apache/catalina/startup/TldRuleSet.java | 11 +- java/org/apache/catalina/startup/Tool.java | 11 +- java/org/apache/catalina/startup/UserConfig.java | 11 +- java/org/apache/catalina/startup/UserDatabase.java | 11 +- .../apache/catalina/startup/WebAnnotationSet.java | 11 +- java/org/apache/catalina/startup/WebRuleSet.java | 11 +- java/org/apache/catalina/tribes/ByteMessage.java | 203 +- java/org/apache/catalina/tribes/Channel.java | 693 ++--- .../apache/catalina/tribes/ChannelException.java | 323 +-- .../apache/catalina/tribes/ChannelInterceptor.java | 359 +-- .../apache/catalina/tribes/ChannelListener.java | 135 +- .../org/apache/catalina/tribes/ChannelMessage.java | 217 +- .../apache/catalina/tribes/ChannelReceiver.java | 149 +- java/org/apache/catalina/tribes/ChannelSender.java | 137 +- java/org/apache/catalina/tribes/Constants.java | 63 +- java/org/apache/catalina/tribes/ErrorHandler.java | 89 +- java/org/apache/catalina/tribes/Heartbeat.java | 65 +- .../org/apache/catalina/tribes/ManagedChannel.java | 155 +- java/org/apache/catalina/tribes/Member.java | 237 +- .../apache/catalina/tribes/MembershipListener.java | 87 +- .../apache/catalina/tribes/MembershipService.java | 269 +- .../apache/catalina/tribes/MessageListener.java | 85 +- java/org/apache/catalina/tribes/UniqueId.java | 141 +- .../catalina/tribes/group/ChannelCoordinator.java | 635 ++-- .../tribes/group/ChannelInterceptorBase.java | 343 +-- .../apache/catalina/tribes/group/GroupChannel.java | 1333 ++++----- .../catalina/tribes/group/InterceptorPayload.java | 67 +- .../org/apache/catalina/tribes/group/Response.java | 105 +- .../apache/catalina/tribes/group/RpcCallback.java | 89 +- .../apache/catalina/tribes/group/RpcChannel.java | 521 ++-- .../apache/catalina/tribes/group/RpcMessage.java | 233 +- .../interceptors/DomainFilterInterceptor.java | 11 +- .../interceptors/FragmentationInterceptor.java | 481 ++-- .../tribes/group/interceptors/GzipInterceptor.java | 199 +- .../interceptors/MessageDispatch15Interceptor.java | 11 +- .../interceptors/MessageDispatchInterceptor.java | 403 +-- .../group/interceptors/NonBlockingCoordinator.java | 1677 +++++------ .../group/interceptors/OrderInterceptor.java | 597 ++-- .../group/interceptors/TcpFailureDetector.java | 575 ++-- .../group/interceptors/ThroughputInterceptor.java | 239 +- .../interceptors/TwoPhaseCommitInterceptor.java | 295 +- java/org/apache/catalina/tribes/io/BufferPool.java | 187 +- .../catalina/tribes/io/BufferPool14Impl.java | 139 +- .../catalina/tribes/io/BufferPool15Impl.java | 125 +- .../org/apache/catalina/tribes/io/ChannelData.java | 713 ++--- .../tribes/io/DirectByteArrayOutputStream.java | 123 +- .../apache/catalina/tribes/io/ListenCallback.java | 81 +- .../apache/catalina/tribes/io/ObjectReader.java | 11 +- .../catalina/tribes/io/ReplicationStream.java | 233 +- .../org/apache/catalina/tribes/io/XByteBuffer.java | 1223 ++++---- .../catalina/tribes/membership/Constants.java | 79 +- .../catalina/tribes/membership/McastService.java | 1103 +++---- .../tribes/membership/McastServiceImpl.java | 797 ++--- .../catalina/tribes/membership/MemberImpl.java | 1193 ++++---- .../catalina/tribes/membership/Membership.java | 649 ++--- .../catalina/tribes/membership/StaticMember.java | 157 +- .../tribes/tipis/AbstractReplicatedMap.java | 2733 +++++++++--------- .../catalina/tribes/tipis/LazyReplicatedMap.java | 367 +-- .../catalina/tribes/tipis/ReplicatedMap.java | 233 +- .../catalina/tribes/tipis/ReplicatedMapEntry.java | 245 +- .../apache/catalina/tribes/tipis/Streamable.java | 119 +- .../catalina/tribes/transport/Constants.java | 85 +- .../catalina/tribes/transport/DataSender.java | 91 +- .../tribes/transport/MultiPointSender.java | 75 +- .../catalina/tribes/transport/PooledSender.java | 393 +-- .../catalina/tribes/transport/SenderState.java | 229 +- .../catalina/tribes/transport/ThreadPool.java | 11 +- .../catalina/tribes/transport/WorkerThread.java | 177 +- .../tribes/transport/bio/BioReplicationThread.java | 361 +-- .../tribes/transport/bio/util/FastQueue.java | 787 ++--- .../tribes/transport/bio/util/LinkObject.java | 215 +- .../bio/util/SingleRemoveSynchronizedAddLock.java | 507 ++-- .../catalina/tribes/transport/nio/NioReceiver.java | 11 +- .../tribes/transport/nio/NioReplicationThread.java | 11 +- .../catalina/tribes/transport/nio/NioSender.java | 659 ++--- .../tribes/transport/nio/ParallelNioSender.java | 575 ++-- .../tribes/transport/nio/PooledParallelSender.java | 167 +- java/org/apache/catalina/tribes/util/Arrays.java | 439 +-- java/org/apache/catalina/tribes/util/Logs.java | 57 +- .../apache/catalina/tribes/util/StringManager.java | 505 ++-- .../apache/catalina/tribes/util/UUIDGenerator.java | 151 +- java/org/apache/catalina/users/AbstractGroup.java | 11 +- java/org/apache/catalina/users/AbstractRole.java | 11 +- java/org/apache/catalina/users/AbstractUser.java | 11 +- java/org/apache/catalina/users/Constants.java | 11 +- java/org/apache/catalina/users/MemoryGroup.java | 11 +- java/org/apache/catalina/users/MemoryRole.java | 11 +- java/org/apache/catalina/users/MemoryUser.java | 11 +- .../apache/catalina/users/MemoryUserDatabase.java | 11 +- .../catalina/users/MemoryUserDatabaseFactory.java | 11 +- java/org/apache/catalina/util/Base64.java | 11 +- java/org/apache/catalina/util/CharsetMapper.java | 11 +- java/org/apache/catalina/util/CookieTools.java | 11 +- .../catalina/util/CustomObjectInputStream.java | 11 +- java/org/apache/catalina/util/DOMWriter.java | 11 +- java/org/apache/catalina/util/DateTool.java | 11 +- .../catalina/util/DefaultAnnotationProcessor.java | 11 +- java/org/apache/catalina/util/Enumerator.java | 11 +- java/org/apache/catalina/util/Extension.java | 11 +- .../apache/catalina/util/ExtensionValidator.java | 11 +- java/org/apache/catalina/util/FastDateFormat.java | 11 +- java/org/apache/catalina/util/HexUtils.java | 11 +- java/org/apache/catalina/util/IOTools.java | 11 +- java/org/apache/catalina/util/InstanceSupport.java | 11 +- .../org/apache/catalina/util/LifecycleSupport.java | 11 +- java/org/apache/catalina/util/MD5Encoder.java | 11 +- java/org/apache/catalina/util/MIME2Java.java | 11 +- .../org/apache/catalina/util/ManifestResource.java | 11 +- java/org/apache/catalina/util/ParameterMap.java | 11 +- java/org/apache/catalina/util/Queue.java | 11 +- java/org/apache/catalina/util/RequestUtil.java | 11 +- java/org/apache/catalina/util/ResourceSet.java | 11 +- java/org/apache/catalina/util/SchemaResolver.java | 11 +- java/org/apache/catalina/util/ServerInfo.java | 11 +- java/org/apache/catalina/util/Strftime.java | 11 +- java/org/apache/catalina/util/StringManager.java | 11 +- java/org/apache/catalina/util/StringParser.java | 11 +- java/org/apache/catalina/util/TomcatCSS.java | 11 +- java/org/apache/catalina/util/URL.java | 11 +- java/org/apache/catalina/util/URLEncoder.java | 11 +- java/org/apache/catalina/util/XMLWriter.java | 11 +- .../org/apache/catalina/valves/AccessLogValve.java | 11 +- .../valves/CometConnectionManagerValve.java | 11 +- java/org/apache/catalina/valves/Constants.java | 11 +- .../apache/catalina/valves/ErrorReportValve.java | 11 +- .../catalina/valves/ExtendedAccessLogValve.java | 11 +- .../catalina/valves/FastCommonAccessLogValve.java | 11 +- .../apache/catalina/valves/JDBCAccessLogValve.java | 11 +- .../apache/catalina/valves/PersistentValve.java | 11 +- .../apache/catalina/valves/RemoteAddrValve.java | 11 +- .../apache/catalina/valves/RemoteHostValve.java | 11 +- .../apache/catalina/valves/RequestDumperValve.java | 11 +- .../apache/catalina/valves/RequestFilterValve.java | 11 +- .../org/apache/catalina/valves/SemaphoreValve.java | 11 +- java/org/apache/catalina/valves/ValveBase.java | 11 +- java/org/apache/coyote/ActionCode.java | 11 +- java/org/apache/coyote/ActionHook.java | 11 +- java/org/apache/coyote/Adapter.java | 11 +- java/org/apache/coyote/Constants.java | 11 +- java/org/apache/coyote/InputBuffer.java | 11 +- java/org/apache/coyote/OutputBuffer.java | 11 +- java/org/apache/coyote/Processor.java | 11 +- java/org/apache/coyote/ProtocolHandler.java | 11 +- java/org/apache/coyote/Request.java | 11 +- java/org/apache/coyote/RequestGroupInfo.java | 11 +- java/org/apache/coyote/RequestInfo.java | 11 +- java/org/apache/coyote/Response.java | 11 +- java/org/apache/coyote/ajp/AjpAprProcessor.java | 11 +- java/org/apache/coyote/ajp/AjpAprProtocol.java | 11 +- java/org/apache/coyote/ajp/AjpMessage.java | 11 +- java/org/apache/coyote/ajp/AjpProcessor.java | 11 +- java/org/apache/coyote/ajp/AjpProtocol.java | 11 +- java/org/apache/coyote/ajp/Constants.java | 11 +- java/org/apache/coyote/http11/Constants.java | 11 +- .../apache/coyote/http11/Http11AprProcessor.java | 11 +- .../apache/coyote/http11/Http11AprProtocol.java | 11 +- .../apache/coyote/http11/Http11NioProcessor.java | 11 +- .../apache/coyote/http11/Http11NioProtocol.java | 11 +- java/org/apache/coyote/http11/Http11Processor.java | 11 +- java/org/apache/coyote/http11/Http11Protocol.java | 11 +- java/org/apache/coyote/http11/InputFilter.java | 11 +- .../coyote/http11/InternalAprInputBuffer.java | 11 +- .../coyote/http11/InternalAprOutputBuffer.java | 11 +- .../apache/coyote/http11/InternalInputBuffer.java | 11 +- .../coyote/http11/InternalNioInputBuffer.java | 11 +- .../coyote/http11/InternalNioOutputBuffer.java | 11 +- .../apache/coyote/http11/InternalOutputBuffer.java | 11 +- java/org/apache/coyote/http11/OutputFilter.java | 11 +- .../coyote/http11/filters/BufferedInputFilter.java | 11 +- .../coyote/http11/filters/ChunkedInputFilter.java | 11 +- .../coyote/http11/filters/ChunkedOutputFilter.java | 11 +- .../coyote/http11/filters/GzipOutputFilter.java | 11 +- .../coyote/http11/filters/IdentityInputFilter.java | 11 +- .../http11/filters/IdentityOutputFilter.java | 11 +- .../http11/filters/SavedRequestInputFilter.java | 11 +- .../coyote/http11/filters/VoidInputFilter.java | 11 +- .../coyote/http11/filters/VoidOutputFilter.java | 11 +- .../coyote/memory/MemoryProtocolHandler.java | 11 +- java/org/apache/el/ExpressionFactoryImpl.java | 11 +- java/org/apache/el/MethodExpressionImpl.java | 11 +- java/org/apache/el/MethodExpressionLiteral.java | 11 +- java/org/apache/el/ValueExpressionImpl.java | 11 +- java/org/apache/el/ValueExpressionLiteral.java | 11 +- java/org/apache/el/lang/ELArithmetic.java | 11 +- java/org/apache/el/lang/ELSupport.java | 11 +- java/org/apache/el/lang/EvaluationContext.java | 11 +- java/org/apache/el/lang/ExpressionBuilder.java | 11 +- java/org/apache/el/lang/FunctionMapperFactory.java | 11 +- java/org/apache/el/lang/FunctionMapperImpl.java | 11 +- java/org/apache/el/lang/VariableMapperFactory.java | 11 +- java/org/apache/el/lang/VariableMapperImpl.java | 11 +- java/org/apache/el/parser/ArithmeticNode.java | 11 +- java/org/apache/el/parser/BooleanNode.java | 11 +- java/org/apache/el/parser/ELParser.jjt | 11 +- java/org/apache/el/parser/Node.java | 11 +- java/org/apache/el/parser/NodeVisitor.java | 11 +- java/org/apache/el/util/MessageFactory.java | 11 +- java/org/apache/el/util/ReflectionUtil.java | 11 +- java/org/apache/jasper/Constants.java | 11 +- java/org/apache/jasper/EmbeddedServletOptions.java | 11 +- java/org/apache/jasper/JasperException.java | 11 +- java/org/apache/jasper/JspC.java | 11 +- java/org/apache/jasper/JspCompilationContext.java | 11 +- java/org/apache/jasper/Options.java | 11 +- java/org/apache/jasper/compiler/AntCompiler.java | 11 +- .../org/apache/jasper/compiler/BeanRepository.java | 11 +- java/org/apache/jasper/compiler/Collector.java | 11 +- java/org/apache/jasper/compiler/Compiler.java | 11 +- .../jasper/compiler/DefaultErrorHandler.java | 11 +- java/org/apache/jasper/compiler/Dumper.java | 11 +- .../apache/jasper/compiler/ELFunctionMapper.java | 11 +- java/org/apache/jasper/compiler/ELNode.java | 11 +- java/org/apache/jasper/compiler/ELParser.java | 11 +- .../apache/jasper/compiler/ErrorDispatcher.java | 11 +- java/org/apache/jasper/compiler/ErrorHandler.java | 11 +- java/org/apache/jasper/compiler/Generator.java | 11 +- .../jasper/compiler/ImplicitTagLibraryInfo.java | 11 +- java/org/apache/jasper/compiler/JDTCompiler.java | 11 +- java/org/apache/jasper/compiler/JasperTagInfo.java | 11 +- .../apache/jasper/compiler/JavacErrorDetail.java | 11 +- java/org/apache/jasper/compiler/JspConfig.java | 11 +- .../apache/jasper/compiler/JspDocumentParser.java | 11 +- java/org/apache/jasper/compiler/JspReader.java | 11 +- .../apache/jasper/compiler/JspRuntimeContext.java | 11 +- java/org/apache/jasper/compiler/JspUtil.java | 11 +- java/org/apache/jasper/compiler/Localizer.java | 11 +- java/org/apache/jasper/compiler/Mark.java | 11 +- java/org/apache/jasper/compiler/Node.java | 11 +- java/org/apache/jasper/compiler/PageDataImpl.java | 11 +- java/org/apache/jasper/compiler/PageInfo.java | 11 +- java/org/apache/jasper/compiler/Parser.java | 11 +- .../apache/jasper/compiler/ParserController.java | 11 +- .../apache/jasper/compiler/ScriptingVariabler.java | 11 +- java/org/apache/jasper/compiler/ServletWriter.java | 11 +- java/org/apache/jasper/compiler/SmapGenerator.java | 11 +- java/org/apache/jasper/compiler/SmapStratum.java | 11 +- java/org/apache/jasper/compiler/SmapUtil.java | 11 +- java/org/apache/jasper/compiler/TagConstants.java | 11 +- .../apache/jasper/compiler/TagFileProcessor.java | 11 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 11 +- .../apache/jasper/compiler/TagPluginManager.java | 11 +- java/org/apache/jasper/compiler/TextOptimizer.java | 11 +- .../apache/jasper/compiler/TldLocationsCache.java | 11 +- java/org/apache/jasper/compiler/Validator.java | 11 +- .../jasper/compiler/tagplugin/TagPlugin.java | 11 +- .../compiler/tagplugin/TagPluginContext.java | 11 +- java/org/apache/jasper/el/ELContextImpl.java | 11 +- java/org/apache/jasper/el/ELContextWrapper.java | 11 +- java/org/apache/jasper/el/ELResolverImpl.java | 11 +- .../apache/jasper/el/ExpressionEvaluatorImpl.java | 11 +- java/org/apache/jasper/el/ExpressionImpl.java | 11 +- java/org/apache/jasper/el/FunctionMapperImpl.java | 11 +- java/org/apache/jasper/el/JspELException.java | 11 +- java/org/apache/jasper/el/JspMethodExpression.java | 11 +- .../jasper/el/JspMethodNotFoundException.java | 11 +- .../jasper/el/JspPropertyNotFoundException.java | 11 +- .../jasper/el/JspPropertyNotWritableException.java | 11 +- java/org/apache/jasper/el/JspValueExpression.java | 11 +- .../org/apache/jasper/el/VariableResolverImpl.java | 11 +- .../apache/jasper/runtime/AnnotationHelper.java | 11 +- .../org/apache/jasper/runtime/BodyContentImpl.java | 11 +- java/org/apache/jasper/runtime/HttpJspBase.java | 11 +- .../jasper/runtime/JspApplicationContextImpl.java | 11 +- .../apache/jasper/runtime/JspContextWrapper.java | 11 +- java/org/apache/jasper/runtime/JspFactoryImpl.java | 11 +- .../apache/jasper/runtime/JspFragmentHelper.java | 11 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 11 +- .../apache/jasper/runtime/JspSourceDependent.java | 11 +- java/org/apache/jasper/runtime/JspWriterImpl.java | 11 +- .../org/apache/jasper/runtime/PageContextImpl.java | 11 +- .../jasper/runtime/PerThreadTagHandlerPool.java | 11 +- .../jasper/runtime/ProtectedFunctionMapper.java | 11 +- .../runtime/ServletResponseWrapperInclude.java | 11 +- java/org/apache/jasper/runtime/TagHandlerPool.java | 11 +- .../apache/jasper/security/SecurityClassLoad.java | 11 +- java/org/apache/jasper/security/SecurityUtil.java | 11 +- java/org/apache/jasper/servlet/JasperLoader.java | 11 +- .../apache/jasper/servlet/JspCServletContext.java | 11 +- java/org/apache/jasper/servlet/JspServlet.java | 11 +- .../apache/jasper/servlet/JspServletWrapper.java | 11 +- java/org/apache/jasper/tagplugins/jstl/Util.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Catch.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Choose.java | 11 +- .../jasper/tagplugins/jstl/core/ForEach.java | 11 +- .../jasper/tagplugins/jstl/core/ForTokens.java | 11 +- .../org/apache/jasper/tagplugins/jstl/core/If.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Import.java | 11 +- .../jasper/tagplugins/jstl/core/Otherwise.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Out.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Param.java | 11 +- .../jasper/tagplugins/jstl/core/Redirect.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Remove.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Set.java | 11 +- .../apache/jasper/tagplugins/jstl/core/Url.java | 11 +- .../apache/jasper/tagplugins/jstl/core/When.java | 11 +- java/org/apache/jasper/util/Enumerator.java | 11 +- java/org/apache/jasper/util/FastDateFormat.java | 11 +- java/org/apache/jasper/util/Queue.java | 11 +- java/org/apache/jasper/util/SimplePool.java | 11 +- java/org/apache/jasper/util/SystemLogHandler.java | 11 +- java/org/apache/jasper/xmlparser/ASCIIReader.java | 11 +- java/org/apache/jasper/xmlparser/EncodingMap.java | 11 +- java/org/apache/jasper/xmlparser/ParserUtils.java | 11 +- java/org/apache/jasper/xmlparser/SymbolTable.java | 11 +- java/org/apache/jasper/xmlparser/TreeNode.java | 11 +- java/org/apache/jasper/xmlparser/UCSReader.java | 11 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 11 +- java/org/apache/jasper/xmlparser/XMLChar.java | 11 +- .../jasper/xmlparser/XMLEncodingDetector.java | 11 +- java/org/apache/jasper/xmlparser/XMLString.java | 11 +- .../apache/jasper/xmlparser/XMLStringBuffer.java | 11 +- java/org/apache/jk/apr/AprImpl.java | 11 +- java/org/apache/jk/apr/TomcatStarter.java | 11 +- java/org/apache/jk/common/AjpConstants.java | 11 +- java/org/apache/jk/common/ChannelJni.java | 11 +- java/org/apache/jk/common/ChannelNioSocket.java | 11 +- java/org/apache/jk/common/ChannelShm.java | 11 +- java/org/apache/jk/common/ChannelSocket.java | 11 +- java/org/apache/jk/common/ChannelUn.java | 11 +- java/org/apache/jk/common/HandlerDispatch.java | 11 +- java/org/apache/jk/common/HandlerRequest.java | 11 +- java/org/apache/jk/common/JkInputStream.java | 11 +- java/org/apache/jk/common/JkMX.java | 11 +- java/org/apache/jk/common/JniHandler.java | 11 +- java/org/apache/jk/common/MsgAjp.java | 11 +- java/org/apache/jk/common/Shm.java | 11 +- java/org/apache/jk/common/Shm14.java | 11 +- java/org/apache/jk/common/WorkerDummy.java | 11 +- java/org/apache/jk/config/ApacheConfig.java | 11 +- java/org/apache/jk/config/BaseJkConfig.java | 11 +- java/org/apache/jk/config/GeneratorApache2.java | 11 +- java/org/apache/jk/config/GeneratorJk1.java | 11 +- java/org/apache/jk/config/GeneratorJk2.java | 11 +- java/org/apache/jk/config/IISConfig.java | 11 +- java/org/apache/jk/config/NSConfig.java | 11 +- java/org/apache/jk/config/WebXml2Jk.java | 11 +- java/org/apache/jk/core/JkChannel.java | 11 +- java/org/apache/jk/core/JkHandler.java | 11 +- java/org/apache/jk/core/Msg.java | 11 +- java/org/apache/jk/core/MsgContext.java | 11 +- java/org/apache/jk/core/WorkerEnv.java | 11 +- java/org/apache/jk/server/JkCoyoteHandler.java | 11 +- java/org/apache/jk/server/JkMain.java | 11 +- java/org/apache/juli/ClassLoaderLogManager.java | 11 +- java/org/apache/juli/FileHandler.java | 11 +- java/org/apache/juli/logging/Log.java | 11 +- .../juli/logging/LogConfigurationException.java | 11 +- java/org/apache/juli/logging/LogFactory.java | 11 +- java/org/apache/naming/Constants.java | 11 +- .../org/apache/naming/ContextAccessController.java | 11 +- java/org/apache/naming/ContextBindings.java | 11 +- java/org/apache/naming/EjbRef.java | 11 +- java/org/apache/naming/JndiPermission.java | 11 +- java/org/apache/naming/NameParserImpl.java | 11 +- java/org/apache/naming/NamingContext.java | 11 +- .../naming/NamingContextBindingsEnumeration.java | 11 +- .../apache/naming/NamingContextEnumeration.java | 11 +- java/org/apache/naming/NamingEntry.java | 11 +- java/org/apache/naming/NamingService.java | 11 +- java/org/apache/naming/NamingServiceMBean.java | 11 +- java/org/apache/naming/ResourceEnvRef.java | 11 +- java/org/apache/naming/ResourceLinkRef.java | 11 +- java/org/apache/naming/ResourceRef.java | 11 +- java/org/apache/naming/SelectorContext.java | 11 +- java/org/apache/naming/StringManager.java | 11 +- java/org/apache/naming/TransactionRef.java | 11 +- java/org/apache/naming/factory/BeanFactory.java | 11 +- java/org/apache/naming/factory/Constants.java | 11 +- java/org/apache/naming/factory/EjbFactory.java | 11 +- .../apache/naming/factory/MailSessionFactory.java | 11 +- java/org/apache/naming/factory/OpenEjbFactory.java | 11 +- .../apache/naming/factory/ResourceEnvFactory.java | 11 +- .../org/apache/naming/factory/ResourceFactory.java | 11 +- .../apache/naming/factory/ResourceLinkFactory.java | 11 +- .../org/apache/naming/factory/SendMailFactory.java | 11 +- .../apache/naming/factory/TransactionFactory.java | 11 +- .../apache/naming/java/javaURLContextFactory.java | 11 +- .../apache/naming/resources/BaseDirContext.java | 11 +- java/org/apache/naming/resources/CacheEntry.java | 11 +- java/org/apache/naming/resources/Constants.java | 11 +- .../naming/resources/DirContextURLConnection.java | 11 +- .../resources/DirContextURLStreamHandler.java | 11 +- .../DirContextURLStreamHandlerFactory.java | 11 +- .../apache/naming/resources/FileDirContext.java | 11 +- .../resources/ImmutableNameNotFoundException.java | 11 +- .../apache/naming/resources/ProxyDirContext.java | 11 +- .../resources/RecyclableNamingEnumeration.java | 11 +- java/org/apache/naming/resources/Resource.java | 11 +- .../naming/resources/ResourceAttributes.java | 11 +- .../org/apache/naming/resources/ResourceCache.java | 11 +- .../org/apache/naming/resources/WARDirContext.java | 11 +- java/org/apache/naming/resources/jndi/Handler.java | 11 +- java/org/apache/tomcat/Apr.java | 11 +- java/org/apache/tomcat/jni/Address.java | 11 +- java/org/apache/tomcat/jni/BIOCallback.java | 11 +- java/org/apache/tomcat/jni/Directory.java | 11 +- java/org/apache/tomcat/jni/Error.java | 11 +- java/org/apache/tomcat/jni/File.java | 11 +- java/org/apache/tomcat/jni/FileInfo.java | 11 +- java/org/apache/tomcat/jni/Global.java | 11 +- java/org/apache/tomcat/jni/Library.java | 11 +- java/org/apache/tomcat/jni/Local.java | 11 +- java/org/apache/tomcat/jni/Lock.java | 11 +- java/org/apache/tomcat/jni/Mmap.java | 11 +- java/org/apache/tomcat/jni/Multicast.java | 11 +- java/org/apache/tomcat/jni/OS.java | 11 +- java/org/apache/tomcat/jni/PasswordCallback.java | 11 +- java/org/apache/tomcat/jni/Poll.java | 11 +- java/org/apache/tomcat/jni/Pool.java | 11 +- java/org/apache/tomcat/jni/PoolCallback.java | 11 +- java/org/apache/tomcat/jni/Proc.java | 11 +- java/org/apache/tomcat/jni/ProcErrorCallback.java | 11 +- java/org/apache/tomcat/jni/Procattr.java | 11 +- java/org/apache/tomcat/jni/Registry.java | 11 +- java/org/apache/tomcat/jni/SSL.java | 11 +- java/org/apache/tomcat/jni/SSLContext.java | 11 +- java/org/apache/tomcat/jni/SSLSocket.java | 11 +- java/org/apache/tomcat/jni/Shm.java | 11 +- java/org/apache/tomcat/jni/Sockaddr.java | 11 +- java/org/apache/tomcat/jni/Socket.java | 11 +- java/org/apache/tomcat/jni/Status.java | 11 +- java/org/apache/tomcat/jni/Stdlib.java | 11 +- java/org/apache/tomcat/jni/Time.java | 11 +- java/org/apache/tomcat/jni/User.java | 11 +- java/org/apache/tomcat/util/DomUtil.java | 11 +- .../org/apache/tomcat/util/IntrospectionUtils.java | 11 +- java/org/apache/tomcat/util/buf/Ascii.java | 11 +- java/org/apache/tomcat/util/buf/B2CConverter.java | 11 +- java/org/apache/tomcat/util/buf/Base64.java | 11 +- java/org/apache/tomcat/util/buf/ByteChunk.java | 11 +- java/org/apache/tomcat/util/buf/C2BConverter.java | 11 +- java/org/apache/tomcat/util/buf/CharChunk.java | 11 +- java/org/apache/tomcat/util/buf/DateTool.java | 11 +- java/org/apache/tomcat/util/buf/HexUtils.java | 11 +- java/org/apache/tomcat/util/buf/MessageBytes.java | 11 +- java/org/apache/tomcat/util/buf/StringCache.java | 11 +- java/org/apache/tomcat/util/buf/TimeStamp.java | 11 +- java/org/apache/tomcat/util/buf/UDecoder.java | 11 +- java/org/apache/tomcat/util/buf/UEncoder.java | 11 +- java/org/apache/tomcat/util/buf/UTF8Decoder.java | 11 +- .../tomcat/util/collections/EmptyEnumeration.java | 11 +- .../apache/tomcat/util/collections/LRUCache.java | 11 +- .../apache/tomcat/util/collections/MultiMap.java | 11 +- .../util/collections/MultiMapNamesEnumeration.java | 11 +- .../collections/MultiMapValuesEnumeration.java | 11 +- java/org/apache/tomcat/util/collections/Queue.java | 11 +- .../tomcat/util/collections/SimpleHashtable.java | 11 +- .../apache/tomcat/util/collections/SimplePool.java | 11 +- .../digester/AbstractObjectCreationFactory.java | 11 +- .../tomcat/util/digester/AbstractRulesImpl.java | 11 +- .../apache/tomcat/util/digester/ArrayStack.java | 11 +- .../tomcat/util/digester/CallMethodRule.java | 11 +- .../apache/tomcat/util/digester/CallParamRule.java | 11 +- java/org/apache/tomcat/util/digester/Digester.java | 11 +- .../tomcat/util/digester/FactoryCreateRule.java | 11 +- .../apache/tomcat/util/digester/GenericParser.java | 11 +- .../tomcat/util/digester/NodeCreateRule.java | 11 +- .../tomcat/util/digester/ObjectCreateRule.java | 11 +- .../util/digester/ObjectCreationFactory.java | 11 +- .../tomcat/util/digester/ObjectParamRule.java | 11 +- .../util/digester/ParserFeatureSetterFactory.java | 11 +- .../tomcat/util/digester/PathCallParamRule.java | 11 +- java/org/apache/tomcat/util/digester/Rule.java | 11 +- java/org/apache/tomcat/util/digester/RuleSet.java | 11 +- .../apache/tomcat/util/digester/RuleSetBase.java | 11 +- java/org/apache/tomcat/util/digester/Rules.java | 11 +- .../org/apache/tomcat/util/digester/RulesBase.java | 11 +- .../apache/tomcat/util/digester/SetNextRule.java | 11 +- .../tomcat/util/digester/SetPropertiesRule.java | 11 +- .../tomcat/util/digester/SetPropertyRule.java | 11 +- .../apache/tomcat/util/digester/SetRootRule.java | 11 +- .../apache/tomcat/util/digester/SetTopRule.java | 11 +- .../util/digester/WithDefaultsRulesWrapper.java | 11 +- .../apache/tomcat/util/digester/XercesParser.java | 11 +- .../apache/tomcat/util/http/AcceptLanguage.java | 11 +- java/org/apache/tomcat/util/http/BaseRequest.java | 11 +- java/org/apache/tomcat/util/http/ContentType.java | 11 +- java/org/apache/tomcat/util/http/Cookies.java | 11 +- .../tomcat/util/http/FastHttpDateFormat.java | 11 +- java/org/apache/tomcat/util/http/HttpMessages.java | 11 +- java/org/apache/tomcat/util/http/MimeHeaders.java | 11 +- java/org/apache/tomcat/util/http/MimeMap.java | 11 +- java/org/apache/tomcat/util/http/Parameters.java | 11 +- java/org/apache/tomcat/util/http/ServerCookie.java | 11 +- .../util/http/fileupload/DefaultFileItem.java | 11 +- .../http/fileupload/DefaultFileItemFactory.java | 11 +- .../http/fileupload/DeferredFileOutputStream.java | 11 +- .../util/http/fileupload/DiskFileUpload.java | 11 +- .../tomcat/util/http/fileupload/FileItem.java | 11 +- .../util/http/fileupload/FileItemFactory.java | 11 +- .../tomcat/util/http/fileupload/FileUpload.java | 11 +- .../util/http/fileupload/FileUploadBase.java | 11 +- .../util/http/fileupload/FileUploadException.java | 11 +- .../util/http/fileupload/MultipartStream.java | 11 +- .../http/fileupload/ThresholdingOutputStream.java | 11 +- .../org/apache/tomcat/util/http/mapper/Mapper.java | 11 +- .../tomcat/util/http/mapper/MappingData.java | 11 +- java/org/apache/tomcat/util/log/CaptureLog.java | 11 +- .../apache/tomcat/util/log/SystemLogHandler.java | 11 +- .../apache/tomcat/util/modeler/AttributeInfo.java | 11 +- .../tomcat/util/modeler/BaseAttributeFilter.java | 11 +- .../apache/tomcat/util/modeler/BaseModelMBean.java | 11 +- .../util/modeler/BaseNotificationBroadcaster.java | 11 +- .../tomcat/util/modeler/ConstructorInfo.java | 11 +- .../apache/tomcat/util/modeler/FeatureInfo.java | 11 +- .../util/modeler/FixedNotificationFilter.java | 11 +- .../apache/tomcat/util/modeler/ManagedBean.java | 11 +- .../tomcat/util/modeler/NotificationInfo.java | 11 +- .../apache/tomcat/util/modeler/OperationInfo.java | 11 +- .../apache/tomcat/util/modeler/ParameterInfo.java | 11 +- java/org/apache/tomcat/util/modeler/Registry.java | 11 +- .../apache/tomcat/util/modeler/RegistryMBean.java | 11 +- .../modules/MbeansDescriptorsDOMSource.java | 11 +- .../modules/MbeansDescriptorsDigesterSource.java | 11 +- .../MbeansDescriptorsIntrospectionSource.java | 11 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 11 +- java/org/apache/tomcat/util/net/BaseEndpoint.java | 11 +- .../util/net/DefaultServerSocketFactory.java | 11 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 11 +- .../util/net/LeaderFollowerWorkerThread.java | 11 +- .../tomcat/util/net/MasterSlaveWorkerThread.java | 11 +- java/org/apache/tomcat/util/net/NioChannel.java | 345 +-- java/org/apache/tomcat/util/net/NioEndpoint.java | 11 +- .../apache/tomcat/util/net/PoolTcpEndpoint.java | 11 +- .../apache/tomcat/util/net/SSLImplementation.java | 11 +- java/org/apache/tomcat/util/net/SSLSupport.java | 11 +- .../tomcat/util/net/ServerSocketFactory.java | 11 +- java/org/apache/tomcat/util/net/SocketStatus.java | 11 +- java/org/apache/tomcat/util/net/TcpConnection.java | 11 +- .../tomcat/util/net/TcpConnectionHandler.java | 11 +- java/org/apache/tomcat/util/net/URL.java | 11 +- .../apache/tomcat/util/net/jsse/JSSEFactory.java | 11 +- .../tomcat/util/net/jsse/JSSEImplementation.java | 11 +- .../tomcat/util/net/jsse/JSSEKeyManager.java | 11 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 11 +- .../apache/tomcat/util/net/jsse/JSSESupport.java | 11 +- .../util/net/puretls/PureTLSImplementation.java | 11 +- .../tomcat/util/net/puretls/PureTLSSocket.java | 11 +- .../util/net/puretls/PureTLSSocketFactory.java | 11 +- .../tomcat/util/net/puretls/PureTLSSupport.java | 11 +- java/org/apache/tomcat/util/res/StringManager.java | 11 +- .../org/apache/tomcat/util/threads/ThreadPool.java | 11 +- .../tomcat/util/threads/ThreadPoolRunnable.java | 11 +- .../tomcat/util/threads/ThreadWithAttributes.java | 11 +- native/connector/buildconf | 11 +- native/connector/include/ssl_private.h | 11 +- native/connector/include/tcn.h | 11 +- native/connector/include/tcn_api.h | 11 +- native/connector/include/tcn_version.h | 11 +- native/connector/os/netware/system.c | 11 +- native/connector/os/unix/system.c | 11 +- native/connector/os/unix/uxpipe.c | 11 +- native/connector/os/win32/ntpipe.c | 11 +- native/connector/os/win32/registry.c | 11 +- native/connector/os/win32/system.c | 11 +- native/connector/src/address.c | 11 +- native/connector/src/dir.c | 11 +- native/connector/src/error.c | 11 +- native/connector/src/file.c | 11 +- native/connector/src/info.c | 11 +- native/connector/src/jnilib.c | 11 +- native/connector/src/lock.c | 11 +- native/connector/src/misc.c | 11 +- native/connector/src/mmap.c | 11 +- native/connector/src/multicast.c | 11 +- native/connector/src/network.c | 11 +- native/connector/src/os.c | 11 +- native/connector/src/poll.c | 11 +- native/connector/src/pool.c | 11 +- native/connector/src/proc.c | 11 +- native/connector/src/shm.c | 11 +- native/connector/src/ssl.c | 11 +- native/connector/src/sslcontext.c | 11 +- native/connector/src/sslinfo.c | 11 +- native/connector/src/sslnetwork.c | 11 +- native/connector/src/sslutils.c | 11 +- native/connector/src/stdlib.c | 11 +- native/connector/src/thread.c | 11 +- native/connector/src/user.c | 11 +- .../catalina/tribes/demos/ChannelCreator.java | 505 ++-- .../catalina/tribes/demos/IntrospectionUtils.java | 11 +- .../org/apache/catalina/tribes/demos/LoadTest.java | 847 +++--- .../tribes/test/channel/ChannelStartStop.java | 237 +- .../test/interceptors/TestTwoPhaseCommit.java | 85 +- .../test/membership/MemberSerialization.java | 201 +- webapps/ROOT/WEB-INF/web.xml | 11 +- .../docs/appdev/sample/src/mypackage/Hello.java | 11 +- .../examples/WEB-INF/classes/CookieExample.java | 11 +- .../WEB-INF/classes/HelloWorldExample.java | 11 +- .../WEB-INF/classes/LocalStrings.properties | 11 +- .../WEB-INF/classes/LocalStrings_en.properties | 11 +- .../WEB-INF/classes/LocalStrings_es.properties | 11 +- .../WEB-INF/classes/LocalStrings_fr.properties | 11 +- .../WEB-INF/classes/LocalStrings_pt.properties | 11 +- .../WEB-INF/classes/RequestHeaderExample.java | 11 +- .../WEB-INF/classes/RequestInfoExample.java | 11 +- .../WEB-INF/classes/RequestParamExample.java | 11 +- .../examples/WEB-INF/classes/SessionExample.java | 11 +- webapps/examples/WEB-INF/classes/cal/Entries.java | 11 +- webapps/examples/WEB-INF/classes/cal/Entry.java | 11 +- .../examples/WEB-INF/classes/cal/JspCalendar.java | 11 +- .../examples/WEB-INF/classes/cal/TableBean.java | 11 +- .../examples/WEB-INF/classes/chat/ChatServlet.java | 11 +- .../WEB-INF/classes/checkbox/CheckTest.java | 11 +- .../WEB-INF/classes/colors/ColorGameBean.java | 11 +- .../compressionFilters/CompressionFilter.java | 11 +- .../CompressionFilterTestServlet.java | 11 +- .../CompressionResponseStream.java | 11 +- .../CompressionServletResponseWrapper.java | 11 +- .../WEB-INF/classes/dates/JspCalendar.java | 11 +- webapps/examples/WEB-INF/classes/error/Smart.java | 11 +- .../WEB-INF/classes/examples/ExampleTagBase.java | 11 +- .../examples/WEB-INF/classes/examples/FooTag.java | 11 +- .../WEB-INF/classes/examples/FooTagExtraInfo.java | 11 +- .../examples/WEB-INF/classes/examples/LogTag.java | 11 +- .../WEB-INF/classes/examples/ShowSource.java | 11 +- .../WEB-INF/classes/filters/ExampleFilter.java | 11 +- .../classes/filters/RequestDumperFilter.java | 11 +- .../filters/SetCharacterEncodingFilter.java | 11 +- .../WEB-INF/classes/jsp2/examples/BookBean.java | 11 +- .../WEB-INF/classes/jsp2/examples/FooBean.java | 11 +- .../classes/jsp2/examples/el/Functions.java | 11 +- .../jsp2/examples/simpletag/EchoAttributesTag.java | 11 +- .../jsp2/examples/simpletag/FindBookSimpleTag.java | 11 +- .../examples/simpletag/HelloWorldSimpleTag.java | 11 +- .../jsp2/examples/simpletag/RepeatSimpleTag.java | 11 +- .../jsp2/examples/simpletag/ShuffleSimpleTag.java | 11 +- .../jsp2/examples/simpletag/TileSimpleTag.java | 11 +- .../WEB-INF/classes/listeners/ContextListener.java | 11 +- .../WEB-INF/classes/listeners/SessionListener.java | 11 +- .../WEB-INF/classes/num/NumberGuessBean.java | 11 +- webapps/examples/WEB-INF/classes/servletToJsp.java | 11 +- .../WEB-INF/classes/sessions/DummyCart.java | 11 +- .../examples/WEB-INF/classes/util/HTMLFilter.java | 11 +- .../WEB-INF/classes/validators/DebugValidator.java | 11 +- webapps/examples/WEB-INF/jsp/applet/Clock2.java | 11 +- webapps/examples/WEB-INF/jsp/debug-taglib.tld | 11 +- webapps/examples/WEB-INF/jsp/example-taglib.tld | 11 +- .../examples/WEB-INF/jsp2/jsp2-example-taglib.tld | 11 +- webapps/examples/WEB-INF/tags/displayProducts.tag | 11 +- webapps/examples/WEB-INF/tags/helloWorld.tag | 11 +- webapps/examples/WEB-INF/tags/panel.tag | 11 +- webapps/examples/WEB-INF/tags/xhtmlbasic.tag | 11 +- webapps/examples/WEB-INF/web.xml | 11 +- webapps/examples/jsp/cal/cal1.jsp | 11 +- webapps/examples/jsp/cal/cal2.jsp | 11 +- webapps/examples/jsp/cal/calendar.html | 11 +- webapps/examples/jsp/cal/login.html | 11 +- webapps/examples/jsp/chat/chat.jsp | 11 +- webapps/examples/jsp/chat/login.jsp | 11 +- webapps/examples/jsp/chat/post.jsp | 11 +- webapps/examples/jsp/checkbox/CheckTest.html | 11 +- webapps/examples/jsp/checkbox/check.html | 11 +- webapps/examples/jsp/checkbox/checkresult.jsp | 11 +- webapps/examples/jsp/checkbox/cresult.html | 11 +- webapps/examples/jsp/colors/ColorGameBean.html | 11 +- webapps/examples/jsp/colors/clr.html | 11 +- webapps/examples/jsp/colors/colors.html | 11 +- webapps/examples/jsp/colors/colrs.jsp | 11 +- webapps/examples/jsp/dates/date.html | 11 +- webapps/examples/jsp/dates/date.jsp | 11 +- webapps/examples/jsp/error/er.html | 11 +- webapps/examples/jsp/error/err.jsp | 11 +- webapps/examples/jsp/error/error.html | 11 +- webapps/examples/jsp/error/errorpge.jsp | 11 +- webapps/examples/jsp/include/foo.html | 11 +- webapps/examples/jsp/include/foo.jsp | 11 +- webapps/examples/jsp/include/inc.html | 11 +- webapps/examples/jsp/include/include.jsp | 11 +- webapps/examples/jsp/index.html | 11 +- webapps/examples/jsp/jsp2/el/basic-arithmetic.html | 11 +- webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp | 11 +- .../examples/jsp/jsp2/el/basic-comparisons.html | 11 +- webapps/examples/jsp/jsp2/el/basic-comparisons.jsp | 11 +- webapps/examples/jsp/jsp2/el/functions.html | 11 +- webapps/examples/jsp/jsp2/el/functions.jsp | 11 +- webapps/examples/jsp/jsp2/el/implicit-objects.jsp | 11 +- .../jsp/jsp2/jspattribute/jspattribute.html | 11 +- .../jsp/jsp2/jspattribute/jspattribute.jsp | 11 +- .../examples/jsp/jsp2/jspattribute/shuffle.html | 11 +- webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp | 11 +- webapps/examples/jsp/jsp2/jspx/basic.html | 11 +- webapps/examples/jsp/jsp2/jspx/svgexample.html | 11 +- webapps/examples/jsp/jsp2/jspx/textRotate.html | 11 +- webapps/examples/jsp/jsp2/misc/config.html | 11 +- webapps/examples/jsp/jsp2/misc/config.jsp | 11 +- webapps/examples/jsp/jsp2/misc/dynamicattrs.html | 11 +- webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp | 11 +- webapps/examples/jsp/jsp2/simpletag/book.html | 11 +- webapps/examples/jsp/jsp2/simpletag/book.jsp | 11 +- webapps/examples/jsp/jsp2/simpletag/hello.html | 11 +- webapps/examples/jsp/jsp2/simpletag/hello.jsp | 11 +- webapps/examples/jsp/jsp2/simpletag/repeat.html | 11 +- webapps/examples/jsp/jsp2/simpletag/repeat.jsp | 11 +- webapps/examples/jsp/jsp2/tagfiles/hello.html | 11 +- webapps/examples/jsp/jsp2/tagfiles/hello.jsp | 11 +- webapps/examples/jsp/jsp2/tagfiles/panel.html | 11 +- webapps/examples/jsp/jsp2/tagfiles/panel.jsp | 11 +- webapps/examples/jsp/jsp2/tagfiles/products.jsp | 11 +- webapps/examples/jsp/jsptoserv/hello.jsp | 11 +- webapps/examples/jsp/jsptoserv/jsptoservlet.jsp | 11 +- webapps/examples/jsp/jsptoserv/jts.html | 11 +- webapps/examples/jsp/num/numguess.html | 11 +- webapps/examples/jsp/num/numguess.jsp | 11 +- webapps/examples/jsp/plugin/applet/Clock2.java | 11 +- webapps/examples/jsp/plugin/plugin.html | 11 +- webapps/examples/jsp/plugin/plugin.jsp | 11 +- webapps/examples/jsp/security/protected/error.jsp | 11 +- webapps/examples/jsp/security/protected/index.jsp | 11 +- webapps/examples/jsp/security/protected/login.jsp | 11 +- webapps/examples/jsp/sessions/DummyCart.html | 11 +- webapps/examples/jsp/sessions/carts.html | 11 +- webapps/examples/jsp/sessions/carts.jsp | 11 +- webapps/examples/jsp/sessions/crt.html | 11 +- webapps/examples/jsp/simpletag/foo.html | 11 +- webapps/examples/jsp/simpletag/foo.jsp | 11 +- webapps/examples/jsp/snp/snoop.html | 11 +- webapps/examples/jsp/snp/snoop.jsp | 11 +- webapps/examples/jsp/source.jsp | 11 +- webapps/examples/jsp/tagplugin/choose.html | 11 +- webapps/examples/jsp/tagplugin/choose.jsp | 11 +- webapps/examples/jsp/tagplugin/foreach.html | 11 +- webapps/examples/jsp/tagplugin/foreach.jsp | 11 +- webapps/examples/jsp/tagplugin/howto.html | 11 +- webapps/examples/jsp/tagplugin/if.html | 11 +- webapps/examples/jsp/tagplugin/if.jsp | 11 +- webapps/examples/jsp/tagplugin/notes.html | 11 +- webapps/examples/jsp/xml/xml.html | 11 +- webapps/examples/jsp/xml/xml.jsp | 11 +- webapps/examples/servlets/cookies.html | 11 +- webapps/examples/servlets/helloworld.html | 11 +- webapps/examples/servlets/index.html | 11 +- webapps/examples/servlets/reqheaders.html | 11 +- webapps/examples/servlets/reqinfo.html | 11 +- webapps/examples/servlets/reqparams.html | 11 +- webapps/examples/servlets/sessions.html | 11 +- webapps/manager/WEB-INF/web.xml | 11 +- 1157 files changed, 30630 insertions(+), 29473 deletions(-) diff --git a/java/javax/annotation/Generated.java b/java/javax/annotation/Generated.java index 409435ddd..d4721db26 100644 --- a/java/javax/annotation/Generated.java +++ b/java/javax/annotation/Generated.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/PostConstruct.java b/java/javax/annotation/PostConstruct.java index 11ce7878a..94a7aa758 100644 --- a/java/javax/annotation/PostConstruct.java +++ b/java/javax/annotation/PostConstruct.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/PreDestroy.java b/java/javax/annotation/PreDestroy.java index 2020298c5..c453edd53 100644 --- a/java/javax/annotation/PreDestroy.java +++ b/java/javax/annotation/PreDestroy.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/Resource.java b/java/javax/annotation/Resource.java index f58b8cfd0..7510565c5 100644 --- a/java/javax/annotation/Resource.java +++ b/java/javax/annotation/Resource.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/Resources.java b/java/javax/annotation/Resources.java index 96b8d3e0b..4b398f2af 100644 --- a/java/javax/annotation/Resources.java +++ b/java/javax/annotation/Resources.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/security/DeclareRoles.java b/java/javax/annotation/security/DeclareRoles.java index 95f8aa194..d5d214aee 100644 --- a/java/javax/annotation/security/DeclareRoles.java +++ b/java/javax/annotation/security/DeclareRoles.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/security/DenyAll.java b/java/javax/annotation/security/DenyAll.java index dfc2051d4..c16550a9d 100644 --- a/java/javax/annotation/security/DenyAll.java +++ b/java/javax/annotation/security/DenyAll.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/security/PermitAll.java b/java/javax/annotation/security/PermitAll.java index c34a34e4d..f666c8464 100644 --- a/java/javax/annotation/security/PermitAll.java +++ b/java/javax/annotation/security/PermitAll.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/security/RolesAllowed.java b/java/javax/annotation/security/RolesAllowed.java index a8d7a50a2..fced7619a 100644 --- a/java/javax/annotation/security/RolesAllowed.java +++ b/java/javax/annotation/security/RolesAllowed.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/annotation/security/RunAs.java b/java/javax/annotation/security/RunAs.java index e59bb1cc3..3920d7c60 100644 --- a/java/javax/annotation/security/RunAs.java +++ b/java/javax/annotation/security/RunAs.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java index 0a4e44556..ccbc04327 100644 --- a/java/javax/ejb/EJB.java +++ b/java/javax/ejb/EJB.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/ejb/EJBs.java b/java/javax/ejb/EJBs.java index 50ed5d929..3f752f9f5 100644 --- a/java/javax/ejb/EJBs.java +++ b/java/javax/ejb/EJBs.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ArrayELResolver.java b/java/javax/el/ArrayELResolver.java index 6569f435c..b5b633a79 100644 --- a/java/javax/el/ArrayELResolver.java +++ b/java/javax/el/ArrayELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/BeanELResolver.java b/java/javax/el/BeanELResolver.java index ea2ae8b99..109f6cea2 100644 --- a/java/javax/el/BeanELResolver.java +++ b/java/javax/el/BeanELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java index 6d64eb2c4..aba91dd88 100644 --- a/java/javax/el/CompositeELResolver.java +++ b/java/javax/el/CompositeELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java index 6d6890d47..db5939465 100644 --- a/java/javax/el/ELContext.java +++ b/java/javax/el/ELContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ELContextEvent.java b/java/javax/el/ELContextEvent.java index 8f8607265..6c5c17e68 100644 --- a/java/javax/el/ELContextEvent.java +++ b/java/javax/el/ELContextEvent.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ELContextListener.java b/java/javax/el/ELContextListener.java index 25a128a02..a21038b81 100644 --- a/java/javax/el/ELContextListener.java +++ b/java/javax/el/ELContextListener.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ELException.java b/java/javax/el/ELException.java index d1e195211..935a8a207 100644 --- a/java/javax/el/ELException.java +++ b/java/javax/el/ELException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ELResolver.java b/java/javax/el/ELResolver.java index de01d8cbb..0b3b90afd 100644 --- a/java/javax/el/ELResolver.java +++ b/java/javax/el/ELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/Expression.java b/java/javax/el/Expression.java index ed1a2e5fe..8d9d7ec83 100644 --- a/java/javax/el/Expression.java +++ b/java/javax/el/Expression.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java index 53e340b57..16d51ed19 100644 --- a/java/javax/el/ExpressionFactory.java +++ b/java/javax/el/ExpressionFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/FunctionMapper.java b/java/javax/el/FunctionMapper.java index 09f55b94e..666a76cc4 100644 --- a/java/javax/el/FunctionMapper.java +++ b/java/javax/el/FunctionMapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ListELResolver.java b/java/javax/el/ListELResolver.java index 7016711d8..8de2755a4 100644 --- a/java/javax/el/ListELResolver.java +++ b/java/javax/el/ListELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/LocalStrings.properties b/java/javax/el/LocalStrings.properties index 23726c001..22bc1e4fe 100644 --- a/java/javax/el/LocalStrings.properties +++ b/java/javax/el/LocalStrings.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/el/MapELResolver.java b/java/javax/el/MapELResolver.java index fb8622c6c..5f8347428 100644 --- a/java/javax/el/MapELResolver.java +++ b/java/javax/el/MapELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/MethodExpression.java b/java/javax/el/MethodExpression.java index 90b0d60a8..0b566fcfa 100644 --- a/java/javax/el/MethodExpression.java +++ b/java/javax/el/MethodExpression.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/MethodInfo.java b/java/javax/el/MethodInfo.java index 3aa3fa2c4..8047e259c 100644 --- a/java/javax/el/MethodInfo.java +++ b/java/javax/el/MethodInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/MethodNotFoundException.java b/java/javax/el/MethodNotFoundException.java index f4389de1a..cd69ce1f6 100644 --- a/java/javax/el/MethodNotFoundException.java +++ b/java/javax/el/MethodNotFoundException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/PropertyNotFoundException.java b/java/javax/el/PropertyNotFoundException.java index 3ded8904b..2480999d8 100644 --- a/java/javax/el/PropertyNotFoundException.java +++ b/java/javax/el/PropertyNotFoundException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/PropertyNotWritableException.java b/java/javax/el/PropertyNotWritableException.java index ee4a0e32c..912ab9b0b 100644 --- a/java/javax/el/PropertyNotWritableException.java +++ b/java/javax/el/PropertyNotWritableException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ResourceBundleELResolver.java b/java/javax/el/ResourceBundleELResolver.java index 0affb5c69..0f1a6bb10 100644 --- a/java/javax/el/ResourceBundleELResolver.java +++ b/java/javax/el/ResourceBundleELResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/ValueExpression.java b/java/javax/el/ValueExpression.java index b4fc413d6..e501a9ed3 100644 --- a/java/javax/el/ValueExpression.java +++ b/java/javax/el/ValueExpression.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/el/VariableMapper.java b/java/javax/el/VariableMapper.java index 3ee6ca282..84c368223 100644 --- a/java/javax/el/VariableMapper.java +++ b/java/javax/el/VariableMapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/persistence/PersistenceContext.java b/java/javax/persistence/PersistenceContext.java index 80d58f306..aaa697bc1 100644 --- a/java/javax/persistence/PersistenceContext.java +++ b/java/javax/persistence/PersistenceContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/persistence/PersistenceContexts.java b/java/javax/persistence/PersistenceContexts.java index dcbd68bdb..d451f2489 100644 --- a/java/javax/persistence/PersistenceContexts.java +++ b/java/javax/persistence/PersistenceContexts.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/persistence/PersistenceUnit.java b/java/javax/persistence/PersistenceUnit.java index 1b150ecb9..e42a3b260 100644 --- a/java/javax/persistence/PersistenceUnit.java +++ b/java/javax/persistence/PersistenceUnit.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/persistence/PersistenceUnits.java b/java/javax/persistence/PersistenceUnits.java index 8a00831a5..0d3cf2417 100644 --- a/java/javax/persistence/PersistenceUnits.java +++ b/java/javax/persistence/PersistenceUnits.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/Filter.java b/java/javax/servlet/Filter.java index db6d6b7e7..99eae03ba 100644 --- a/java/javax/servlet/Filter.java +++ b/java/javax/servlet/Filter.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/FilterChain.java b/java/javax/servlet/FilterChain.java index d6210d5e5..03ba45449 100644 --- a/java/javax/servlet/FilterChain.java +++ b/java/javax/servlet/FilterChain.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/FilterConfig.java b/java/javax/servlet/FilterConfig.java index 05c609d3b..e1ef616c7 100644 --- a/java/javax/servlet/FilterConfig.java +++ b/java/javax/servlet/FilterConfig.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/GenericServlet.java b/java/javax/servlet/GenericServlet.java index d4081d76d..feec0c461 100644 --- a/java/javax/servlet/GenericServlet.java +++ b/java/javax/servlet/GenericServlet.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/LocalStrings.properties b/java/javax/servlet/LocalStrings.properties index c1dcf48da..49fb28710 100644 --- a/java/javax/servlet/LocalStrings.properties +++ b/java/javax/servlet/LocalStrings.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/LocalStrings_fr.properties b/java/javax/servlet/LocalStrings_fr.properties index 987309bd9..26457ef8b 100644 --- a/java/javax/servlet/LocalStrings_fr.properties +++ b/java/javax/servlet/LocalStrings_fr.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/LocalStrings_ja.properties b/java/javax/servlet/LocalStrings_ja.properties index 4ed3709f9..2a87482d7 100644 --- a/java/javax/servlet/LocalStrings_ja.properties +++ b/java/javax/servlet/LocalStrings_ja.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/RequestDispatcher.java b/java/javax/servlet/RequestDispatcher.java index 1993728e7..a9e79b270 100644 --- a/java/javax/servlet/RequestDispatcher.java +++ b/java/javax/servlet/RequestDispatcher.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/Servlet.java b/java/javax/servlet/Servlet.java index 3d568deb5..6dae418a1 100644 --- a/java/javax/servlet/Servlet.java +++ b/java/javax/servlet/Servlet.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletConfig.java b/java/javax/servlet/ServletConfig.java index e5f9b1b6e..dea6bbd5e 100644 --- a/java/javax/servlet/ServletConfig.java +++ b/java/javax/servlet/ServletConfig.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletContext.java b/java/javax/servlet/ServletContext.java index 855d62c1f..cb32eb857 100644 --- a/java/javax/servlet/ServletContext.java +++ b/java/javax/servlet/ServletContext.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletContextAttributeEvent.java b/java/javax/servlet/ServletContextAttributeEvent.java index e7af9a9da..2ae493674 100644 --- a/java/javax/servlet/ServletContextAttributeEvent.java +++ b/java/javax/servlet/ServletContextAttributeEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletContextAttributeListener.java b/java/javax/servlet/ServletContextAttributeListener.java index 3d8b938fa..fcb5575f0 100644 --- a/java/javax/servlet/ServletContextAttributeListener.java +++ b/java/javax/servlet/ServletContextAttributeListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletContextEvent.java b/java/javax/servlet/ServletContextEvent.java index cb7b8878c..713759656 100644 --- a/java/javax/servlet/ServletContextEvent.java +++ b/java/javax/servlet/ServletContextEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletContextListener.java b/java/javax/servlet/ServletContextListener.java index 693d2c16e..e4b01641c 100644 --- a/java/javax/servlet/ServletContextListener.java +++ b/java/javax/servlet/ServletContextListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletException.java b/java/javax/servlet/ServletException.java index 29533cb0f..59b4044c0 100644 --- a/java/javax/servlet/ServletException.java +++ b/java/javax/servlet/ServletException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletInputStream.java b/java/javax/servlet/ServletInputStream.java index bcc3a45d6..a29c8082e 100644 --- a/java/javax/servlet/ServletInputStream.java +++ b/java/javax/servlet/ServletInputStream.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletOutputStream.java b/java/javax/servlet/ServletOutputStream.java index 865b1d192..c1b7281fe 100644 --- a/java/javax/servlet/ServletOutputStream.java +++ b/java/javax/servlet/ServletOutputStream.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequest.java b/java/javax/servlet/ServletRequest.java index a2cf60de6..39b359ff7 100644 --- a/java/javax/servlet/ServletRequest.java +++ b/java/javax/servlet/ServletRequest.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequestAttributeEvent.java b/java/javax/servlet/ServletRequestAttributeEvent.java index 8ca9eb457..98a5861ff 100644 --- a/java/javax/servlet/ServletRequestAttributeEvent.java +++ b/java/javax/servlet/ServletRequestAttributeEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequestAttributeListener.java b/java/javax/servlet/ServletRequestAttributeListener.java index b68bbc5cf..8d65fa12f 100644 --- a/java/javax/servlet/ServletRequestAttributeListener.java +++ b/java/javax/servlet/ServletRequestAttributeListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequestEvent.java b/java/javax/servlet/ServletRequestEvent.java index a75b21362..d39502907 100644 --- a/java/javax/servlet/ServletRequestEvent.java +++ b/java/javax/servlet/ServletRequestEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequestListener.java b/java/javax/servlet/ServletRequestListener.java index 3518b19ba..4ac7055da 100644 --- a/java/javax/servlet/ServletRequestListener.java +++ b/java/javax/servlet/ServletRequestListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletRequestWrapper.java b/java/javax/servlet/ServletRequestWrapper.java index d5f232e9b..aa80a8f50 100644 --- a/java/javax/servlet/ServletRequestWrapper.java +++ b/java/javax/servlet/ServletRequestWrapper.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletResponse.java b/java/javax/servlet/ServletResponse.java index 770d9a090..b9427d7a3 100644 --- a/java/javax/servlet/ServletResponse.java +++ b/java/javax/servlet/ServletResponse.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/ServletResponseWrapper.java b/java/javax/servlet/ServletResponseWrapper.java index 7a95e28c6..9358ca71d 100644 --- a/java/javax/servlet/ServletResponseWrapper.java +++ b/java/javax/servlet/ServletResponseWrapper.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/SingleThreadModel.java b/java/javax/servlet/SingleThreadModel.java index 646ff0270..ea2e92c90 100644 --- a/java/javax/servlet/SingleThreadModel.java +++ b/java/javax/servlet/SingleThreadModel.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/UnavailableException.java b/java/javax/servlet/UnavailableException.java index cc0d7e55d..dde2dea8a 100644 --- a/java/javax/servlet/UnavailableException.java +++ b/java/javax/servlet/UnavailableException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/Cookie.java b/java/javax/servlet/http/Cookie.java index 7cbc6b46c..7c62f606e 100644 --- a/java/javax/servlet/http/Cookie.java +++ b/java/javax/servlet/http/Cookie.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java index 08479b9f6..43b4c690c 100644 --- a/java/javax/servlet/http/HttpServlet.java +++ b/java/javax/servlet/http/HttpServlet.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java index c0a5d36ee..50b5d4f92 100644 --- a/java/javax/servlet/http/HttpServletRequest.java +++ b/java/javax/servlet/http/HttpServletRequest.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java b/java/javax/servlet/http/HttpServletRequestWrapper.java index 361e38f46..28cc3a98c 100644 --- a/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpServletResponse.java b/java/javax/servlet/http/HttpServletResponse.java index 617905020..33502643d 100644 --- a/java/javax/servlet/http/HttpServletResponse.java +++ b/java/javax/servlet/http/HttpServletResponse.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpServletResponseWrapper.java b/java/javax/servlet/http/HttpServletResponseWrapper.java index 751e4bcf3..6563b7b39 100644 --- a/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSession.java b/java/javax/servlet/http/HttpSession.java index 295797595..0aa4e5ffa 100644 --- a/java/javax/servlet/http/HttpSession.java +++ b/java/javax/servlet/http/HttpSession.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionActivationListener.java b/java/javax/servlet/http/HttpSessionActivationListener.java index 95963ae29..99a9f03db 100644 --- a/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/java/javax/servlet/http/HttpSessionActivationListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionAttributeListener.java b/java/javax/servlet/http/HttpSessionAttributeListener.java index b70e9f58c..95257a777 100644 --- a/java/javax/servlet/http/HttpSessionAttributeListener.java +++ b/java/javax/servlet/http/HttpSessionAttributeListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionBindingEvent.java b/java/javax/servlet/http/HttpSessionBindingEvent.java index 5e84f32cf..36c2fd2dc 100644 --- a/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionBindingListener.java b/java/javax/servlet/http/HttpSessionBindingListener.java index a07674409..852b2fa01 100644 --- a/java/javax/servlet/http/HttpSessionBindingListener.java +++ b/java/javax/servlet/http/HttpSessionBindingListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionContext.java b/java/javax/servlet/http/HttpSessionContext.java index dd7bfe6e4..3810aba53 100644 --- a/java/javax/servlet/http/HttpSessionContext.java +++ b/java/javax/servlet/http/HttpSessionContext.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionEvent.java b/java/javax/servlet/http/HttpSessionEvent.java index 8aa85f9a5..c64359bbf 100644 --- a/java/javax/servlet/http/HttpSessionEvent.java +++ b/java/javax/servlet/http/HttpSessionEvent.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpSessionListener.java b/java/javax/servlet/http/HttpSessionListener.java index b1a922481..0b2fa78bb 100644 --- a/java/javax/servlet/http/HttpSessionListener.java +++ b/java/javax/servlet/http/HttpSessionListener.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/HttpUtils.java b/java/javax/servlet/http/HttpUtils.java index abc5d90d0..12bce8003 100644 --- a/java/javax/servlet/http/HttpUtils.java +++ b/java/javax/servlet/http/HttpUtils.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/http/LocalStrings.properties b/java/javax/servlet/http/LocalStrings.properties index bf4d4c8f8..3ddb99005 100644 --- a/java/javax/servlet/http/LocalStrings.properties +++ b/java/javax/servlet/http/LocalStrings.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties index 36c2c22fa..0fe2cac4a 100644 --- a/java/javax/servlet/http/LocalStrings_es.properties +++ b/java/javax/servlet/http/LocalStrings_es.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/http/LocalStrings_fr.properties b/java/javax/servlet/http/LocalStrings_fr.properties index b2bc09cb4..a6aedcd61 100644 --- a/java/javax/servlet/http/LocalStrings_fr.properties +++ b/java/javax/servlet/http/LocalStrings_fr.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/http/LocalStrings_ja.properties b/java/javax/servlet/http/LocalStrings_ja.properties index edfbdd51d..70983d785 100644 --- a/java/javax/servlet/http/LocalStrings_ja.properties +++ b/java/javax/servlet/http/LocalStrings_ja.properties @@ -1,8 +1,9 @@ -# Copyright 2004 The Apache Software Foundation -# -# Licensed 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 +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # diff --git a/java/javax/servlet/jsp/ErrorData.java b/java/javax/servlet/jsp/ErrorData.java index e36c07301..78f41d1d0 100644 --- a/java/javax/servlet/jsp/ErrorData.java +++ b/java/javax/servlet/jsp/ErrorData.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/HttpJspPage.java b/java/javax/servlet/jsp/HttpJspPage.java index 50cd1475d..685caf833 100644 --- a/java/javax/servlet/jsp/HttpJspPage.java +++ b/java/javax/servlet/jsp/HttpJspPage.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspApplicationContext.java b/java/javax/servlet/jsp/JspApplicationContext.java index 252ac23a0..5533f32f9 100644 --- a/java/javax/servlet/jsp/JspApplicationContext.java +++ b/java/javax/servlet/jsp/JspApplicationContext.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspContext.java b/java/javax/servlet/jsp/JspContext.java index 0d2e394d6..8b19b4fd3 100644 --- a/java/javax/servlet/jsp/JspContext.java +++ b/java/javax/servlet/jsp/JspContext.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspEngineInfo.java b/java/javax/servlet/jsp/JspEngineInfo.java index 736f00eff..0c6ca67b0 100644 --- a/java/javax/servlet/jsp/JspEngineInfo.java +++ b/java/javax/servlet/jsp/JspEngineInfo.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspException.java b/java/javax/servlet/jsp/JspException.java index e2eb9443e..6d0f17254 100644 --- a/java/javax/servlet/jsp/JspException.java +++ b/java/javax/servlet/jsp/JspException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspFactory.java b/java/javax/servlet/jsp/JspFactory.java index 5d3003fc3..2fe511f4c 100644 --- a/java/javax/servlet/jsp/JspFactory.java +++ b/java/javax/servlet/jsp/JspFactory.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspPage.java b/java/javax/servlet/jsp/JspPage.java index e93074d7e..75cfcce89 100644 --- a/java/javax/servlet/jsp/JspPage.java +++ b/java/javax/servlet/jsp/JspPage.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspTagException.java b/java/javax/servlet/jsp/JspTagException.java index 35d876940..5f37b3f65 100644 --- a/java/javax/servlet/jsp/JspTagException.java +++ b/java/javax/servlet/jsp/JspTagException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/JspWriter.java b/java/javax/servlet/jsp/JspWriter.java index b11050d30..b001c4e2b 100644 --- a/java/javax/servlet/jsp/JspWriter.java +++ b/java/javax/servlet/jsp/JspWriter.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/PageContext.java b/java/javax/servlet/jsp/PageContext.java index b1906192d..d83f463c2 100644 --- a/java/javax/servlet/jsp/PageContext.java +++ b/java/javax/servlet/jsp/PageContext.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/SkipPageException.java b/java/javax/servlet/jsp/SkipPageException.java index b0ea0cd42..a8001f8ad 100644 --- a/java/javax/servlet/jsp/SkipPageException.java +++ b/java/javax/servlet/jsp/SkipPageException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/ELException.java b/java/javax/servlet/jsp/el/ELException.java index 3d3b796b0..bc6e8eebc 100644 --- a/java/javax/servlet/jsp/el/ELException.java +++ b/java/javax/servlet/jsp/el/ELException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/ELParseException.java b/java/javax/servlet/jsp/el/ELParseException.java index 901f2720d..e2c4ac04f 100644 --- a/java/javax/servlet/jsp/el/ELParseException.java +++ b/java/javax/servlet/jsp/el/ELParseException.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/Expression.java b/java/javax/servlet/jsp/el/Expression.java index 78e3603ee..bd2ba574f 100644 --- a/java/javax/servlet/jsp/el/Expression.java +++ b/java/javax/servlet/jsp/el/Expression.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/ExpressionEvaluator.java b/java/javax/servlet/jsp/el/ExpressionEvaluator.java index 48c61634c..72c26a0e2 100644 --- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java +++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java b/java/javax/servlet/jsp/el/FunctionMapper.java index f518eaf95..a8568c314 100644 --- a/java/javax/servlet/jsp/el/FunctionMapper.java +++ b/java/javax/servlet/jsp/el/FunctionMapper.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java index 553426798..86b85a0d5 100644 --- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java +++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java @@ -1,9 +1,10 @@ /* -* Copyright 2006 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java index a9f23ffa5..456801404 100644 --- a/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java +++ b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java @@ -1,9 +1,10 @@ /* -* Copyright 2006 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/el/VariableResolver.java b/java/javax/servlet/jsp/el/VariableResolver.java index c377b7229..6313331a5 100644 --- a/java/javax/servlet/jsp/el/VariableResolver.java +++ b/java/javax/servlet/jsp/el/VariableResolver.java @@ -1,9 +1,10 @@ /* -* Copyright 2004 The Apache Software Foundation -* -* Licensed 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 +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * diff --git a/java/javax/servlet/jsp/resources/jsp_2_0.xsd b/java/javax/servlet/jsp/resources/jsp_2_0.xsd index 799bbaaa3..20e3c3fdb 100755 --- a/java/javax/servlet/jsp/resources/jsp_2_0.xsd +++ b/java/javax/servlet/jsp/resources/jsp_2_0.xsd @@ -1,10 +1,11 @@