You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2010/11/20 19:16:25 UTC
svn commit: r1037286 - in /tomcat/taglibs/standard/trunk/compat: pom.xml
src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Author: jboynes
Date: Sat Nov 20 18:16:25 2010
New Revision: 1037286
URL: http://svn.apache.org/viewvc?rev=1037286&view=rev
Log:
reformat code to clean up tabs
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037286&r1=1037285&r2=1037286&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 18:16:25 2010
@@ -20,161 +20,190 @@
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-compat</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Standard Taglib - JSTL 1.0 Compatibility</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/compat</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat</developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat</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>
- </dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-impl</artifactId>
- <version>1.2-SNAPSHOT</version>
- </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>
+ 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-compat</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Standard Taglib - JSTL 1.0 Compatibility</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/compat</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
+ </developerConnection>
+ <url>http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat</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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </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>
+ <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>
+ <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>
</project>
Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java?rev=1037286&r1=1037285&r2=1037286&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java Sat Nov 20 18:16:25 2010
@@ -1,8 +1,10 @@
package org.apache.taglibs.standard.tag.compat.core;
import java.util.Collections;
+
import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
+
import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
Modified: tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java?rev=1037286&r1=1037285&r2=1037286&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java (original)
+++ tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java Sat Nov 20 18:16:25 2010
@@ -2,6 +2,7 @@ package org.apache.taglibs.standard.tag.
import javax.el.ValueExpression;
import javax.servlet.jsp.JspException;
+
import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org