tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r1037279 [1/10] - in /tomcat/taglibs/standard/trunk/impl: ./ src/main/java/org/apache/taglibs/standard/ src/main/java/org/apache/taglibs/standard/functions/ src/main/java/org/apache/taglibs/standard/tag/common/core/ src/main/java/org/apache...
Date Sat, 20 Nov 2010 17:57:49 GMT
Author: jboynes
Date: Sat Nov 20 17:57:45 2010
New Revision: 1037279

URL: http://svn.apache.org/viewvc?rev=1037279&view=rev
Log:
reformat code to remove tabs;add checkstyle report

Added:
    tomcat/taglibs/standard/trunk/impl/checkstyle.xml   (with props)
Modified:
    tomcat/taglibs/standard/trunk/impl/pom.xml
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamParent.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/Util.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java
    tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c-1_1.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/c.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fmt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/permittedTaglibs.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/scriptfree.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/sql.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x-1_0-rt.tld
    tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/x.tld
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/functions/FunctionsTest.java
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/core/SetSupportTest.java
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/util/EscapeXMLTest.java

Added: tomcat/taglibs/standard/trunk/impl/checkstyle.xml
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/checkstyle.xml?rev=1037279&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/checkstyle.xml (added)
+++ tomcat/taglibs/standard/trunk/impl/checkstyle.xml Sat Nov 20 17:57:45 2010
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+  <!-- When adding checks, keep to the order checks are listed under         -->
+  <!-- 'Standard Checks' in the Checkstyle documentation:                    -->
+  <!-- http://checkstyle.sourceforge.net/config_coding.html                  -->
+
+  <!-- Whitespace -->
+  <module name="FileTabCharacter"/>
+
+  <module name="TreeWalker">
+    <!-- Coding -->
+    <module name="IllegalInstantiation">
+        <property name="classes" value="java.lang.Boolean"/>
+    </module>
+    
+    <!-- Imports -->
+    <module name="AvoidStarImport"/>
+    <module name="AvoidStaticImport"/>
+    <module name="IllegalImport"/>
+    <module name="ImportOrder">
+        <property name="groups" value="java,javax,async,jsp2,junit,org,util"/>
+        <property name="ordered" value="true"/>
+        <property name="separated" value="true"/>
+        <property name="option" value="above"/>
+    </module>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    
+    <!--  Modifiers -->
+    <!-- ~250 errors
+    <module name="ModifierOrder"/>
+    -->
+    <!-- ~1750 errors
+    <module name="RedundantModifier"/>
+    -->
+    
+    <!-- Whitespace -->
+    <!-- Can't handle HashMap<String,Class<?>[]>
+    https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078
+    <module name="GenericWhitespace"/>
+    -->
+    <module name="EmptyForInitializerPad"/>
+    <module name="EmptyForIteratorPad"/>
+  </module>
+</module>
\ No newline at end of file

Propchange: tomcat/taglibs/standard/trunk/impl/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Nov 20 17:57:45 2010
@@ -20,157 +20,198 @@
     Enable Cactus tests
 -->
 <project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.taglibs</groupId>
-    <artifactId>taglibs-parent</artifactId>
-    <version>1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>taglibs-standard-impl</artifactId>
-  <version>1.2-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <name>Apache Standard Taglib - JSTL Implementation</name>
-
-  <inceptionYear>2001</inceptionYear>
-  <description>
-    An implementation of the JSP Standard Tag Library (JSTL).
-  </description>
-
-  <url>http://tomcat.apache.org/taglibs/standard/</url>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl</developerConnection>
-    <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl</url>
-  </scm>
-
-  <developers>
-    <developer><name>Pierre Delisle</name></developer>
-    <developer><name>Shawn Bayern</name></developer>
-    <developer><name>Nathan Abramson</name></developer>
-    <developer><name>Hans Bergsten</name></developer>
-    <developer><name>Scott Hasse</name></developer>
-    <developer><name>Justyna Horwat</name></developer>
-    <developer><name>Mark Kolb</name></developer>
-    <developer><name>Jan Luehe</name></developer>
-    <developer><name>Glenn Nielsen</name></developer>
-    <developer><name>Dmitri Plotnikov</name></developer>
-    <developer><name>Felipe Leme</name></developer>
-    <developer><name>Henri Yandell</name></developer>
-    <developer><name>Bjorn Townsend</name></developer>
-  </developers>
-
-  <contributors>
-    <contributor><name>Robert Goff</name></contributor>
-  </contributors>
-
-  <dependencies>
-      <dependency>
-      <groupId>org.apache.taglibs</groupId>
-      <artifactId>taglibs-standard-spec</artifactId>
-      <version>1.2-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-      <dependency>
-          <groupId>org.easymock</groupId>
-          <artifactId>easymock</artifactId>
-          <version>3.0</version>
-          <scope>test</scope>
-      </dependency>
-  </dependencies> 
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <excludeDependencies>true</excludeDependencies>
-          <instructions>
-            <Export-Package>*;version="1.2"</Export-Package>
-            <Import-Package>org.apache.x*;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <targetJdk>${maven.compiler.target}</targetJdk>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>pmd</report>
-              <report>cpd</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javancss-maven-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-          <threshold>Normal</threshold>
-          <effort>Default</effort>
-<!--          <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
-       </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.taglibs</groupId>
+        <artifactId>taglibs-parent</artifactId>
+        <version>1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>taglibs-standard-impl</artifactId>
+    <version>1.2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>Apache Standard Taglib - JSTL Implementation</name>
+
+    <inceptionYear>2001</inceptionYear>
+    <description>
+        An implementation of the JSP Standard Tag Library (JSTL).
+    </description>
+
+    <url>http://tomcat.apache.org/taglibs/standard/</url>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/impl
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>Pierre Delisle</name>
+        </developer>
+        <developer>
+            <name>Shawn Bayern</name>
+        </developer>
+        <developer>
+            <name>Nathan Abramson</name>
+        </developer>
+        <developer>
+            <name>Hans Bergsten</name>
+        </developer>
+        <developer>
+            <name>Scott Hasse</name>
+        </developer>
+        <developer>
+            <name>Justyna Horwat</name>
+        </developer>
+        <developer>
+            <name>Mark Kolb</name>
+        </developer>
+        <developer>
+            <name>Jan Luehe</name>
+        </developer>
+        <developer>
+            <name>Glenn Nielsen</name>
+        </developer>
+        <developer>
+            <name>Dmitri Plotnikov</name>
+        </developer>
+        <developer>
+            <name>Felipe Leme</name>
+        </developer>
+        <developer>
+            <name>Henri Yandell</name>
+        </developer>
+        <developer>
+            <name>Bjorn Townsend</name>
+        </developer>
+    </developers>
+
+    <contributors>
+        <contributor>
+            <name>Robert Goff</name>
+        </contributor>
+    </contributors>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-spec</artifactId>
+            <version>1.2-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>el-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <excludeDependencies>true</excludeDependencies>
+                    <instructions>
+                        <Export-Package>*;version="1.2"</Export-Package>
+                        <Import-Package>org.apache.x*;resolution:=optional,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jxr-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <targetJdk>${maven.compiler.target}</targetJdk>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>pmd</report>
+                            <report>cpd</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>javancss-maven-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>1.2</version>
+                <configuration>
+                    <threshold>Normal</threshold>
+                    <effort>Default</effort>
+                    <!--          <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 
 
 </project>

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard;
 
@@ -23,109 +23,101 @@ package org.apache.taglibs.standard;
  * Administrative class to keep track of the version number of
  * the standard tag library.
  * <P>This class implements the upcoming standard of having
- * org.apache.project-name.Version.getVersion() be a standard way 
- * to get version information.  
+ * org.apache.project-name.Version.getVersion() be a standard way
+ * to get version information.
  */
-public class Version
-{
-  /**
-   * Get the basic version string for the current release.
-   * Version String formatted like 
-   * <CODE>"<B>standard-taglib</B> v.r[.dd| <B>D</B>nn]"</CODE>.
-   *
-   * Futurework: have this read version info from jar manifest.
-   *
-   * @return String denoting our current version
-   */
-  public static String getVersion()
-  {
-    return getProduct() + " " +
-           getMajorVersionNum() + "." + getReleaseVersionNum()+ "." +
-           getMaintenanceVersionNum() +
-           ((getDevelopmentVersionNum() > 0) ? 
-               ("_D" + getDevelopmentVersionNum()) : "");
-  }
-
-  /**
-   * Print the processor version to the command line.
-   *
-   * @param argv command line arguments, unused.
-   */
-  public static void main(String argv[])
-  {
-    System.out.println(getVersion());
-  }
-
-  /**
-   * Name of product
-   */
-  public static String getProduct()
-  {
-    return "standard-taglib";
-  }
-
-  /**
-   * Major version number.
-   * Version number. This changes only when there is a
-   *          significant, externally apparent enhancement from
-   *          the previous release. 'n' represents the n'th
-   *          version.
-   *
-   *          Clients should carefully consider the implications
-   *          of new versions as external interfaces and behaviour
-   *          may have changed.
-   */
-  public static int getMajorVersionNum()
-  {
-      return 1;
-  }
-
-  /**
-   * Release Number.
-   * Release number. This changes when:
-   *            -  a new set of functionality is to be added, eg,
-   *               implementation of a new W3C specification.
-   *            -  API or behaviour change.
-   *            -  its designated as a reference release.
-   */
-  public static int getReleaseVersionNum()
-  {
-    return 2;
-  }
-
-  /**
-   * Maintenance Drop Number.
-   * Optional identifier used to designate maintenance
-   *          drop applied to a specific release and contains
-   *          fixes for defects reported. It maintains compatibility
-   *          with the release and contains no API changes.
-   *          When missing, it designates the final and complete
-   *          development drop for a release.
-   */
-  public static int getMaintenanceVersionNum()
-  {
-    return 0;
-  }
-
-  /**
-   * Development Drop Number.
-   * Optional identifier designates development drop of
-   *          a specific release. D01 is the first development drop
-   *          of a new release.
-   *
-   *          Development drops are works in progress towards a
-   *          compeleted, final release. A specific development drop
-   *          may not completely implement all aspects of a new
-   *          feature, which may take several development drops to
-   *          complete. At the point of the final drop for the
-   *          release, the D suffix will be omitted.
-   *
-   *          Each 'D' drops can contain functional enhancements as
-   *          well as defect fixes. 'D' drops may not be as stable as
-   *          the final releases.
-   */
-  public static int getDevelopmentVersionNum()
-  {
-    return 0;
-  }
+public class Version {
+    /**
+     * Get the basic version string for the current release.
+     * Version String formatted like
+     * <CODE>"<B>standard-taglib</B> v.r[.dd| <B>D</B>nn]"</CODE>.
+     * <p/>
+     * Futurework: have this read version info from jar manifest.
+     *
+     * @return String denoting our current version
+     */
+    public static String getVersion() {
+        return getProduct() + " " +
+                getMajorVersionNum() + "." + getReleaseVersionNum() + "." +
+                getMaintenanceVersionNum() +
+                ((getDevelopmentVersionNum() > 0) ?
+                        ("_D" + getDevelopmentVersionNum()) : "");
+    }
+
+    /**
+     * Print the processor version to the command line.
+     *
+     * @param argv command line arguments, unused.
+     */
+    public static void main(String argv[]) {
+        System.out.println(getVersion());
+    }
+
+    /**
+     * Name of product
+     */
+    public static String getProduct() {
+        return "standard-taglib";
+    }
+
+    /**
+     * Major version number.
+     * Version number. This changes only when there is a
+     * significant, externally apparent enhancement from
+     * the previous release. 'n' represents the n'th
+     * version.
+     * <p/>
+     * Clients should carefully consider the implications
+     * of new versions as external interfaces and behaviour
+     * may have changed.
+     */
+    public static int getMajorVersionNum() {
+        return 1;
+    }
+
+    /**
+     * Release Number.
+     * Release number. This changes when:
+     * -  a new set of functionality is to be added, eg,
+     * implementation of a new W3C specification.
+     * -  API or behaviour change.
+     * -  its designated as a reference release.
+     */
+    public static int getReleaseVersionNum() {
+        return 2;
+    }
+
+    /**
+     * Maintenance Drop Number.
+     * Optional identifier used to designate maintenance
+     * drop applied to a specific release and contains
+     * fixes for defects reported. It maintains compatibility
+     * with the release and contains no API changes.
+     * When missing, it designates the final and complete
+     * development drop for a release.
+     */
+    public static int getMaintenanceVersionNum() {
+        return 0;
+    }
+
+    /**
+     * Development Drop Number.
+     * Optional identifier designates development drop of
+     * a specific release. D01 is the first development drop
+     * of a new release.
+     * <p/>
+     * Development drops are works in progress towards a
+     * compeleted, final release. A specific development drop
+     * may not completely implement all aspects of a new
+     * feature, which may take several development drops to
+     * complete. At the point of the final drop for the
+     * release, the D suffix will be omitted.
+     * <p/>
+     * Each 'D' drops can contain functional enhancements as
+     * well as defect fixes. 'D' drops may not be as stable as
+     * the final releases.
+     */
+    public static int getDevelopmentVersionNum() {
+        return 0;
+    }
 }

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.functions;
 
@@ -32,12 +32,12 @@ import org.apache.taglibs.standard.util.
 /**
  * Static functions that extend the Expression Language with standardized behaviour
  * commonly used by page authors.
- *
+ * <p/>
  * <strong>Implementation Note:</strong> When passing a String parameter, section
  * 1.18.2 of the EL specification requires the container to coerce a null value to an
  * empty string. These implementation assume such behaviour and do not check for null
  * parameters. Passing a null will generally trigger a NullPointerException.
- * 
+ *
  * @author Pierre Delisle
  */
 
@@ -67,18 +67,18 @@ public class Functions {
     public static String toLowerCase(String input) {
         return input.toLowerCase();
     }
-    
+
     //*********************************************************************
     // Substring processing
 
     /**
      * Returns the index (0-based) withing a string of the first occurrence of a specified
      * substring according to the semantics of the method <code>String#indexOf()</code>.
-     *
+     * <p/>
      * If <code>substring</code> is empty, this matches the beginning of the string and the
      * value returned is 0.
      *
-     * @param input the input string on which the function is applied
+     * @param input     the input string on which the function is applied
      * @param substring the substring to search for in the input string
      * @return the 0-based index of the first matching substring, or -1 if it does not occur
      */
@@ -89,23 +89,23 @@ public class Functions {
     /**
      * Tests if a string contains the specified substring.
      *
-     * @param input the input string on which the function is applied
+     * @param input     the input string on which the function is applied
      * @param substring the substring tested for
      * @return true if the character sequence represented by the substring
-     * exists in the string
+     *         exists in the string
      */
     public static boolean contains(String input, String substring) {
         return input.contains(substring);
-    }    
+    }
 
     /**
      * Tests if a string contains the specified substring in a case insensitive way.
      * Equivalent to <code>fn:contains(fn:toUpperCase(string), fn:toUpperCase(substring))</code>.
      *
-     * @param input the input string on which the function is applied
+     * @param input     the input string on which the function is applied
      * @param substring the substring tested for
      * @return true if the character sequence represented by the substring
-     * exists in the string
+     *         exists in the string
      */
     public static boolean containsIgnoreCase(String input, String substring) {
         return contains(input.toUpperCase(), substring.toUpperCase());
@@ -115,19 +115,19 @@ public class Functions {
      * Tests if a string starts with the specified prefix according to the semantics
      * of <code>String#startsWith()</code>.
      *
-     * @param input the input string on which the function is applied
+     * @param input  the input string on which the function is applied
      * @param prefix the prefix to be matched
      * @return true if the input string starts with the prefix
      */
     public static boolean startsWith(String input, String prefix) {
         return input.startsWith(prefix);
-    }    
-        
+    }
+
     /**
      * Tests if a string ends with the specified suffix according to the semantics
      * of <code>String#endsWith()</code>.
      *
-     * @param input the input string on which the function is applied
+     * @param input  the input string on which the function is applied
      * @param suffix the suffix to be matched
      * @return true if the input string ends with the suffix
      */
@@ -145,27 +145,33 @@ public class Functions {
      * <li>if <code>endIndex < beginIndex</code>, an empty string is returned</li>
      * </ul>
      *
-     * @param input the input string on which the substring function is applied
+     * @param input      the input string on which the substring function is applied
      * @param beginIndex the beginning index (0-based), inclusive
-     * @param endIndex the end index (0-based), exclusive
+     * @param endIndex   the end index (0-based), exclusive
      * @return a subset of string
      */
     public static String substring(String input, int beginIndex, int endIndex) {
-        if (beginIndex < 0) beginIndex = 0;
-        if (endIndex < 0 || endIndex > input.length()) endIndex = input.length();
-        if (endIndex < beginIndex) return "";
+        if (beginIndex < 0) {
+            beginIndex = 0;
+        }
+        if (endIndex < 0 || endIndex > input.length()) {
+            endIndex = input.length();
+        }
+        if (endIndex < beginIndex) {
+            return "";
+        }
         return input.substring(beginIndex, endIndex);
     }
 
     /**
      * Returns a subset of a string following the first occurrence of a specific substring.
-     *
+     * <p/>
      * If the substring is empty, it matches the beginning of the input string and the
      * entire input string is returned. If the substring does not occur, an empty string is returned.
      *
-     * @param input the input string on which the substring function is applied
+     * @param input     the input string on which the substring function is applied
      * @param substring the substring that delimits the beginning of the subset
-     * of the input string to be returned
+     *                  of the input string to be returned
      * @return a substring of the input string that starts at the first character after the specified substring
      */
     public static String substringAfter(String input, String substring) {
@@ -173,19 +179,19 @@ public class Functions {
         if (index == -1) {
             return "";
         } else {
-            return input.substring(index+substring.length());
+            return input.substring(index + substring.length());
         }
-    }    
-        
+    }
+
     /**
      * Returns a subset of a string immediately before the first occurrence of a specific substring.
-     *
+     * <p/>
      * If the substring is empty, it matches the beginning of the input string and an empty string is returned.
      * If the substring does not occur, an empty string is returned.
      *
-     * @param input the input string on which the substring function is applied
+     * @param input     the input string on which the substring function is applied
      * @param substring the substring that delimits the beginning of the subset
-     * of the input string to be returned
+     *                  of the input string to be returned
      * @return a substring of the input string that starts at the first character after the specified substring
      */
     public static String substringBefore(String input, String substring) {
@@ -195,7 +201,7 @@ public class Functions {
         } else {
             return input.substring(0, index);
         }
-    }    
+    }
 
     //*********************************************************************
     // Character replacement
@@ -224,13 +230,12 @@ public class Functions {
      * Returns a string resulting from replacing all occurrences of a "before" substring with an "after" substring.
      * The string is processed once and not reprocessed for further replacements.
      *
-     * @param input the string on which the replacement is to be applied
+     * @param input  the string on which the replacement is to be applied
      * @param before the substring to replace
-     * @param after the replacement substring
+     * @param after  the replacement substring
      * @return a string with before replaced with after
      */
-    public static String replace(String input, String before, String after)
-    {
+    public static String replace(String input, String before, String after) {
         if (before.length() == 0) {
             return input;
         }
@@ -242,14 +247,13 @@ public class Functions {
      * If the input string is empty, a single element array containing an empty string is returned.
      * If the delimiters are empty, a single element array containing the input string is returned.
      *
-     * @param input the string to split
+     * @param input      the string to split
      * @param delimiters characters used to split the string
      * @return an array of strings
      */
-    public static String[] split(String input, String delimiters)
-    {
+    public static String[] split(String input, String delimiters) {
         if (input.length() == 0 || delimiters.length() == 0) {
-            return new String[] { input };
+            return new String[]{input};
         }
 
         StringTokenizer tok = new StringTokenizer(input, delimiters);
@@ -263,12 +267,12 @@ public class Functions {
 
     /**
      * Joins all elements of an array into a string.
-     *
+     * <p/>
      * <strong>Implementation Note</strong>: The specification does not define what happens when
      * elements in the array are null. For compatibility with previous implementations, the string
      * "null" is used although EL conventions would suggest an empty string might be better.
      *
-     * @param array an array of strings to be joined
+     * @param array     an array of strings to be joined
      * @param separator used to separate the joined strings
      * @return all array elements joined into one string with the specified separator
      */
@@ -304,7 +308,7 @@ public class Functions {
         if (obj == null) {
             return 0;
         }
-        
+
         if (obj instanceof String) {
             return ((String) obj).length();
         }
@@ -316,15 +320,15 @@ public class Functions {
         }
         if (obj instanceof Iterator) {
             int count = 0;
-            Iterator iter = (Iterator)obj;
+            Iterator iter = (Iterator) obj;
             while (iter.hasNext()) {
                 count++;
                 iter.next();
             }
             return count;
-        }            
+        }
         if (obj instanceof Enumeration) {
-            Enumeration enum_ = (Enumeration)obj;
+            Enumeration enum_ = (Enumeration) obj;
             int count = 0;
             while (enum_.hasMoreElements()) {
                 count++;
@@ -336,5 +340,5 @@ public class Functions {
             return Array.getLength(obj);
         }
         throw new JspTagException(Resources.getMessage("PARAM_BAD_VALUE"));
-    }      
+    }
 }

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.tag.common.core;
 
@@ -23,7 +23,7 @@ import javax.servlet.jsp.tagext.TryCatch
 
 /**
  * <p>Tag handler for &lt;catch&gt; in JSTL 1.0.</p>
- * 
+ * <p/>
  * <p>&lt;catch&gt; simply catches any Throwables that occur in its body
  * and optionally exposes them.
  *
@@ -41,12 +41,14 @@ public class CatchTag extends TagSupport
     // Constructor and lifecycle management
 
     // initialize inherited and local state
+
     public CatchTag() {
         super();
         init();
     }
 
     // Releases any resources we may have (or inherit)
+
     @Override
     public void release() {
         super.release();
@@ -71,18 +73,20 @@ public class CatchTag extends TagSupport
     @Override
     public int doStartTag() {
         caught = false;
-	return EVAL_BODY_INCLUDE;
+        return EVAL_BODY_INCLUDE;
     }
 
     public void doCatch(Throwable t) {
-        if (var != null)
+        if (var != null) {
             pageContext.setAttribute(var, t, PageContext.PAGE_SCOPE);
+        }
         caught = true;
     }
 
     public void doFinally() {
-        if (var != null && !caught)
+        if (var != null && !caught) {
             pageContext.removeAttribute(var, PageContext.PAGE_SCOPE);
+        }
     }
 
 

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.tag.common.core;
 
@@ -24,7 +24,7 @@ import org.apache.taglibs.standard.resou
 
 /**
  * <p>Tag handler for &lt;choose&gt; in JSTL.</p>
- * 
+ * <p/>
  * <p>&lt;choose&gt; is a very simple tag that acts primarily as a container;
  * it always includes its body and allows exactly one of its child
  * &lt;when&gt; tags to run.  Since this tag handler doesn't have any
@@ -40,12 +40,14 @@ public class ChooseTag extends TagSuppor
     // Constructor and lifecycle management
 
     // initialize inherited and local state
+
     public ChooseTag() {
         super();
         init();
     }
 
     // Releases any resources we may have (or inherit)
+
     @Override
     public void release() {
         super.release();
@@ -77,9 +79,10 @@ public class ChooseTag extends TagSuppor
      * body.
      */
     public synchronized void subtagSucceeded() {
-        if (subtagGateClosed)
+        if (subtagGateClosed) {
             throw new IllegalStateException(
-		Resources.getMessage("CHOOSE_EXCLUSIVITY"));
+                    Resources.getMessage("CHOOSE_EXCLUSIVITY"));
+        }
         subtagGateClosed = true;
     }
 
@@ -88,9 +91,10 @@ public class ChooseTag extends TagSuppor
     // Tag logic
 
     // always include body
+
     @Override
     public int doStartTag() throws JspException {
-        subtagGateClosed = false;	// when we start, no children have run
+        subtagGateClosed = false;    // when we start, no children have run
         return EVAL_BODY_INCLUDE;
     }
 

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.tag.common.core;
 
@@ -24,7 +24,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * essentially a runtime no-op as far as tag logic is concerned; the
  * only important functionality of the tag is to expose a scripting
  * variable for an existing scoped attribute.</p>
- * 
+ *
  * @author Shawn Bayern
  */
 
@@ -34,5 +34,7 @@ public class DeclareTag extends TagSuppo
      * We're not identical to TagSupport only because we need to
      * accept an additional "type" attribute.
      */
-    public void setType(String x) { }
+
+    public void setType(String x) {
+    }
 }

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.tag.common.core;
 
@@ -40,15 +40,15 @@ import org.apache.taglibs.standard.resou
  * ForEach-specific functionality.  The rtexprvalue library and the
  * expression-evaluating library each have handlers that extend this
  * class.</p>
- *
+ * <p/>
  * <p>Localized here is the logic for handling the veritable smorgasbord
  * of types supported by &lt;forEach&gt;, including arrays,
  * Collections, and others.  To see how the actual iteration is controlled,
  * review the javax.servlet.jsp.jstl.core.LoopTagSupport class instead.
  * </p>
  *
- * @see javax.servlet.jsp.jstl.core.LoopTagSupport
  * @author Shawn Bayern
+ * @see javax.servlet.jsp.jstl.core.LoopTagSupport
  */
 
 public abstract class ForEachSupport extends LoopTagSupport {
@@ -92,8 +92,10 @@ public abstract class ForEachSupport ext
      * instead of in advance, would involve changing only those methods that
      * handle primitive arrays.
      */
+
     protected static interface ForEachIterator {
         public boolean hasNext() throws JspTagException;
+
         public Object next() throws JspTagException;
     }
 
@@ -102,19 +104,23 @@ public abstract class ForEachSupport ext
      * an Iterator.  This is appropriate for cases where hasNext() and
      * next() don't need to throw JspTagException.  Such cases are common.core.
      */
+
     protected class SimpleForEachIterator implements ForEachIterator {
         private Iterator i;
+
         public SimpleForEachIterator(Iterator i) {
             this.i = i;
         }
+
         public boolean hasNext() {
             return i.hasNext();
         }
+
         public Object next() {
             return i.next();
         }
     }
-    
+
     protected class DeferredForEachIterator implements ForEachIterator {
 
         private ValueExpression itemsValueExpression;
@@ -126,21 +132,23 @@ public abstract class ForEachSupport ext
         private Iterator myIterator;
         private boolean anEnumeration = false;
         private Enumeration myEnumeration;
+
         public DeferredForEachIterator(ValueExpression o) throws JspTagException {
             itemsValueExpression = o;
             determineLengthAndType();
         }
+
         public boolean hasNext() throws JspTagException {
             if (isIndexedValueExpression) {
-                if (currentIndex<length) {
+                if (currentIndex < length) {
                     return true;
                 } else {
                     return false;
-                }                
+                }
             } else {
-                if (length!=-1) {
+                if (length != -1) {
                     //a Collection, Map, or StringTokenizer 
-                    if (currentIndex<length) {
+                    if (currentIndex < length) {
                         return true;
                     } else {
                         return false;
@@ -157,18 +165,19 @@ public abstract class ForEachSupport ext
                 }
             }
         }
+
         public Object next() throws JspTagException {
             ValueExpression nextValue = null;
             if (isIndexedValueExpression) {
                 nextValue = new IndexedValueExpression(itemsValueExpression, currentIndex);
                 currentIndex++;
             } else {
-                if (itemsValueIteratedExpression==null) {
+                if (itemsValueIteratedExpression == null) {
                     itemsValueIteratedExpression = new IteratedExpression(itemsValueExpression, getDelims());
                 }
                 nextValue = new IteratedValueExpression(itemsValueIteratedExpression, currentIndex);
                 currentIndex++;
-                if (length!=-1) {
+                if (length != -1) {
                     //a Collection, Map, or StringTokenizer
                     //nothing else needed
                 } else {
@@ -182,57 +191,58 @@ public abstract class ForEachSupport ext
             }
             return nextValue;
         }
+
         private void determineLengthAndType() throws JspTagException {
             ELContext myELContext = pageContext.getELContext();
             Object o = itemsValueExpression.getValue(myELContext);
             if (o instanceof Object[]) {
-                length = ((Object[])o).length;
+                length = ((Object[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof boolean[]) {
-                length = ((boolean[])o).length;
+                length = ((boolean[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof byte[]) {
-                length = ((byte[])o).length;
+                length = ((byte[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof char[]) {
-                length = ((char[])o).length;
+                length = ((char[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof short[]) {
-                length = ((short[])o).length;
+                length = ((short[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof int[]) {
-                length = ((int[])o).length;
+                length = ((int[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof long[]) {
-                length = ((long[])o).length;
+                length = ((long[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof float[]) {
-                length = ((float[])o).length;
+                length = ((float[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof double[]) {
-                length = ((double[])o).length;
+                length = ((double[]) o).length;
                 isIndexedValueExpression = true;
             } else if (o instanceof Collection) {
-                length = ((Collection)o).size();
+                length = ((Collection) o).size();
                 isIndexedValueExpression = false;
             } else if (o instanceof Iterator) {
                 //have to reproduce iterator here so we can determine the size
                 isIndexedValueExpression = false;
                 anIterator = true;
-                myIterator = (Iterator)o;
+                myIterator = (Iterator) o;
             } else if (o instanceof Enumeration) {
                 isIndexedValueExpression = false;
-                anEnumeration=true;
-                myEnumeration = (Enumeration)o;
+                anEnumeration = true;
+                myEnumeration = (Enumeration) o;
             } else if (o instanceof Map) {
-                length = ((Map)o).size();
+                length = ((Map) o).size();
                 isIndexedValueExpression = false;
-            //
-            //else if (o instanceof ResultSet)
-            //    items = toForEachIterator((ResultSet) o);
-            //
+                //
+                //else if (o instanceof ResultSet)
+                //    items = toForEachIterator((ResultSet) o);
+                //
             } else if (o instanceof String) {
-                StringTokenizer st = new StringTokenizer((String)o, ",");
+                StringTokenizer st = new StringTokenizer((String) o, ",");
                 length = st.countTokens();
                 isIndexedValueExpression = false;
             } else {
@@ -269,7 +279,7 @@ public abstract class ForEachSupport ext
         // produce the right sort of ForEachIterator
         if (rawItems != null) {
             if (rawItems instanceof ValueExpression) {
-                deferredExpression = (ValueExpression)rawItems;
+                deferredExpression = (ValueExpression) rawItems;
                 items = toDeferredForEachIterator(deferredExpression);
             } else {
                 // extract an iterator over the 'items' we've got
@@ -283,8 +293,7 @@ public abstract class ForEachSupport ext
         /* ResultSet no more supported in <c:forEach>
         // step must be 1 when ResultSet is passed in
         if (rawItems instanceof ResultSet && step != 1)
-            throw new JspTagException(
-		Resources.getMessage("FOREACH_STEP_NO_RESULTSET"));
+            throw new JspTagException(Resources.getMessage("FOREACH_STEP_NO_RESULTSET"));
         */
     }
 
@@ -293,6 +302,7 @@ public abstract class ForEachSupport ext
     // Tag logic and lifecycle management
 
     // Releases any resources we may have (or inherit)
+
     @Override
     public void release() {
         super.release();
@@ -306,6 +316,7 @@ public abstract class ForEachSupport ext
 
     /* Extracts a ForEachIterator given an object of a supported type. */
     //This should not be called for a deferred ValueExpression
+
     protected ForEachIterator supportedTypeForEachIterator(Object o)
             throws JspTagException {
 
@@ -325,40 +336,42 @@ public abstract class ForEachSupport ext
 
         ForEachIterator items;
 
-        if (o instanceof Object[])
+        if (o instanceof Object[]) {
             items = toForEachIterator((Object[]) o);
-        else if (o instanceof boolean[])
+        } else if (o instanceof boolean[]) {
             items = toForEachIterator((boolean[]) o);
-        else if (o instanceof byte[])
+        } else if (o instanceof byte[]) {
             items = toForEachIterator((byte[]) o);
-        else if (o instanceof char[])
+        } else if (o instanceof char[]) {
             items = toForEachIterator((char[]) o);
-        else if (o instanceof short[])
+        } else if (o instanceof short[]) {
             items = toForEachIterator((short[]) o);
-        else if (o instanceof int[])
+        } else if (o instanceof int[]) {
             items = toForEachIterator((int[]) o);
-        else if (o instanceof long[])
+        } else if (o instanceof long[]) {
             items = toForEachIterator((long[]) o);
-        else if (o instanceof float[])
+        } else if (o instanceof float[]) {
             items = toForEachIterator((float[]) o);
-        else if (o instanceof double[])
+        } else if (o instanceof double[]) {
             items = toForEachIterator((double[]) o);
-        else if (o instanceof Collection)
+        } else if (o instanceof Collection) {
             items = toForEachIterator((Collection) o);
-        else if (o instanceof Iterator)
+        } else if (o instanceof Iterator) {
             items = toForEachIterator((Iterator) o);
-        else if (o instanceof Enumeration)
+        } else if (o instanceof Enumeration) {
             items = toForEachIterator((Enumeration) o);
-        else if (o instanceof Map)
+        } else if (o instanceof Map) {
             items = toForEachIterator((Map) o);
+        }
         /*
         else if (o instanceof ResultSet)
             items = toForEachIterator((ResultSet) o);
         */
-        else if (o instanceof String)
+        else if (o instanceof String) {
             items = toForEachIterator((String) o);
-        else
+        } else {
             items = toForEachIterator(o);
+        }
 
         return (items);
     }
@@ -368,6 +381,7 @@ public abstract class ForEachSupport ext
      * in support of cases where our tag handler isn't passed an
      * explicit collection over which to iterate.
      */
+
     private ForEachIterator beginEndForEachIterator() {
         /*
          * To plug into existing support, we need to keep 'begin', 'end',
@@ -382,8 +396,9 @@ public abstract class ForEachSupport ext
          * wouldn't provide much benefit.)
          */
         Integer[] ia = new Integer[end + 1];
-        for (int i = 0; i <= end; i++)
+        for (int i = 0; i <= end; i++) {
             ia[i] = new Integer(i);
+        }
         return new SimpleForEachIterator(Arrays.asList(ia).iterator());
     }
 
@@ -394,19 +409,22 @@ public abstract class ForEachSupport ext
     protected ForEachIterator toDeferredForEachIterator(ValueExpression o) throws JspTagException {
         return new DeferredForEachIterator(o);
     }
-    
+
     // catch-all method whose invocation currently signals a 'matching error'
+
     protected ForEachIterator toForEachIterator(Object o)
             throws JspTagException {
         throw new JspTagException(Resources.getMessage("FOREACH_BAD_ITEMS"));
     }
 
     // returns an iterator over an Object array (via List)
+
     protected ForEachIterator toForEachIterator(Object[] a) {
         return new SimpleForEachIterator(Arrays.asList(a).iterator());
     }
 
     // returns an iterator over a boolean[] array, wrapping items in Boolean
+
     protected ForEachIterator toForEachIterator(boolean[] a) {
         Boolean[] wrapped = new Boolean[a.length];
         for (int i = 0; i < a.length; i++) {
@@ -416,83 +434,103 @@ public abstract class ForEachSupport ext
     }
 
     // returns an iterator over a byte[] array, wrapping items in Byte
+
     protected ForEachIterator toForEachIterator(byte[] a) {
         Byte[] wrapped = new Byte[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Byte(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over a char[] array, wrapping items in Character
+
     protected ForEachIterator toForEachIterator(char[] a) {
         Character[] wrapped = new Character[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Character(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over a short[] array, wrapping items in Short
+
     protected ForEachIterator toForEachIterator(short[] a) {
         Short[] wrapped = new Short[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Short(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over an int[] array, wrapping items in Integer
+
     protected ForEachIterator toForEachIterator(int[] a) {
         Integer[] wrapped = new Integer[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Integer(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over a long[] array, wrapping items in Long
+
     protected ForEachIterator toForEachIterator(long[] a) {
         Long[] wrapped = new Long[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Long(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over a float[] array, wrapping items in Float
+
     protected ForEachIterator toForEachIterator(float[] a) {
         Float[] wrapped = new Float[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Float(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // returns an iterator over a double[] array, wrapping items in Double
+
     protected ForEachIterator toForEachIterator(double[] a) {
         Double[] wrapped = new Double[a.length];
-        for (int i = 0; i < a.length; i++)
+        for (int i = 0; i < a.length; i++) {
             wrapped[i] = new Double(a[i]);
+        }
         return new SimpleForEachIterator(Arrays.asList(wrapped).iterator());
     }
 
     // retrieves an iterator from a Collection
+
     protected ForEachIterator toForEachIterator(Collection c) {
         return new SimpleForEachIterator(c.iterator());
     }
 
     // simply passes an Iterator through...
+
     protected ForEachIterator toForEachIterator(Iterator i) {
         return new SimpleForEachIterator(i);
     }
 
     // converts an Enumeration to an Iterator via a local adapter
+
     protected ForEachIterator toForEachIterator(Enumeration e) {
 
         // local adapter
         class EnumerationAdapter implements ForEachIterator {
             private Enumeration e;
+
             public EnumerationAdapter(Enumeration e) {
                 this.e = e;
             }
+
             public boolean hasNext() {
                 return e.hasMoreElements();
             }
+
             public Object next() {
                 return e.nextElement();
             }
@@ -502,6 +540,7 @@ public abstract class ForEachSupport ext
     }
 
     // retrieves an iterator over the Map.Entry items in a Map
+
     protected ForEachIterator toForEachIterator(Map m) {
         return new SimpleForEachIterator(m.entrySet().iterator());
     }
@@ -539,6 +578,7 @@ public abstract class ForEachSupport ext
     */
 
     // tokenizes a String as a CSV and returns an iterator over it
+
     protected ForEachIterator toForEachIterator(String s) {
         StringTokenizer st = new StringTokenizer(s, ",");
         return toForEachIterator(st);           // convert from Enumeration

Modified: tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java?rev=1037279&r1=1037278&r2=1037279&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java (original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java Sat Nov 20 17:57:45 2010
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 
 package org.apache.taglibs.standard.tag.common.core;
 
@@ -33,8 +33,8 @@ import javax.servlet.jsp.jstl.core.LoopT
  * expression-evaluating libraries each have handlers that extend this
  * class.</p>
  *
- * @see javax.servlet.jsp.jstl.core.LoopTagSupport
  * @author Shawn Bayern
+ * @see javax.servlet.jsp.jstl.core.LoopTagSupport
  */
 
 public abstract class ForTokensSupport extends LoopTagSupport {
@@ -76,12 +76,12 @@ public abstract class ForTokensSupport e
             ELContext myELContext = pageContext.getELContext();
             Object originalValue = deferredExpression.getValue(myELContext);
             if (originalValue instanceof String) {
-                st = new StringTokenizer((String)originalValue, delims);
+                st = new StringTokenizer((String) originalValue, delims);
             } else {
                 throw new JspTagException();
             }
         } else {
-            st = new StringTokenizer((String)items, delims);
+            st = new StringTokenizer((String) items, delims);
         }
     }
 
@@ -92,9 +92,9 @@ public abstract class ForTokensSupport e
 
     @Override
     protected Object next() throws JspTagException {
-        if (deferredExpression!=null) {
+        if (deferredExpression != null) {
             st.nextElement();
-            if (itemsValueIteratedExpression==null) {
+            if (itemsValueIteratedExpression == null) {
                 itemsValueIteratedExpression = new IteratedExpression(deferredExpression, getDelims());
             }
             ValueExpression nextValue = new IteratedValueExpression(itemsValueIteratedExpression, currentIndex);
@@ -111,6 +111,7 @@ public abstract class ForTokensSupport e
 
 
     // Releases any resources we may have (or inherit)
+
     @Override
     public void release() {
         super.release();



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


Mime
View raw message