tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1198569 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-2.3/WEB-INF/ test/webapp-2.4/WEB-INF/ test/webapp-2.5/WEB-INF/ test/webapp-3.0-fragments/WEB-INF/ test/webapp-3.0-servletsecurity/WEB-INF/ test/webapp-3.0-servletsecurity2/WEB-INF/ test/we...
Date Sun, 06 Nov 2011 21:29:08 GMT
Author: kkolinko
Date: Sun Nov  6 21:29:08 2011
New Revision: 1198569

URL: http://svn.apache.org/viewvc?rev=1198569&view=rev
Log:
Porting r1187806 - whitespace cleanup in /test
Last portion - xml, jsp, tld files. Update mergeinfo on the tc7.0.x\trunk folder.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bugs.tld
    tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld
    tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/test/webapp-3.0/bug47413.jsp
    tomcat/tc7.0.x/trunk/test/webapp-3.0/echo-params.jsp

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov  6 21:29:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 755,1187775,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197299-1197300,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187
 755,1187775,1187806,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197299-1197300,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552

Modified: tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.3/WEB-INF/web.xml Sun Nov  6 21:29:08 2011
@@ -27,6 +27,6 @@
     Servlet specification and version 1.2 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml Sun Nov  6 21:29:08 2011
@@ -28,6 +28,6 @@
     Servlet specification and version 2.0 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.5/WEB-INF/web.xml Sun Nov  6 21:29:08 2011
@@ -28,6 +28,6 @@
     Servlet specification and version 2.1 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Sun Nov  6 21:29:08 2011
@@ -20,26 +20,26 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="false">  
+  metadata-complete="false">
 
   <display-name>Tomcat Test Application</display-name>
   <description>
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <servlet>
     <servlet-name>AllowByAnnotation</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$SubclassAllowAllServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>AllowByAnnotation</servlet-name>
-    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
 
+    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
   </servlet-mapping>
   <security-constraint>
     <auth-constraint/>
     <web-resource-collection>
-    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
 
+    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
     </web-resource-collection>
   </security-constraint>
 

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml Sun Nov  6 21:29:08
2011
@@ -19,7 +19,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  version="3.0">  
+  version="3.0">
 
   <!--
     WARNING:
@@ -34,7 +34,7 @@
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <servlet>
     <servlet-name>RoleProtected</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$RoleAllowServlet</servlet-class>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml Sun Nov  6 21:29:08
2011
@@ -20,7 +20,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="true">  
+  metadata-complete="true">
 
   <!--
     WARNING:
@@ -33,7 +33,7 @@
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <security-constraint>
     <auth-constraint/>
     <web-resource-collection>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bugs.tld
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bugs.tld?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bugs.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/bugs.tld Sun Nov  6 21:29:08 2011
@@ -34,7 +34,7 @@
     <tei-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTei</tei-class>
     <body-content>JSP</body-content>
   </tag>
-  
+
   <tag>
     <name>Bug48701a</name>
     <tag-class>org.apache.jasper.compiler.TestGenerator$Bug48701</tag-class>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/test.tld Sun Nov  6 21:29:08 2011
@@ -23,7 +23,7 @@
   <tlib-version>1.0</tlib-version>
   <short-name>TesterFunctions</short-name>
   <uri>http://tomcat.apache.org/testerFunctions</uri>
-  
+
   <function>
     <name>trim</name>
     <function-class>org.apache.el.TesterFunctions</function-class>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/WEB-INF/web.xml Sun Nov  6 21:29:08 2011
@@ -20,14 +20,14 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="true">  
+  metadata-complete="true">
 
   <display-name>Tomcat Test Application</display-name>
   <description>
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <!--  Bug 49922 -->
   <filter>
     <filter-name>Bug49922</filter-name>
@@ -95,7 +95,7 @@
     <servlet-name>Bug49922</servlet-name>
     <url-pattern>*.od</url-pattern>
   </servlet-mapping>
-  
+
   <jsp-config>
     <jsp-property-group>
       <default-content-type>text/plain</default-content-type>
@@ -103,14 +103,14 @@
       <url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
     </jsp-property-group>
   </jsp-config>
-  
+
   <servlet>
     <servlet-name>DenyByAnnotation</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$DenyAllServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>DenyByAnnotation</servlet-name>
-    <url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>
 
+    <url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>
   </servlet-mapping>
 
   <login-config>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug47413.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug47413.jsp?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug47413.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug47413.jsp Sun Nov  6 21:29:08 2011
@@ -26,11 +26,11 @@
     <jsp:setProperty name="values" property="doubleValue" value="${1+2}.${220}"/>
     <p>02-${values.doubleValue}</p>
     <tags:echo-double index="03" echo="${1+2}.${220}"/>
-    
+
     <jsp:setProperty name="values" property="longValue" value="000${1}${7}"/>
     <p>04-${values.longValue}</p>
     <tags:echo-long index="05" echo="000${1}${7}"/>
-    
+
     <jsp:setProperty name="values" property="stringValue"
                      value="${undefinedFoo}hello world${undefinedBar}"/>
     <p>06-${values.stringValue}</p>

Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/echo-params.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/echo-params.jsp?rev=1198569&r1=1198568&r2=1198569&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/echo-params.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/echo-params.jsp Sun Nov  6 21:29:08 2011
@@ -21,7 +21,7 @@
 Enumeration<String> params = request.getParameterNames();
 while (params.hasMoreElements()) {
     String param = params.nextElement();
-    
+
     String[] values = request.getParameterValues(param);
     for (String value : values) {
         // Don't do this in a real webapp - XSS issues



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message