You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 22:55:03 UTC
svn commit: r1187778 [1/6] - in /tomcat/trunk/java/javax: annotation/
annotation/security/ ejb/ el/ persistence/ servlet/ servlet/annotation/
servlet/descriptor/ servlet/http/ servlet/jsp/ servlet/jsp/el/
servlet/jsp/resources/ servlet/jsp/tagext/ serv...
Author: markt
Date: Sat Oct 22 20:54:57 2011
New Revision: 1187778
URL: http://svn.apache.org/viewvc?rev=1187778&view=rev
Log:
Whitespace removal from /java/javax
Modified:
tomcat/trunk/java/javax/annotation/Generated.java
tomcat/trunk/java/javax/annotation/PostConstruct.java
tomcat/trunk/java/javax/annotation/PreDestroy.java
tomcat/trunk/java/javax/annotation/Resource.java
tomcat/trunk/java/javax/annotation/Resources.java
tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/trunk/java/javax/annotation/security/DenyAll.java
tomcat/trunk/java/javax/annotation/security/PermitAll.java
tomcat/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/trunk/java/javax/annotation/security/RunAs.java
tomcat/trunk/java/javax/ejb/EJB.java
tomcat/trunk/java/javax/ejb/EJBs.java
tomcat/trunk/java/javax/el/ArrayELResolver.java
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/CompositeELResolver.java
tomcat/trunk/java/javax/el/ELContext.java
tomcat/trunk/java/javax/el/ELContextEvent.java
tomcat/trunk/java/javax/el/ELContextListener.java
tomcat/trunk/java/javax/el/ELException.java
tomcat/trunk/java/javax/el/ELResolver.java
tomcat/trunk/java/javax/el/Expression.java
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/javax/el/FunctionMapper.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/MethodExpression.java
tomcat/trunk/java/javax/el/MethodInfo.java
tomcat/trunk/java/javax/el/MethodNotFoundException.java
tomcat/trunk/java/javax/el/PropertyNotFoundException.java
tomcat/trunk/java/javax/el/PropertyNotWritableException.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/javax/el/ValueExpression.java
tomcat/trunk/java/javax/el/ValueReference.java
tomcat/trunk/java/javax/el/VariableMapper.java
tomcat/trunk/java/javax/persistence/PersistenceContext.java
tomcat/trunk/java/javax/persistence/PersistenceContextType.java
tomcat/trunk/java/javax/persistence/PersistenceContexts.java
tomcat/trunk/java/javax/persistence/PersistenceUnit.java
tomcat/trunk/java/javax/persistence/PersistenceUnits.java
tomcat/trunk/java/javax/servlet/AsyncContext.java
tomcat/trunk/java/javax/servlet/AsyncEvent.java
tomcat/trunk/java/javax/servlet/Filter.java
tomcat/trunk/java/javax/servlet/FilterChain.java
tomcat/trunk/java/javax/servlet/FilterConfig.java
tomcat/trunk/java/javax/servlet/FilterRegistration.java
tomcat/trunk/java/javax/servlet/GenericServlet.java
tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
tomcat/trunk/java/javax/servlet/Registration.java
tomcat/trunk/java/javax/servlet/RequestDispatcher.java
tomcat/trunk/java/javax/servlet/Servlet.java
tomcat/trunk/java/javax/servlet/ServletConfig.java
tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
tomcat/trunk/java/javax/servlet/ServletContextEvent.java
tomcat/trunk/java/javax/servlet/ServletContextListener.java
tomcat/trunk/java/javax/servlet/ServletException.java
tomcat/trunk/java/javax/servlet/ServletInputStream.java
tomcat/trunk/java/javax/servlet/ServletOutputStream.java
tomcat/trunk/java/javax/servlet/ServletRegistration.java
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/ServletResponse.java
tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
tomcat/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
tomcat/trunk/java/javax/servlet/annotation/HttpConstraint.java
tomcat/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java
tomcat/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/trunk/java/javax/servlet/annotation/WebListener.java
tomcat/trunk/java/javax/servlet/annotation/WebServlet.java
tomcat/trunk/java/javax/servlet/descriptor/JspConfigDescriptor.java
tomcat/trunk/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
tomcat/trunk/java/javax/servlet/descriptor/TaglibDescriptor.java
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/http/HttpSession.java
tomcat/trunk/java/javax/servlet/http/HttpSessionActivationListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionAttributeListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingListener.java
tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java
tomcat/trunk/java/javax/servlet/http/HttpSessionListener.java
tomcat/trunk/java/javax/servlet/http/HttpUtils.java
tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/http/Part.java
tomcat/trunk/java/javax/servlet/jsp/ErrorData.java
tomcat/trunk/java/javax/servlet/jsp/HttpJspPage.java
tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/JspEngineInfo.java
tomcat/trunk/java/javax/servlet/jsp/JspException.java
tomcat/trunk/java/javax/servlet/jsp/JspFactory.java
tomcat/trunk/java/javax/servlet/jsp/JspPage.java
tomcat/trunk/java/javax/servlet/jsp/JspTagException.java
tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
tomcat/trunk/java/javax/servlet/jsp/PageContext.java
tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/package.html
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/DynamicAttributes.java
tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/JspFragment.java
tomcat/trunk/java/javax/servlet/jsp/tagext/JspTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/PageData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TryCatchFinally.java
tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java
tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/package.html
tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd
tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
tomcat/trunk/java/javax/servlet/resources/xml.xsd
tomcat/trunk/java/javax/xml/ws/WebServiceRef.java
tomcat/trunk/java/javax/xml/ws/WebServiceRefs.java
Modified: tomcat/trunk/java/javax/annotation/Generated.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Generated.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/trunk/java/javax/annotation/Generated.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
- ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
+@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
+ ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
@Retention(RetentionPolicy.SOURCE)
Modified: tomcat/trunk/java/javax/annotation/PostConstruct.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PostConstruct.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/trunk/java/javax/annotation/PostConstruct.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/PreDestroy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/PreDestroy.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/trunk/java/javax/annotation/PreDestroy.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/Resource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resource.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/trunk/java/javax/annotation/Resource.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/Resources.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resources.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/trunk/java/javax/annotation/Resources.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/security/DeclareRoles.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/DeclareRoles.java (original)
+++ tomcat/trunk/java/javax/annotation/security/DeclareRoles.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/security/DenyAll.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/DenyAll.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/trunk/java/javax/annotation/security/DenyAll.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/security/PermitAll.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/PermitAll.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/PermitAll.java (original)
+++ tomcat/trunk/java/javax/annotation/security/PermitAll.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/security/RolesAllowed.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/RolesAllowed.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/RolesAllowed.java (original)
+++ tomcat/trunk/java/javax/annotation/security/RolesAllowed.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/annotation/security/RunAs.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/RunAs.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/RunAs.java (original)
+++ tomcat/trunk/java/javax/annotation/security/RunAs.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/ejb/EJB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJB.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/trunk/java/javax/ejb/EJB.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/ejb/EJBs.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJBs.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/ejb/EJBs.java (original)
+++ tomcat/trunk/java/javax/ejb/EJBs.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -230,7 +230,7 @@ public class BeanELResolver extends ELRe
public BeanProperty getBeanProperty(String name) {
return get(null, name);
}
-
+
private Class<?> getType() {
return type;
}
@@ -342,19 +342,19 @@ public class BeanELResolver extends ELRe
}
return null;
}
-
+
private static final class ConcurrentCache<K,V> {
private final int size;
private final Map<K,V> eden;
private final Map<K,V> longterm;
-
+
public ConcurrentCache(int size) {
this.size = size;
this.eden = new ConcurrentHashMap<K,V>(size);
this.longterm = new WeakHashMap<K,V>(size);
}
-
+
public V get(K key) {
V value = this.eden.get(key);
if (value == null) {
@@ -367,7 +367,7 @@ public class BeanELResolver extends ELRe
}
return value;
}
-
+
public void put(K key, V value) {
if (this.eden.size() >= this.size) {
synchronized (longterm) {
@@ -379,7 +379,7 @@ public class BeanELResolver extends ELRe
}
}
-
+
/**
* @since EL 2.2
*/
@@ -394,9 +394,9 @@ public class BeanELResolver extends ELRe
}
ExpressionFactory factory = ExpressionFactory.newInstance();
-
+
String methodName = (String) factory.coerceToType(method, String.class);
-
+
// Find the matching method
Method matchingMethod = null;
Class<?> clazz = base.getClass();
@@ -475,7 +475,7 @@ public class BeanELResolver extends ELRe
} catch (InvocationTargetException e) {
throw new ELException(e.getCause());
}
-
+
context.setPropertyResolved(true);
return result;
}
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ public class CompositeELResolver extends
clazz =
Class.forName("javax.servlet.jsp.el.ScopedAttributeELResolver");
} catch (ClassNotFoundException e) {
- // Ignore. This is expected if using the EL stand-alone
+ // Ignore. This is expected if using the EL stand-alone
}
SCOPED_ATTRIBUTE_EL_RESOLVER = clazz;
}
@@ -193,7 +193,7 @@ public class CompositeELResolver extends
this.idx = 0;
this.guaranteeIterator();
}
-
+
private void guaranteeIterator() {
while (this.itr == null && this.idx < this.size) {
this.itr = this.resolvers[this.idx].getFeatureDescriptors(
@@ -203,7 +203,7 @@ public class CompositeELResolver extends
}
@Override
- public boolean hasNext() {
+ public boolean hasNext() {
if (this.next != null)
return true;
if (this.itr != null){
Modified: tomcat/trunk/java/javax/el/ELContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,18 +27,18 @@ import java.util.Map;
public abstract class ELContext {
private Locale locale;
-
+
private Map<Class<?>, Object> map;
-
+
private boolean resolved;
-
+
/**
- *
+ *
*/
public ELContext() {
this.resolved = false;
}
-
+
// Can't use Class<?> because API needs to match specification
public Object getContext(@SuppressWarnings("rawtypes") Class key) {
if (this.map == null) {
@@ -46,39 +46,39 @@ public abstract class ELContext {
}
return this.map.get(key);
}
-
+
// Can't use Class<?> because API needs to match specification
public void putContext(@SuppressWarnings("rawtypes") Class key,
Object contextObject) throws NullPointerException {
if (key == null || contextObject == null) {
throw new NullPointerException();
}
-
+
if (this.map == null) {
this.map = new HashMap<Class<?>, Object>();
}
-
+
this.map.put(key, contextObject);
}
-
+
public void setPropertyResolved(boolean resolved) {
this.resolved = resolved;
}
-
+
public boolean isPropertyResolved() {
return this.resolved;
}
-
+
public abstract ELResolver getELResolver();
public abstract FunctionMapper getFunctionMapper();
-
+
public abstract VariableMapper getVariableMapper();
-
+
public Locale getLocale() {
return this.locale;
}
-
+
public void setLocale(Locale locale) {
this.locale = locale;
}
Modified: tomcat/trunk/java/javax/el/ELContextEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContextEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELContextEvent.java (original)
+++ tomcat/trunk/java/javax/el/ELContextEvent.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ public class ELContextEvent extends Even
public ELContextEvent(ELContext source) {
super(source);
}
-
+
public ELContext getELContext() {
return (ELContext) this.getSource();
}
Modified: tomcat/trunk/java/javax/el/ELContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContextListener.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELContextListener.java (original)
+++ tomcat/trunk/java/javax/el/ELContextListener.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@ package javax.el;
*
*/
public interface ELContextListener extends java.util.EventListener {
-
+
public void contextCreated(ELContextEvent event);
}
Modified: tomcat/trunk/java/javax/el/ELException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELException.java (original)
+++ tomcat/trunk/java/javax/el/ELException.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@ package javax.el;
/**
* Represents any of the exception conditions that can arise during expression
* evaluation.
- *
+ *
* @since 2.1
*/
public class ELException extends RuntimeException {
@@ -36,7 +36,7 @@ public class ELException extends Runtime
/**
* Creates an ELException with the provided detail message.
- *
+ *
* @param message
* the detail message
*/
@@ -46,7 +46,7 @@ public class ELException extends Runtime
/**
* Creates an ELException with the given detail message and root cause.
- *
+ *
* @param message
* the detail message
* @param cause
@@ -58,7 +58,7 @@ public class ELException extends Runtime
/**
* Creates an ELException with the given cause
- *
+ *
* @param cause
* the originating cause of this exception
*/
Modified: tomcat/trunk/java/javax/el/ELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@ import java.util.ResourceBundle;
*
*/
public abstract class ELResolver {
-
+
static String message(ELContext context, String name, Object[] props) {
Locale locale = context.getLocale();
if (locale == null) {
@@ -52,21 +52,21 @@ public abstract class ELResolver {
}
public static final String RESOLVABLE_AT_DESIGN_TIME = "resolvableAtDesignTime";
-
+
public static final String TYPE = "type";
-
+
public abstract Object getValue(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract Class<?> getType(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract void setValue(ELContext context, Object base, Object property, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException;
public abstract boolean isReadOnly(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base);
-
+
public abstract Class<?> getCommonPropertyType(ELContext context, Object base);
-
+
/**
* @since EL 2.2
*/
Modified: tomcat/trunk/java/javax/el/Expression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Expression.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Expression.java (original)
+++ tomcat/trunk/java/javax/el/Expression.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,9 +31,9 @@ public abstract class Expression impleme
@Override
public abstract int hashCode();
-
+
public abstract String getExpressionString();
-
+
public abstract boolean isLiteralText();
}
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,11 +32,11 @@ import java.security.PrivilegedAction;
import java.util.Properties;
/**
- *
+ *
* @since 2.1
*/
public abstract class ExpressionFactory {
-
+
private static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
@@ -110,14 +110,14 @@ public abstract class ExpressionFactory
/**
* Create a new {@link ExpressionFactory} passing in the provided
* {@link Properties}. Search order is the same as {@link #newInstance()}.
- *
+ *
* @param properties the properties to be passed to the new instance (may be null)
* @return the new ExpressionFactory
*/
public static ExpressionFactory newInstance(Properties properties) {
String className = null;
ExpressionFactory result = null;
-
+
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
// First services API
@@ -148,7 +148,7 @@ public abstract class ExpressionFactory
}
);
} else {
- // Third system property
+ // Third system property
className = getClassNameSysProp();
}
}
@@ -156,7 +156,7 @@ public abstract class ExpressionFactory
// Fourth - default
className = "org.apache.el.ExpressionFactoryImpl";
}
-
+
try {
Class<?> clazz = null;
if (tccl == null) {
@@ -182,7 +182,7 @@ public abstract class ExpressionFactory
result =
(ExpressionFactory) constructor.newInstance(properties);
}
-
+
} catch (ClassNotFoundException e) {
throw new ELException(
"Unable to find ExpressionFactory of type: " + className,
@@ -204,13 +204,13 @@ public abstract class ExpressionFactory
"Unable to create ExpressionFactory of type: " + className,
e);
}
-
+
return result;
}
-
+
private static String getClassNameServices(ClassLoader tccl) {
InputStream is = null;
-
+
if (tccl == null) {
is = ClassLoader.getSystemResourceAsStream(SERVICE_RESOURCE_NAME);
} else {
@@ -243,10 +243,10 @@ public abstract class ExpressionFactory
} catch (IOException ioe) {/*Ignore*/}
}
}
-
+
return null;
}
-
+
private static String getClassNameJreDir() {
File file = new File(PROPERTY_FILE);
if (file.canRead()) {
@@ -275,7 +275,7 @@ public abstract class ExpressionFactory
}
return null;
}
-
+
private static final String getClassNameSysProp() {
String value = System.getProperty(PROPERTY_NAME);
if (value != null && value.trim().length() > 0) {
Modified: tomcat/trunk/java/javax/el/FunctionMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/FunctionMapper.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/FunctionMapper.java (original)
+++ tomcat/trunk/java/javax/el/FunctionMapper.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,5 +25,5 @@ import java.lang.reflect.Method;
public abstract class FunctionMapper {
public abstract Method resolveFunction(String prefix, String localName);
-
+
}
Modified: tomcat/trunk/java/javax/el/ListELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ListELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/el/MapELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MapELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MapELResolver.java (original)
+++ tomcat/trunk/java/javax/el/MapELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@ public class MapELResolver extends ELRes
context.setPropertyResolved(true);
return ((Map<?,?>) base).get(property);
}
-
+
return null;
}
@@ -66,7 +66,7 @@ public class MapELResolver extends ELRes
context.setPropertyResolved(true);
return Object.class;
}
-
+
return null;
}
@@ -109,7 +109,7 @@ public class MapELResolver extends ELRes
context.setPropertyResolved(true);
return this.readOnly || UNMODIFIABLE.equals(base.getClass());
}
-
+
return this.readOnly;
}
Modified: tomcat/trunk/java/javax/el/MethodExpression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MethodExpression.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MethodExpression.java (original)
+++ tomcat/trunk/java/javax/el/MethodExpression.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,12 +25,12 @@ public abstract class MethodExpression e
private static final long serialVersionUID = 8163925562047324656L;
public abstract MethodInfo getMethodInfo(ELContext context) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
-
+
public abstract Object invoke(ELContext context, Object[] params) throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException;
-
+
/**
* @since EL 2.2
- *
+ *
* Note: The spelling mistake is deliberate.
* isParmetersProvided() - Specification definition
* isParametersProvided() - Corrected spelling
Modified: tomcat/trunk/java/javax/el/MethodInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MethodInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MethodInfo.java (original)
+++ tomcat/trunk/java/javax/el/MethodInfo.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,28 +23,28 @@ package javax.el;
public class MethodInfo {
private final String name;
-
+
private final Class<?>[] paramTypes;
-
+
private final Class<?> returnType;
-
+
/**
- *
+ *
*/
public MethodInfo(String name, Class<?> returnType, Class<?>[] paramTypes) {
this.name = name;
this.returnType = returnType;
this.paramTypes = paramTypes;
}
-
+
public String getName() {
return this.name;
}
-
+
public Class<?>[] getParamTypes() {
return this.paramTypes;
}
-
+
public Class<?> getReturnType() {
return this.returnType;
}
Modified: tomcat/trunk/java/javax/el/MethodNotFoundException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MethodNotFoundException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/MethodNotFoundException.java (original)
+++ tomcat/trunk/java/javax/el/MethodNotFoundException.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ public class MethodNotFoundException ext
private static final long serialVersionUID = -3631968116081480328L;
/**
- *
+ *
*/
public MethodNotFoundException() {
super();
Modified: tomcat/trunk/java/javax/el/PropertyNotFoundException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/PropertyNotFoundException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/PropertyNotFoundException.java (original)
+++ tomcat/trunk/java/javax/el/PropertyNotFoundException.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ public class PropertyNotFoundException e
private static final long serialVersionUID = -3799200961303506745L;
/**
- *
+ *
*/
public PropertyNotFoundException() {
super();
Modified: tomcat/trunk/java/javax/el/PropertyNotWritableException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/PropertyNotWritableException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/PropertyNotWritableException.java (original)
+++ tomcat/trunk/java/javax/el/PropertyNotWritableException.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ public class PropertyNotWritableExceptio
private static final long serialVersionUID = 827987155471214717L;
/**
- *
+ *
*/
public PropertyNotWritableException() {
super();
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@ public class ResourceBundleELResolver ex
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
if (property != null) {
try {
@@ -60,11 +60,11 @@ public class ResourceBundleELResolver ex
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
}
-
+
return null;
}
@@ -76,7 +76,7 @@ public class ResourceBundleELResolver ex
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
throw new PropertyNotWritableException(message(context,
@@ -91,18 +91,18 @@ public class ResourceBundleELResolver ex
if (context == null) {
throw new NullPointerException();
}
-
+
if (base instanceof ResourceBundle) {
context.setPropertyResolved(true);
}
-
+
return true;
}
@Override
// Can't use Iterator<FeatureDescriptor> because API needs to match
// specification
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public Iterator getFeatureDescriptors(
ELContext context, Object base) {
if (base instanceof ResourceBundle) {
Modified: tomcat/trunk/java/javax/el/ValueExpression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueExpression.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ValueExpression.java (original)
+++ tomcat/trunk/java/javax/el/ValueExpression.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,13 +25,13 @@ public abstract class ValueExpression ex
private static final long serialVersionUID = 8577809572381654673L;
public abstract Class<?> getExpectedType();
-
+
public abstract Class<?> getType(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract boolean isReadOnly(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
-
+
public abstract void setValue(ELContext context, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException;
-
+
public abstract Object getValue(ELContext context) throws NullPointerException, PropertyNotFoundException, ELException;
/**
Modified: tomcat/trunk/java/javax/el/ValueReference.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ValueReference.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ValueReference.java (original)
+++ tomcat/trunk/java/javax/el/ValueReference.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,10 +25,10 @@ import java.io.Serializable;
public class ValueReference implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private final Object base;
private final Object property;
-
+
public ValueReference(Object base, Object property) {
this.base = base;
this.property = property;
@@ -37,7 +37,7 @@ public class ValueReference implements S
public Object getBase() {
return base;
}
-
+
public Object getProperty() {
return property;
}
Modified: tomcat/trunk/java/javax/el/VariableMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/VariableMapper.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/VariableMapper.java (original)
+++ tomcat/trunk/java/javax/el/VariableMapper.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,6 @@ package javax.el;
public abstract class VariableMapper {
public abstract ValueExpression resolveVariable(String variable);
-
+
public abstract ValueExpression setVariable(String variable, ValueExpression expression);
}
Modified: tomcat/trunk/java/javax/persistence/PersistenceContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContext.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContext.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContext.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/persistence/PersistenceContextType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContextType.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContextType.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContextType.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/persistence/PersistenceContexts.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContexts.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContexts.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContexts.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/persistence/PersistenceUnit.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceUnit.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceUnit.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceUnit.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/persistence/PersistenceUnits.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceUnits.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceUnits.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceUnits.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/javax/servlet/AsyncContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncContext.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/AsyncContext.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncContext.java Sat Oct 22 20:54:57 2011
@@ -32,51 +32,51 @@ public interface AsyncContext {
"javax.servlet.async.servlet_path";
public static final String ASYNC_QUERY_STRING =
"javax.servlet.async.query_string";
-
+
ServletRequest getRequest();
-
+
ServletResponse getResponse();
-
+
boolean hasOriginalRequestAndResponse();
-
+
/**
- *
+ *
* @throws IllegalStateException
*/
void dispatch();
-
+
/**
- *
+ *
* @param path
* @throws IllegalStateException
*/
void dispatch(String path);
-
+
/**
- *
+ *
* @param context
* @param path
* @throws IllegalStateException
*/
void dispatch(ServletContext context, String path);
-
+
void complete();
-
+
void start(Runnable run);
-
+
void addListener(AsyncListener listener);
-
+
void addListener(AsyncListener listener, ServletRequest request,
ServletResponse response);
-
+
<T extends AsyncListener> T createListener(Class<T> clazz)
throws ServletException;
-
+
/**
* Get timeout in milliseconds. 0 or less indicates no timeout.
*/
long getTimeout();
-
+
/**
* Set timeout in milliseconds. 0 or less indicates no timeout.
*/
Modified: tomcat/trunk/java/javax/servlet/AsyncEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/AsyncEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncEvent.java Sat Oct 22 20:54:57 2011
@@ -25,7 +25,7 @@ public class AsyncEvent {
private final ServletRequest request;
private final ServletResponse response;
private final Throwable throwable;
-
+
public AsyncEvent(AsyncContext context) {
this.context = context;
this.request = null;
@@ -40,7 +40,7 @@ public class AsyncEvent {
this.response = response;
this.throwable = null;
}
-
+
public AsyncEvent(AsyncContext context, Throwable throwable) {
this.context = context;
this.throwable = throwable;
@@ -55,7 +55,7 @@ public class AsyncEvent {
this.response = response;
this.throwable = throwable;
}
-
+
public AsyncContext getAsyncContext() {
return context;
}
@@ -63,11 +63,11 @@ public class AsyncEvent {
public ServletRequest getSuppliedRequest() {
return request;
}
-
+
public ServletResponse getSuppliedResponse() {
return response;
}
-
+
public Throwable getThrowable() {
return throwable;
}
Modified: tomcat/trunk/java/javax/servlet/Filter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Filter.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/Filter.java (original)
+++ tomcat/trunk/java/javax/servlet/Filter.java Sat Oct 22 20:54:57 2011
@@ -40,7 +40,7 @@ import java.io.IOException;
* 7) Filters that trigger resource access events <br>
* 8) XSL/T filters <br>
* 9) Mime-type chain Filter <br>
- *
+ *
* @since Servlet 2.3
*/
public interface Filter {
@@ -89,7 +89,7 @@ public interface Filter {
* passed. After the web container calls this method, it will not call the
* doFilter method again on this instance of the filter. <br>
* <br>
- *
+ *
* This method gives the filter an opportunity to clean up any resources
* that are being held (for example, memory, file handles, threads) and make
* sure that any persistent state is synchronized with the filter's current
Modified: tomcat/trunk/java/javax/servlet/FilterChain.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterChain.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/FilterChain.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterChain.java Sat Oct 22 20:54:57 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
* Filters use the FilterChain to invoke the next filter in the chain, or if the
* calling filter is the last filter in the chain, to invoke the resource at the
* end of the chain.
- *
+ *
* @see Filter
* @since Servlet 2.3
**/
@@ -35,12 +35,12 @@ public interface FilterChain {
* Causes the next filter in the chain to be invoked, or if the calling
* filter is the last filter in the chain, causes the resource at the end of
* the chain to be invoked.
- *
+ *
* @param request
* the request to pass along the chain.
* @param response
* the response to pass along the chain.
- *
+ *
* @since 2.3
*/
public void doFilter(ServletRequest request, ServletResponse response)
Modified: tomcat/trunk/java/javax/servlet/FilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterConfig.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/FilterConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterConfig.java Sat Oct 22 20:54:57 2011
@@ -20,10 +20,10 @@ package javax.servlet;
import java.util.Enumeration;
/**
- *
+ *
* A filter configuration object used by a servlet container to pass information
* to a filter during initialization.
- *
+ *
* @see Filter
* @since Servlet 2.3
*/
@@ -38,10 +38,10 @@ public interface FilterConfig {
/**
* Returns a reference to the {@link ServletContext} in which the caller is
* executing.
- *
+ *
* @return {@link ServletContext} object, used by the caller to interact
* with its servlet container
- *
+ *
* @see ServletContext
*/
public ServletContext getServletContext();
@@ -50,11 +50,11 @@ public interface FilterConfig {
* Returns a <code>String</code> containing the value of the named
* initialization parameter, or <code>null</code> if the parameter does not
* exist.
- *
+ *
* @param name
* <code>String</code> specifying the name of the initialization
* parameter
- *
+ *
* @return <code>String</code> containing the value of the initialization
* parameter
*/
@@ -64,7 +64,7 @@ public interface FilterConfig {
* Returns the names of the filter's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the filter has no initialization parameters.
- *
+ *
* @return <code>Enumeration</code> of <code>String</code> objects
* containing the names of the filter's initialization parameters
*/
Modified: tomcat/trunk/java/javax/servlet/FilterRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterRegistration.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/FilterRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterRegistration.java Sat Oct 22 20:54:57 2011
@@ -24,9 +24,9 @@ import java.util.EnumSet;
* TODO SERVLET3 - Add comments
*/
public interface FilterRegistration extends Registration {
-
+
/**
- *
+ *
* @param dispatcherTypes
* @param isMatchAfter
* @param servletNames
@@ -37,13 +37,13 @@ public interface FilterRegistration exte
EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String... servletNames);
/**
- *
+ *
* @return TODO
*/
public Collection<String> getServletNameMappings();
-
+
/**
- *
+ *
* @param dispatcherTypes
* @param isMatchAfter
* @param urlPatterns
@@ -55,11 +55,11 @@ public interface FilterRegistration exte
boolean isMatchAfter, String... urlPatterns);
/**
- *
+ *
* @return TODO
*/
public Collection<String> getUrlPatternMappings();
-
+
public static interface Dynamic
extends FilterRegistration, Registration.Dynamic {
// No additional methods
Modified: tomcat/trunk/java/javax/servlet/GenericServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericServlet.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/GenericServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericServlet.java Sat Oct 22 20:54:57 2011
@@ -36,7 +36,7 @@ import java.util.Enumeration;
* <p>
* To write a generic servlet, you need only override the abstract
* <code>service</code> method.
- *
+ *
* @version $Version$
*/
public abstract class GenericServlet implements Servlet, ServletConfig,
@@ -70,7 +70,7 @@ public abstract class GenericServlet imp
* <p>
* This method is supplied for convenience. It gets the value of the named
* parameter from the servlet's <code>ServletConfig</code> object.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the
* initialization parameter
@@ -90,7 +90,7 @@ public abstract class GenericServlet imp
* <p>
* This method is supplied for convenience. It gets the parameter names from
* the servlet's <code>ServletConfig</code> object.
- *
+ *
* @return Enumeration an enumeration of <code>String</code> objects
* containing the names of the servlet's initialization parameters
*/
@@ -101,7 +101,7 @@ public abstract class GenericServlet imp
/**
* Returns this servlet's {@link ServletConfig} object.
- *
+ *
* @return ServletConfig the <code>ServletConfig</code> object that
* initialized this servlet
*/
@@ -116,7 +116,7 @@ public abstract class GenericServlet imp
* <p>
* This method is supplied for convenience. It gets the context from the
* servlet's <code>ServletConfig</code> object.
- *
+ *
* @return ServletContext the <code>ServletContext</code> object passed to
* this servlet by the <code>init</code> method
*/
@@ -130,7 +130,7 @@ public abstract class GenericServlet imp
* copyright. By default, this method returns an empty string. Override this
* method to have it return a meaningful value. See
* {@link Servlet#getServletInfo}.
- *
+ *
* @return String information about this servlet, by default an empty string
*/
@Override
@@ -145,7 +145,7 @@ public abstract class GenericServlet imp
* This implementation stores the {@link ServletConfig} object it receives
* from the servlet container for later use. When overriding this form of
* the method, call <code>super.init(config)</code>.
- *
+ *
* @param config
* the <code>ServletConfig</code> object that contains
* configuration information for this servlet
@@ -169,7 +169,7 @@ public abstract class GenericServlet imp
* <code>GenericServlet.init(ServletConfig config)</code>. The
* <code>ServletConfig</code> object can still be retrieved via
* {@link #getServletConfig}.
- *
+ *
* @exception ServletException
* if an exception occurs that interrupts the servlet's
* normal operation
@@ -181,7 +181,7 @@ public abstract class GenericServlet imp
/**
* Writes the specified message to a servlet log file, prepended by the
* servlet's name. See {@link ServletContext#log(String)}.
- *
+ *
* @param msg
* a <code>String</code> specifying the message to be written to
* the log file
@@ -194,7 +194,7 @@ public abstract class GenericServlet imp
* Writes an explanatory message and a stack trace for a given
* <code>Throwable</code> exception to the servlet log file, prepended by
* the servlet's name. See {@link ServletContext#log(String, Throwable)}.
- *
+ *
* @param message
* a <code>String</code> that describes the error or exception
* @param t
@@ -210,7 +210,7 @@ public abstract class GenericServlet imp
* <p>
* This method is declared abstract so subclasses, such as
* <code>HttpServlet</code>, must override it.
- *
+ *
* @param req
* the <code>ServletRequest</code> object that contains the
* client's request
@@ -230,7 +230,7 @@ public abstract class GenericServlet imp
/**
* Returns the name of this servlet instance. See
* {@link ServletConfig#getServletName}.
- *
+ *
* @return the name of this servlet instance
*/
@Override
Modified: tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpConstraintElement.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpConstraintElement.java Sat Oct 22 20:54:57 2011
@@ -26,7 +26,7 @@ import javax.servlet.annotation.ServletS
* TODO SERVLET3 - Add comments
*/
public class HttpConstraintElement {
-
+
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
@@ -34,7 +34,7 @@ public class HttpConstraintElement {
private final EmptyRoleSemantic emptyRoleSemantic;// = EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// = TransportGuarantee.NONE;
private final String[] rolesAllowed;// = new String[0];
-
+
/**
* Default constraint is permit with no transport guarantee.
*/
@@ -44,17 +44,17 @@ public class HttpConstraintElement {
this.transportGuarantee = TransportGuarantee.NONE;
this.rolesAllowed = new String[0];
}
-
+
/**
* Convenience constructor for {@link EmptyRoleSemantic#DENY}.
- *
+ *
*/
public HttpConstraintElement(EmptyRoleSemantic emptyRoleSemantic) {
this.emptyRoleSemantic = emptyRoleSemantic;
this.transportGuarantee = TransportGuarantee.NONE;
this.rolesAllowed = new String[0];
}
-
+
/**
* Convenience constructor to specify transport guarantee and/or roles.
*/
@@ -66,7 +66,7 @@ public class HttpConstraintElement {
}
/**
- *
+ *
* @param emptyRoleSemantic
* @param transportGuarantee
* @param rolesAllowed
@@ -83,15 +83,15 @@ public class HttpConstraintElement {
this.transportGuarantee = transportGuarantee;
this.rolesAllowed = rolesAllowed;
}
-
+
public EmptyRoleSemantic getEmptyRoleSemantic() {
return emptyRoleSemantic;
}
-
+
public TransportGuarantee getTransportGuarantee() {
return transportGuarantee;
}
-
+
public String[] getRolesAllowed() {
return rolesAllowed;
}
Modified: tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java Sat Oct 22 20:54:57 2011
@@ -38,7 +38,7 @@ public class HttpMethodConstraintElement
}
this.methodName = methodName;
}
-
+
public HttpMethodConstraintElement(String methodName,
HttpConstraintElement constraint) {
super(constraint.getEmptyRoleSemantic(),
@@ -50,7 +50,7 @@ public class HttpMethodConstraintElement
}
this.methodName = methodName;
}
-
+
public String getMethodName() {
return methodName;
}
Modified: tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties Sat Oct 22 20:54:57 2011
@@ -18,6 +18,6 @@
err.not_iso8859_1={0} n''est pas un caract\u00e8re ISO 8859-1
value.true=true
-value.false=false
+value.false=false
Modified: tomcat/trunk/java/javax/servlet/MultipartConfigElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/MultipartConfigElement.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/MultipartConfigElement.java (original)
+++ tomcat/trunk/java/javax/servlet/MultipartConfigElement.java Sat Oct 22 20:54:57 2011
@@ -23,12 +23,12 @@ import javax.servlet.annotation.Multipar
* TODO SERVLET3 - Add comments
*/
public class MultipartConfigElement {
-
+
private final String location;// = "";
private final long maxFileSize;// = -1;
private final long maxRequestSize;// = -1;
private final int fileSizeThreshold;// = 0;
-
+
public MultipartConfigElement(String location) {
// Keep empty string default if location is null
if (location != null) {
@@ -40,7 +40,7 @@ public class MultipartConfigElement {
this.maxRequestSize = -1;
this.fileSizeThreshold = 0;
}
-
+
public MultipartConfigElement(String location, long maxFileSize,
long maxRequestSize, int fileSizeThreshold) {
// Keep empty string default if location is null
@@ -53,26 +53,26 @@ public class MultipartConfigElement {
this.maxRequestSize = maxRequestSize;
this.fileSizeThreshold = fileSizeThreshold;
}
-
+
public MultipartConfigElement(MultipartConfig annotation) {
location = annotation.location();
maxFileSize = annotation.maxFileSize();
maxRequestSize = annotation.maxRequestSize();
fileSizeThreshold = annotation.fileSizeThreshold();
}
-
+
public String getLocation() {
return location;
}
-
+
public long getMaxFileSize() {
return maxFileSize;
}
-
+
public long getMaxRequestSize() {
return maxRequestSize;
}
-
+
public int getFileSizeThreshold() {
return fileSizeThreshold;
}
Modified: tomcat/trunk/java/javax/servlet/Registration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Registration.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/Registration.java (original)
+++ tomcat/trunk/java/javax/servlet/Registration.java Sat Oct 22 20:54:57 2011
@@ -25,13 +25,13 @@ import java.util.Set;
* TODO SERVLET3 - Add comments
*/
public interface Registration {
-
+
public String getName();
-
+
public String getClassName();
/**
- *
+ *
* @param name
* @param value
* @return TODO
@@ -41,9 +41,9 @@ public interface Registration {
public boolean setInitParameter(String name, String value);
public String getInitParameter(String name);
-
+
/**
- *
+ *
* @param initParameters
* @return TODO
* @throws IllegalArgumentException
@@ -54,9 +54,9 @@ public interface Registration {
public Map<String, String> getInitParameters();
public interface Dynamic extends Registration {
-
+
/**
- *
+ *
* @param isAsyncSupported
* @throws IllegalStateException
*/
Modified: tomcat/trunk/java/javax/servlet/RequestDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/RequestDispatcher.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/RequestDispatcher.java (original)
+++ tomcat/trunk/java/javax/servlet/RequestDispatcher.java Sat Oct 22 20:54:57 2011
@@ -24,18 +24,18 @@ import java.io.IOException;
* servlet container creates the <code>RequestDispatcher</code> object, which is
* used as a wrapper around a server resource located at a particular path or
* given by a particular name.
- *
+ *
* <p>
* This interface is intended to wrap servlets, but a servlet container can
* create <code>RequestDispatcher</code> objects to wrap any type of resource.
- *
+ *
* @author Various
* @version $Version$
- *
+ *
* @see ServletContext#getRequestDispatcher(java.lang.String)
* @see ServletContext#getNamedDispatcher(java.lang.String)
* @see ServletRequest#getRequestDispatcher(java.lang.String)
- *
+ *
*/
public interface RequestDispatcher {
@@ -61,41 +61,41 @@ public interface RequestDispatcher {
* or HTML file) on the server. This method allows one servlet to do
* preliminary processing of a request and another resource to generate the
* response.
- *
+ *
* <p>
* For a <code>RequestDispatcher</code> obtained via
* <code>getRequestDispatcher()</code>, the <code>ServletRequest</code>
* object has its path elements and parameters adjusted to match the path of
* the target resource.
- *
+ *
* <p>
* <code>forward</code> should be called before the response has been
* committed to the client (before response body output has been flushed).
* If the response already has been committed, this method throws an
* <code>IllegalStateException</code>. Uncommitted output in the response
* buffer is automatically cleared before the forward.
- *
+ *
* <p>
* The request and response parameters must be either the same objects as
* were passed to the calling servlet's service method or be subclasses of
* the {@link ServletRequestWrapper} or {@link ServletResponseWrapper}
* classes that wrap them.
- *
- *
+ *
+ *
* @param request
* a {@link ServletRequest} object that represents the request
* the client makes of the servlet
- *
+ *
* @param response
* a {@link ServletResponse} object that represents the response
* the servlet returns to the client
- *
+ *
* @exception ServletException
* if the target resource throws this exception
- *
+ *
* @exception IOException
* if the target resource throws this exception
- *
+ *
* @exception IllegalStateException
* if the response was already committed
*/
@@ -106,30 +106,30 @@ public interface RequestDispatcher {
* Includes the content of a resource (servlet, JSP page, HTML file) in the
* response. In essence, this method enables programmatic server-side
* includes.
- *
+ *
* <p>
* The {@link ServletResponse} object has its path elements and parameters
* remain unchanged from the caller's. The included servlet cannot change
* the response status code or set headers; any attempt to make a change is
* ignored.
- *
+ *
* <p>
* The request and response parameters must be either the same objects as
* were passed to the calling servlet's service method or be subclasses of
* the {@link ServletRequestWrapper} or {@link ServletResponseWrapper}
* classes that wrap them.
- *
+ *
* @param request
* a {@link ServletRequest} object that contains the client's
* request
- *
+ *
* @param response
* a {@link ServletResponse} object that contains the servlet's
* response
- *
+ *
* @exception ServletException
* if the included resource throws this exception
- *
+ *
* @exception IOException
* if the included resource throws this exception
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org