You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ni...@apache.org on 2006/03/13 02:39:16 UTC

svn commit: r385402 - in /struts/build/trunk: README maven.xml project.xml struts_checks.xml

Author: niallp
Date: Sun Mar 12 17:39:13 2006
New Revision: 385402

URL: http://svn.apache.org/viewcvs?rev=385402&view=rev
Log:
Set mising svn:eol-style properties to native

Modified:
    struts/build/trunk/README   (contents, props changed)
    struts/build/trunk/maven.xml   (contents, props changed)
    struts/build/trunk/project.xml   (contents, props changed)
    struts/build/trunk/struts_checks.xml   (contents, props changed)

Modified: struts/build/trunk/README
URL: http://svn.apache.org/viewcvs/struts/build/trunk/README?rev=385402&r1=385401&r2=385402&view=diff
==============================================================================
--- struts/build/trunk/README (original)
+++ struts/build/trunk/README Sun Mar 12 17:39:13 2006
@@ -1,36 +1,36 @@
-$Id$
-
-Struts Build
-============
-
-This subproject provides common build components for use across multiple Struts
-subprojects. While it is a subproject in and of itself, it is better thought of
-as a shared directory linked into each individual subproject.
-
-IMPORTANT:
-If you are reading this in the 'build' directory of another subproject, what
-you are seeing is a "window" into the build subproject. All of the files in
-this directory are actually maintained in the common build subproject, and so
-any changes made here will be made for *all* subprojects.
-
-
-
-STRUTS
-======
-
-Introduction
-------------
-
-This subproject contains the source code for the "Struts" application support
-package, consisting of the following major components:
-
-- Controller servlet with action mapping technology, implementing the Model-
-  View-Controller (MVC) design pattern for web applications commonly called
-  "Model 2", with a servlet as the "front component".
-
-- Comprehensive custom tag library for building internationalized JSP pages
-  that have HTML forms which interact with JavaBeans that are managed
-  automatically by the controller servlet.
-
-For help with installing and using Struts, see the Struts User Guide.
-
+$Id$
+
+Struts Build
+============
+
+This subproject provides common build components for use across multiple Struts
+subprojects. While it is a subproject in and of itself, it is better thought of
+as a shared directory linked into each individual subproject.
+
+IMPORTANT:
+If you are reading this in the 'build' directory of another subproject, what
+you are seeing is a "window" into the build subproject. All of the files in
+this directory are actually maintained in the common build subproject, and so
+any changes made here will be made for *all* subprojects.
+
+
+
+STRUTS
+======
+
+Introduction
+------------
+
+This subproject contains the source code for the "Struts" application support
+package, consisting of the following major components:
+
+- Controller servlet with action mapping technology, implementing the Model-
+  View-Controller (MVC) design pattern for web applications commonly called
+  "Model 2", with a servlet as the "front component".
+
+- Comprehensive custom tag library for building internationalized JSP pages
+  that have HTML forms which interact with JavaBeans that are managed
+  automatically by the controller servlet.
+
+For help with installing and using Struts, see the Struts User Guide.
+

Propchange: struts/build/trunk/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/build/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/maven.xml?rev=385402&r1=385401&r2=385402&view=diff
==============================================================================
--- struts/build/trunk/maven.xml (original)
+++ struts/build/trunk/maven.xml Sun Mar 12 17:39:13 2006
@@ -1,204 +1,204 @@
-<?xml version="1.0"?>
-
-<project default="build-all"
-         xmlns:j="jelly:core"
-         xmlns:ant="jelly:ant"
-         xmlns:maven="jelly:maven">
-
-    <tstamp>
-        <format property="today" pattern="yyyyMMdd"/>
-    </tstamp>
-
-    <preGoal name="xdoc:jelly-transform">
-      <attainGoal name="faq"/>
-    </preGoal>
-
-    <goal name="nightly">
-        <ant:delete dir="nightly"/>
-        <ant:mkdir dir="nightly/"/>
-        <ant:mkdir dir="nightly/logs/"/>
-        <ant:mkdir dir="nightly/struts-apps/"/>
-        <ant:mkdir dir="nightly/struts-action/"/>
-        <ant:mkdir dir="nightly/struts-el/"/>
-        <ant:mkdir dir="nightly/struts-extras/"/>
-        <ant:mkdir dir="nightly/struts-faces/"/>
-        <ant:mkdir dir="nightly/struts-flow/"/>
-        <ant:mkdir dir="nightly/struts-sandbox/"/>
-        <ant:mkdir dir="nightly/struts-scripting/"/>
-        <ant:mkdir dir="nightly/struts-site/"/>
-        <ant:mkdir dir="nightly/struts-taglib/"/>
-        <ant:mkdir dir="nightly/struts-tiles/"/>
-
-        <attainGoal name="clean-all"/>
-        <attainGoal name="build-all"/>
-
-        <ant:mkdir dir="nightly/struts-apps/"/>
-
-        <ant:copy tofile="nightly/struts-apps/struts-blank-${today}.war">
-            <ant:fileset dir="../apps/blank/target/">
-                <ant:include name="struts-blank.war"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy tofile="nightly/struts-apps/struts-cookbook-${today}.war">
-            <ant:fileset dir="../apps/cookbook/target/">
-                <ant:include name="struts-cookbook.war"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy tofile="nightly/struts-apps/struts-mailreader-${today}.war">
-            <ant:fileset dir="../apps/mailreader/target/">
-                <ant:include name="struts-mailreader.war"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy tofile="nightly/struts-apps/struts-examples-${today}.war">
-            <ant:fileset dir="../apps/examples/target/">
-                <ant:include name="struts-examples.war"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy
-                tofile="nightly/struts-el/strutsel-exercise-taglib-${today}.war">
-            <ant:fileset dir="../el/target/">
-                <ant:include name="strutsel-exercise-taglib.war"/>
-            </ant:fileset>
-        </ant:copy>
-
-    </goal>
-
-
-    <goal name="build-all">
-
-        <maven:reactor
-                basedir="../"
-                includes="*/project.xml"
-                excludes="build/project.xml"
-                goals="dist"
-                banner="Building nightlies"
-                ignoreFailures="true"/>
-
-        <maven:reactor
-                basedir="../"
-                includes="*/project.xml"
-                excludes="build/project.xml"
-                goals="copy-distribution"
-                banner="Building nightlies"
-                ignoreFailures="true"/>
-
-    </goal>
-
-
-    <goal name="clean-all">
-        <maven:reactor
-                basedir="../"
-                includes="*/project.xml"
-                excludes="build/project.xml"
-                goals="clean"
-                banner="Building nightlies"
-                ignoreFailures="true"/>
-
-    </goal>
-
-    <postGoal name="dist">
-        <attainGoal name="jar:install"/>
-    </postGoal>
-
-    <postGoal name="dist:prepare-bin-filesystem">
-        <!-- Copy Instructions and Readmes -->
-        <ant:copy todir="${maven.dist.bin.assembly.dir}">
-            <ant:fileset dir="build/">
-                <ant:include name="README*"/>
-                <ant:include name="LICENSE.txt"/>
-                <ant:include name="STATUS*"/>
-                <ant:include name="INSTALL*"/>
-                <ant:include name="NOTICE*"/>
-            </ant:fileset>
-        </ant:copy>
-
-    </postGoal>
-
-    <postGoal name="dist:prepare-src-filesystem">
-
-        <!-- Copy Instructions and Readmes -->
-        <ant:copy todir="${maven.dist.src.assembly.dir}">
-            <ant:fileset dir="build">
-                <ant:include name="README*"/>
-                <ant:include name="LICENSE.txt"/>
-                <ant:include name="STATUS*"/>
-                <ant:include name="INSTALL*"/>
-                <ant:include name="NOTICE*"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <!-- Copy Maven Control files -->
-        <ant:copy todir="${maven.dist.src.assembly.dir}/build">
-            <ant:fileset dir="build">
-                <ant:include name="project.*"/>
-                <ant:include name="*.xml"/>
-                <ant:include name="*.jsl"/>
-                <ant:include name="LICENSE*"/>
-                <ant:include name="NOTICE*"/>
-            </ant:fileset>
-        </ant:copy>
-    </postGoal>
-
-    <goal name="copy-artifacts">
-
-        <maven:reactor
-                basedir="../"
-                includes="*/project.xml"
-                excludes="build/project.xml"
-                goals="copy-distribution"
-                banner="Copy nightly artifacts"
-                ignoreFailures="false"/>
-
-    </goal>
-
-    <goal name="copy-distribution">
-        <!--
-            <ant:copy todir="../build/${today}/${pom.artifactId}-${pom.currentVersion}">
-              <ant:fileset dir="${maven.build.dir}/distributions">
-                <ant:include name="*"/>
-              </ant:fileset>
-            </ant:copy>
-        -->
-
-        <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
-
-        <ant:copy
-                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
-            <ant:fileset dir="${maven.build.dir}/distributions">
-                <ant:include
-                        name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy
-                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
-            <ant:fileset dir="${maven.build.dir}/distributions">
-                <ant:include
-                        name="${pom.artifactId}-${pom.currentVersion}.zip"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy
-                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
-            <ant:fileset dir="${maven.build.dir}/distributions">
-                <ant:include
-                        name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <ant:copy
-                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
-            <ant:fileset dir="${maven.build.dir}/distributions">
-                <ant:include
-                        name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
-            </ant:fileset>
-        </ant:copy>
-
-    </goal>
-
-
-</project>
+<?xml version="1.0"?>
+
+<project default="build-all"
+         xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:maven="jelly:maven">
+
+    <tstamp>
+        <format property="today" pattern="yyyyMMdd"/>
+    </tstamp>
+
+    <preGoal name="xdoc:jelly-transform">
+      <attainGoal name="faq"/>
+    </preGoal>
+
+    <goal name="nightly">
+        <ant:delete dir="nightly"/>
+        <ant:mkdir dir="nightly/"/>
+        <ant:mkdir dir="nightly/logs/"/>
+        <ant:mkdir dir="nightly/struts-apps/"/>
+        <ant:mkdir dir="nightly/struts-action/"/>
+        <ant:mkdir dir="nightly/struts-el/"/>
+        <ant:mkdir dir="nightly/struts-extras/"/>
+        <ant:mkdir dir="nightly/struts-faces/"/>
+        <ant:mkdir dir="nightly/struts-flow/"/>
+        <ant:mkdir dir="nightly/struts-sandbox/"/>
+        <ant:mkdir dir="nightly/struts-scripting/"/>
+        <ant:mkdir dir="nightly/struts-site/"/>
+        <ant:mkdir dir="nightly/struts-taglib/"/>
+        <ant:mkdir dir="nightly/struts-tiles/"/>
+
+        <attainGoal name="clean-all"/>
+        <attainGoal name="build-all"/>
+
+        <ant:mkdir dir="nightly/struts-apps/"/>
+
+        <ant:copy tofile="nightly/struts-apps/struts-blank-${today}.war">
+            <ant:fileset dir="../apps/blank/target/">
+                <ant:include name="struts-blank.war"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy tofile="nightly/struts-apps/struts-cookbook-${today}.war">
+            <ant:fileset dir="../apps/cookbook/target/">
+                <ant:include name="struts-cookbook.war"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy tofile="nightly/struts-apps/struts-mailreader-${today}.war">
+            <ant:fileset dir="../apps/mailreader/target/">
+                <ant:include name="struts-mailreader.war"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy tofile="nightly/struts-apps/struts-examples-${today}.war">
+            <ant:fileset dir="../apps/examples/target/">
+                <ant:include name="struts-examples.war"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy
+                tofile="nightly/struts-el/strutsel-exercise-taglib-${today}.war">
+            <ant:fileset dir="../el/target/">
+                <ant:include name="strutsel-exercise-taglib.war"/>
+            </ant:fileset>
+        </ant:copy>
+
+    </goal>
+
+
+    <goal name="build-all">
+
+        <maven:reactor
+                basedir="../"
+                includes="*/project.xml"
+                excludes="build/project.xml"
+                goals="dist"
+                banner="Building nightlies"
+                ignoreFailures="true"/>
+
+        <maven:reactor
+                basedir="../"
+                includes="*/project.xml"
+                excludes="build/project.xml"
+                goals="copy-distribution"
+                banner="Building nightlies"
+                ignoreFailures="true"/>
+
+    </goal>
+
+
+    <goal name="clean-all">
+        <maven:reactor
+                basedir="../"
+                includes="*/project.xml"
+                excludes="build/project.xml"
+                goals="clean"
+                banner="Building nightlies"
+                ignoreFailures="true"/>
+
+    </goal>
+
+    <postGoal name="dist">
+        <attainGoal name="jar:install"/>
+    </postGoal>
+
+    <postGoal name="dist:prepare-bin-filesystem">
+        <!-- Copy Instructions and Readmes -->
+        <ant:copy todir="${maven.dist.bin.assembly.dir}">
+            <ant:fileset dir="build/">
+                <ant:include name="README*"/>
+                <ant:include name="LICENSE.txt"/>
+                <ant:include name="STATUS*"/>
+                <ant:include name="INSTALL*"/>
+                <ant:include name="NOTICE*"/>
+            </ant:fileset>
+        </ant:copy>
+
+    </postGoal>
+
+    <postGoal name="dist:prepare-src-filesystem">
+
+        <!-- Copy Instructions and Readmes -->
+        <ant:copy todir="${maven.dist.src.assembly.dir}">
+            <ant:fileset dir="build">
+                <ant:include name="README*"/>
+                <ant:include name="LICENSE.txt"/>
+                <ant:include name="STATUS*"/>
+                <ant:include name="INSTALL*"/>
+                <ant:include name="NOTICE*"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <!-- Copy Maven Control files -->
+        <ant:copy todir="${maven.dist.src.assembly.dir}/build">
+            <ant:fileset dir="build">
+                <ant:include name="project.*"/>
+                <ant:include name="*.xml"/>
+                <ant:include name="*.jsl"/>
+                <ant:include name="LICENSE*"/>
+                <ant:include name="NOTICE*"/>
+            </ant:fileset>
+        </ant:copy>
+    </postGoal>
+
+    <goal name="copy-artifacts">
+
+        <maven:reactor
+                basedir="../"
+                includes="*/project.xml"
+                excludes="build/project.xml"
+                goals="copy-distribution"
+                banner="Copy nightly artifacts"
+                ignoreFailures="false"/>
+
+    </goal>
+
+    <goal name="copy-distribution">
+        <!--
+            <ant:copy todir="../build/${today}/${pom.artifactId}-${pom.currentVersion}">
+              <ant:fileset dir="${maven.build.dir}/distributions">
+                <ant:include name="*"/>
+              </ant:fileset>
+            </ant:copy>
+        -->
+
+        <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
+
+        <ant:copy
+                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
+            <ant:fileset dir="${maven.build.dir}/distributions">
+                <ant:include
+                        name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy
+                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
+            <ant:fileset dir="${maven.build.dir}/distributions">
+                <ant:include
+                        name="${pom.artifactId}-${pom.currentVersion}.zip"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy
+                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
+            <ant:fileset dir="${maven.build.dir}/distributions">
+                <ant:include
+                        name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <ant:copy
+                tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
+            <ant:fileset dir="${maven.build.dir}/distributions">
+                <ant:include
+                        name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
+            </ant:fileset>
+        </ant:copy>
+
+    </goal>
+
+
+</project>

Propchange: struts/build/trunk/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/build/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.xml?rev=385402&r1=385401&r2=385402&view=diff
==============================================================================
--- struts/build/trunk/project.xml (original)
+++ struts/build/trunk/project.xml Sun Mar 12 17:39:13 2006
@@ -1,515 +1,515 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      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.
- */
- -->
-
-
-<!--
-   This file represents the top level (or root) descriptor file
-   for the entire Apache Struts project.
-   
-   This file lays out a "lowest common denominator" scheme for 
-   building all or any portion of this project and it's subprojects.
-   
-     (this example assumes you already have the source locally
-      either by downloading a source distribution or have checked
-      out the source via svn client)
-   
-   To build the entire Struts distribution with Maven, go to the 
-   command line and execute:
-   
-    (this is just an example)
-    
-   Windows:
-     C:\path\to\svn\struts\current\build>maven dist
-
-    *nix/cygwin:
-    
-    $path/to/svn/struts/current/build/maven dist
-    
-
-    For complete details on how to read and use this document
-    and how it relates to the entire project.  See the Maven 
-    documentation here:
-    
-        http://maven.apache.org/reference/project-descriptor.html
-
-  -->
-
-
-<project>
-    <pomVersion>3</pomVersion>
-    <artifactId>struts-build</artifactId>
-    <name>Struts common build</name>
-    <groupId>struts</groupId>
-    <currentVersion>1.3.2-SNAPSHOT</currentVersion>
-
-
-    <!-- ################################################################ -->
-    <!--        Project management section                                -->
-    <!-- ################################################################ -->
-
-
-    <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-        <logo>http://www.apache.org/images/asf-logo.gif</logo>
-    </organization>
-    <logo>http://struts.apache.org/images/struts.gif</logo>
-    <inceptionYear>2000</inceptionYear>
-    <package>org.apache.struts</package>
-    <logo>http://struts.apache.org/images/struts.gif</logo>
-    <gumpRepositoryId>struts-svn</gumpRepositoryId>
-
-    <description>
-        The goal of the Apache Struts project is to encourage application
-        architectures based on the "Model 2" approach, a variation of the
-        classic Model-View-Controller (MVC) design paradigm.
-        Under Model 2,
-        a servlet (or equivalent) manages business logic execution,
-        and presentation logic resides mainly in server pages.
-
-        The Apache Struts project encourages Model 2 designs in two ways.
-        First, by providing open source frameworks and toolkits
-        that help developers build applications for the web.
-        Second, by providing friendly and honest mailing lists
-        where both newcomers and veterans discuss how to use Struts software
-        in their own Model 2 applications.
-    </description>
-
-    <shortDescription>MVC Web Application Framework</shortDescription>
-    <url>http://struts.apache.org/index.html</url>
-    <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
-    <siteAddress>struts.apache.org</siteAddress>
-    <siteDirectory>/www/struts.apache.org/</siteDirectory>
-    <distributionSite>struts.apache.org</distributionSite>
-    <distributionDirectory>/www/www.apache.org/builds/</distributionDirectory>
-    <!--  <distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>-->
-
-    <mailingLists>
-        <mailingList>
-            <name>Struts User List</name>
-            <subscribe>user-subscribe@struts.apache.org</subscribe>
-            <unsubscribe>user-unsubscribe@struts.apache.org</unsubscribe>
-            <archive>
-                http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=42</archive>
-        </mailingList>
-        <mailingList>
-            <name>Struts Developer List</name>
-            <subscribe>dev-subscribe@struts.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@struts.apache.org</unsubscribe>
-            <archive>
-                http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=41</archive>
-        </mailingList>
-    </mailingLists>
-
-    <repository>
-        <connection>
-            scm|svn|http://svn.apache.org/repos/asf/struts/current</connection>
-        <developerConnection>
-            scm|svn|https://svn.apache.org/repos/asf/struts/current</developerConnection>
-        <url>http://svn.apache.org/repos/asf/struts/site/trunk</url>
-    </repository>
-
-    <developers>
-        <developer>
-            <name>Craig R. McClanahan</name>
-            <id>craigmcc</id>
-            <email>craigmcc at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Ted Husted</name>
-            <id>husted</id>
-            <email>husted at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Rob Leland</name>
-            <id>rleland</id>
-            <email>rleland at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Cedric Dumoulin</name>
-            <id>cedric</id>
-            <email>cedric.dumoulin at lifl.fr</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Martin Cooper</name>
-            <id>martinc</id>
-            <email>martinc at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Arron Bates</name>
-            <id>arron</id>
-            <email>arron at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>James Holmes</name>
-            <id>jholmes</id>
-            <email>jholmes at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>David M. Karr</name>
-            <id>dmkarr</id>
-            <email>dmkarr at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Eddie Bush</name>
-            <id>ekbush</id>
-            <email>ekbush at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>David Graham</name>
-            <id>dgraham</id>
-            <email>dgraham at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>James Mitchell</name>
-            <id>jmitchell</id>
-            <email>jmitchell at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>James Turner</name>
-            <id>turner</id>
-            <email>turner at blackbear.com</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Steve Raeburn</name>
-            <id>sraeburn</id>
-            <email>sraeburn at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Don Brown</name>
-            <id>mrdon</id>
-            <email>mrdon at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Joe Germuska</name>
-            <id>germuska</id>
-            <email>germuska at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Niall Pemberton</name>
-            <id>niallp</id>
-            <email>niallp at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Hubert Rabago</name>
-            <id>hrabago</id>
-            <email>hrabago at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>David Geary</name>
-            <id>dgeary</id>
-            <email>dgeary at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Wendy Smoak</name>
-            <id>wsmoak</id>
-            <email>wsmoak at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Gary VanMatre</name>
-            <id>gvanmatre</id>
-            <email>gvanmatre at apache.org</email>
-        </developer>
-
-        <developer>
-            <name>Sean Schofield</name>
-            <id>schof</id>
-            <email>schof at apache.org</email>
-        </developer>
-
-        <developer>
-            <name>Greg Reddin</name>
-            <id>greddin</id>
-            <email>greddin at apache.org</email>
-        </developer>
-
-        <developer>
-            <name>Laurie Harper</name>
-            <id>laurieh</id>
-            <email>laurieh at apache.org</email>
-            <organization></organization>
-        </developer>
-
-        <developer>
-            <name>Richard Feit</name>
-            <id>rich</id>
-            <email>rich at apache.org</email>
-        </developer>
-
-        <developer>
-            <name>Jason Carreira</name>
-            <id>jcarreira</id>
-            <email>jcarreira at apache.org</email>
-        </developer>
-
-        <developer>
-            <name>Patrick Lightbody</name>
-            <id>plightbo</id>
-            <email>plightbo at apache.org</email>
-        </developer>
-        
-    </developers>
-
-    <contributors/>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <!-- ################################################################ -->
-    <!--        Project dependency section                                -->
-    <!-- ################################################################ -->
-
-    <dependencies>
-
-        <!-- Standard dependencies -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <url>http://java.sun.com/products/servlet/</url>
-            <properties>
-                <scope>provided</scope>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.7.0</version>
-            <url>http://jakarta.apache.org/commons/beanutils/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-chain</groupId>
-            <artifactId>commons-chain</artifactId>
-            <version>1.0</version>
-            <url>http://jakarta.apache.org/commons/chain/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.6</version>
-            <url>http://jakarta.apache.org/commons/digester/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.1</version>
-            <url>http://jakarta.apache.org/commons/fileupload/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.1</version>
-            <url>http://jakarta.apache.org/commons/io/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <url>http://jakarta.apache.org/commons/logging/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.2.0</version>
-            <url>http://jakarta.apache.org/commons/validator/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.8</version>
-            <url>http://jakarta.apache.org/oro/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>2.7.2</version>
-            <url>http://www.antlr.org/</url>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-
-
-        <!-- for unit tests -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <url>http://www.junit.org/</url>
-            <properties>
-                <scope>test</scope>
-            </properties>
-        </dependency>
-
-    </dependencies>
-
-
-    <!-- ################################################################ -->
-    <!--        Project build and reports section                         -->
-    <!-- ################################################################ -->
-
-    <build>
-        <nagEmailAddress>struts-dev@struts.apache.org</nagEmailAddress>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
-        <unitTest>
-            <includes>
-                <include>**/Test*.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/conf/share</directory>
-                    <targetPath>org/apache/struts/resources</targetPath>
-                    <includes>
-                        <include>**/*.xml</include>
-                        <include>**/*.dtd</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/test</directory>
-                    <includes>
-                        <include>**/*.xml</include>
-                        <include>**/*.properties</include>
-                    </includes>
-                </resource>
-            </resources>
-        </unitTest>
-
-        <!-- J A R  R E S O U R C E S -->
-        <!-- Resources that are packaged up inside the JAR file -->
-        <!--
-            <resources>
-              <resource>
-                <directory>${basedir}/src/share</directory>
-                <includes>
-                  <include>**/*.properties</include>
-                </includes>
-              </resource>
-            </resources>
-        -->
-
-    </build>
-
-    <reports>
-        <!--
-         |
-         | These should all be completely self contained. You should be able
-         | to generate each of them individually without needing the final
-         | xdoc transformation.
-         |
-         | Each report plugin with it's POM and plugin.jelly logic should
-         | contain everything needed to produced the report.
-         |
-        -->
-
-        <report>maven-checkstyle-plugin</report>
-        <report>maven-changelog-plugin</report>
-        <report>maven-changes-plugin</report>
-        <report>maven-developer-activity-plugin</report>
-        <report>maven-file-activity-plugin</report>
-        <report>maven-javadoc-plugin</report>
-        <report>maven-jdepend-plugin</report>
-        <report>maven-junit-report-plugin</report>
-        <report>maven-jxr-plugin</report>
-        <!--report>maven-linkcheck-plugin</report-->
-        <report>maven-pmd-plugin</report>
-        <report>maven-simian-plugin</report>
-        <report>maven-tasklist-plugin</report>
-        <report>maven-jcoverage-plugin</report>
-        <!--report>maven-findbugs-plugin</report-->
-
-    </reports>
-</project>
+<?xml version="1.0"?>
+<!-- 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      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.
+ */
+ -->
+
+
+<!--
+   This file represents the top level (or root) descriptor file
+   for the entire Apache Struts project.
+   
+   This file lays out a "lowest common denominator" scheme for 
+   building all or any portion of this project and it's subprojects.
+   
+     (this example assumes you already have the source locally
+      either by downloading a source distribution or have checked
+      out the source via svn client)
+   
+   To build the entire Struts distribution with Maven, go to the 
+   command line and execute:
+   
+    (this is just an example)
+    
+   Windows:
+     C:\path\to\svn\struts\current\build>maven dist
+
+    *nix/cygwin:
+    
+    $path/to/svn/struts/current/build/maven dist
+    
+
+    For complete details on how to read and use this document
+    and how it relates to the entire project.  See the Maven 
+    documentation here:
+    
+        http://maven.apache.org/reference/project-descriptor.html
+
+  -->
+
+
+<project>
+    <pomVersion>3</pomVersion>
+    <artifactId>struts-build</artifactId>
+    <name>Struts common build</name>
+    <groupId>struts</groupId>
+    <currentVersion>1.3.2-SNAPSHOT</currentVersion>
+
+
+    <!-- ################################################################ -->
+    <!--        Project management section                                -->
+    <!-- ################################################################ -->
+
+
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+        <logo>http://www.apache.org/images/asf-logo.gif</logo>
+    </organization>
+    <logo>http://struts.apache.org/images/struts.gif</logo>
+    <inceptionYear>2000</inceptionYear>
+    <package>org.apache.struts</package>
+    <logo>http://struts.apache.org/images/struts.gif</logo>
+    <gumpRepositoryId>struts-svn</gumpRepositoryId>
+
+    <description>
+        The goal of the Apache Struts project is to encourage application
+        architectures based on the "Model 2" approach, a variation of the
+        classic Model-View-Controller (MVC) design paradigm.
+        Under Model 2,
+        a servlet (or equivalent) manages business logic execution,
+        and presentation logic resides mainly in server pages.
+
+        The Apache Struts project encourages Model 2 designs in two ways.
+        First, by providing open source frameworks and toolkits
+        that help developers build applications for the web.
+        Second, by providing friendly and honest mailing lists
+        where both newcomers and veterans discuss how to use Struts software
+        in their own Model 2 applications.
+    </description>
+
+    <shortDescription>MVC Web Application Framework</shortDescription>
+    <url>http://struts.apache.org/index.html</url>
+    <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
+    <siteAddress>struts.apache.org</siteAddress>
+    <siteDirectory>/www/struts.apache.org/</siteDirectory>
+    <distributionSite>struts.apache.org</distributionSite>
+    <distributionDirectory>/www/www.apache.org/builds/</distributionDirectory>
+    <!--  <distributionDirectory>/www/www.apache.org/dist/java-repository/</distributionDirectory>-->
+
+    <mailingLists>
+        <mailingList>
+            <name>Struts User List</name>
+            <subscribe>user-subscribe@struts.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@struts.apache.org</unsubscribe>
+            <archive>
+                http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=42</archive>
+        </mailingList>
+        <mailingList>
+            <name>Struts Developer List</name>
+            <subscribe>dev-subscribe@struts.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@struts.apache.org</unsubscribe>
+            <archive>
+                http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=41</archive>
+        </mailingList>
+    </mailingLists>
+
+    <repository>
+        <connection>
+            scm|svn|http://svn.apache.org/repos/asf/struts/current</connection>
+        <developerConnection>
+            scm|svn|https://svn.apache.org/repos/asf/struts/current</developerConnection>
+        <url>http://svn.apache.org/repos/asf/struts/site/trunk</url>
+    </repository>
+
+    <developers>
+        <developer>
+            <name>Craig R. McClanahan</name>
+            <id>craigmcc</id>
+            <email>craigmcc at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Ted Husted</name>
+            <id>husted</id>
+            <email>husted at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Rob Leland</name>
+            <id>rleland</id>
+            <email>rleland at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Cedric Dumoulin</name>
+            <id>cedric</id>
+            <email>cedric.dumoulin at lifl.fr</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Martin Cooper</name>
+            <id>martinc</id>
+            <email>martinc at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Arron Bates</name>
+            <id>arron</id>
+            <email>arron at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>James Holmes</name>
+            <id>jholmes</id>
+            <email>jholmes at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>David M. Karr</name>
+            <id>dmkarr</id>
+            <email>dmkarr at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Eddie Bush</name>
+            <id>ekbush</id>
+            <email>ekbush at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>David Graham</name>
+            <id>dgraham</id>
+            <email>dgraham at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>James Mitchell</name>
+            <id>jmitchell</id>
+            <email>jmitchell at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>James Turner</name>
+            <id>turner</id>
+            <email>turner at blackbear.com</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Steve Raeburn</name>
+            <id>sraeburn</id>
+            <email>sraeburn at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Don Brown</name>
+            <id>mrdon</id>
+            <email>mrdon at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Joe Germuska</name>
+            <id>germuska</id>
+            <email>germuska at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Niall Pemberton</name>
+            <id>niallp</id>
+            <email>niallp at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Hubert Rabago</name>
+            <id>hrabago</id>
+            <email>hrabago at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>David Geary</name>
+            <id>dgeary</id>
+            <email>dgeary at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Wendy Smoak</name>
+            <id>wsmoak</id>
+            <email>wsmoak at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Gary VanMatre</name>
+            <id>gvanmatre</id>
+            <email>gvanmatre at apache.org</email>
+        </developer>
+
+        <developer>
+            <name>Sean Schofield</name>
+            <id>schof</id>
+            <email>schof at apache.org</email>
+        </developer>
+
+        <developer>
+            <name>Greg Reddin</name>
+            <id>greddin</id>
+            <email>greddin at apache.org</email>
+        </developer>
+
+        <developer>
+            <name>Laurie Harper</name>
+            <id>laurieh</id>
+            <email>laurieh at apache.org</email>
+            <organization></organization>
+        </developer>
+
+        <developer>
+            <name>Richard Feit</name>
+            <id>rich</id>
+            <email>rich at apache.org</email>
+        </developer>
+
+        <developer>
+            <name>Jason Carreira</name>
+            <id>jcarreira</id>
+            <email>jcarreira at apache.org</email>
+        </developer>
+
+        <developer>
+            <name>Patrick Lightbody</name>
+            <id>plightbo</id>
+            <email>plightbo at apache.org</email>
+        </developer>
+        
+    </developers>
+
+    <contributors/>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <!-- ################################################################ -->
+    <!--        Project dependency section                                -->
+    <!-- ################################################################ -->
+
+    <dependencies>
+
+        <!-- Standard dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <url>http://java.sun.com/products/servlet/</url>
+            <properties>
+                <scope>provided</scope>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.7.0</version>
+            <url>http://jakarta.apache.org/commons/beanutils/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+            <version>1.0</version>
+            <url>http://jakarta.apache.org/commons/chain/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.6</version>
+            <url>http://jakarta.apache.org/commons/digester/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/commons/fileupload/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.1</version>
+            <url>http://jakarta.apache.org/commons/io/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+            <url>http://jakarta.apache.org/commons/logging/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.2.0</version>
+            <url>http://jakarta.apache.org/commons/validator/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+            <url>http://jakarta.apache.org/oro/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.2</version>
+            <url>http://www.antlr.org/</url>
+            <properties>
+                <war.bundle>true</war.bundle>
+            </properties>
+        </dependency>
+
+
+        <!-- for unit tests -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <url>http://www.junit.org/</url>
+            <properties>
+                <scope>test</scope>
+            </properties>
+        </dependency>
+
+    </dependencies>
+
+
+    <!-- ################################################################ -->
+    <!--        Project build and reports section                         -->
+    <!-- ################################################################ -->
+
+    <build>
+        <nagEmailAddress>struts-dev@struts.apache.org</nagEmailAddress>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+        <unitTest>
+            <includes>
+                <include>**/Test*.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/conf/share</directory>
+                    <targetPath>org/apache/struts/resources</targetPath>
+                    <includes>
+                        <include>**/*.xml</include>
+                        <include>**/*.dtd</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/test</directory>
+                    <includes>
+                        <include>**/*.xml</include>
+                        <include>**/*.properties</include>
+                    </includes>
+                </resource>
+            </resources>
+        </unitTest>
+
+        <!-- J A R  R E S O U R C E S -->
+        <!-- Resources that are packaged up inside the JAR file -->
+        <!--
+            <resources>
+              <resource>
+                <directory>${basedir}/src/share</directory>
+                <includes>
+                  <include>**/*.properties</include>
+                </includes>
+              </resource>
+            </resources>
+        -->
+
+    </build>
+
+    <reports>
+        <!--
+         |
+         | These should all be completely self contained. You should be able
+         | to generate each of them individually without needing the final
+         | xdoc transformation.
+         |
+         | Each report plugin with it's POM and plugin.jelly logic should
+         | contain everything needed to produced the report.
+         |
+        -->
+
+        <report>maven-checkstyle-plugin</report>
+        <report>maven-changelog-plugin</report>
+        <report>maven-changes-plugin</report>
+        <report>maven-developer-activity-plugin</report>
+        <report>maven-file-activity-plugin</report>
+        <report>maven-javadoc-plugin</report>
+        <report>maven-jdepend-plugin</report>
+        <report>maven-junit-report-plugin</report>
+        <report>maven-jxr-plugin</report>
+        <!--report>maven-linkcheck-plugin</report-->
+        <report>maven-pmd-plugin</report>
+        <report>maven-simian-plugin</report>
+        <report>maven-tasklist-plugin</report>
+        <report>maven-jcoverage-plugin</report>
+        <!--report>maven-findbugs-plugin</report-->
+
+    </reports>
+</project>

Propchange: struts/build/trunk/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/build/trunk/struts_checks.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/struts_checks.xml?rev=385402&r1=385401&r2=385402&view=diff
==============================================================================
--- struts/build/trunk/struts_checks.xml (original)
+++ struts/build/trunk/struts_checks.xml Sun Mar 12 17:39:13 2006
@@ -1,232 +1,232 @@
-<?xml version="1.0"?>
-<!-- 
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      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.1//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
-<!--
-  Checkstyle configuration for Struts. Struts uses the Sun coding guidelines,
-  so this file is almost the same as Maven's sun_checks.xml file. The only
-  changes from that file are:
-
-    - Use a RegexpHeader check instead of a regular Header check, since we use
-      the Subversion 'Id' keyword in file headers, which needs to be ignored
-      in the header check.
-
-    - Disable the HiddenField module, since Struts has always used the
-      "this.foo = foo" pattern, which is not recognised by this module.
-
-    - Disable the DesignForExtension module, since fixing those complaints
-      would result in backwards incompatible API changes.
-
-    - Disable the FinalParameters module, since fixing those complaints
-      would result in backwards incompatible API changes.
-    
-    - Disable the InlineConditions modules, since Struts has always used 
-      this construct.
-    
-    - Increase LineLength max to 120 since Jalopy is set to format lines at 
-      column 80. Some lines are difficult to both indent and wrap at 80. 
-      
-    - Omit "ARRAY_INIT" from NoWhitespaceAfter to avoid conflict with Jalopy.
-        
--->
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-
-    <module name="TreeWalker">
-
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="JavadocStyle"/>
-
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <!-- <module name="Header">                            -->
-        <!-- The follow property value demonstrates the ability     -->
-        <!-- to have access to ANT properties. In this case it uses -->
-        <!-- the ${basedir} property to allow Checkstyle to be run  -->
-        <!-- from any directory within a project. See property      -->
-        <!-- expansion,                                             -->
-        <!-- http://checkstyle.sf.net/config.html#properties        -->
-        <!-- <property                                              -->
-        <!--     name="headerFile"                                  -->
-        <!--     value="${basedir}/java.header"/>                   -->
-        <!-- </module> -->
-
-        <!-- Following interprets the header file as regular expressions. -->
-        <!-- <module name="RegexpHeader"/>                                -->
-        <module name="RegexpHeader">
-            <property name="headerFile" value="${checkstyle.regexp.header}"/>
-        </module>
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
-        <!-- Begin Custom for Struts -->
-        <module name="LineLength">
-          <property name="max" value="120"/>
-          <property name="ignorePattern" value="^ \* @version .*$"/>
-        </module>
-        <!-- End Custom for Struts -->
-        <module name="MethodLength"/>
-        <module name="ParameterNumber"/>
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <!-- Struts Custom begins (omit ARRAY_INIT) -->
-        <module name="NoWhitespaceAfter">
-        	<property name="tokens" 
-        	value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
-        </module>
-        <!-- Struts Custom ends -->
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- Disabled for Struts: module name="AvoidInlineConditionals"/ -->
-        <module name="DoubleCheckedLocking"/>
-        <!-- MY FAVOURITE -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <!-- Disabled for Struts: module name="HiddenField"/ -->
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MagicNumber"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="RedundantThrows"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- Disabled for Struts: module name="DesignForExtension"/ -->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <!-- Disabled for Struts: module name="FinalParameters"/ -->
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-
-    </module>
-
-</module>
+<?xml version="1.0"?>
+<!-- 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      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.1//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!--
+  Checkstyle configuration for Struts. Struts uses the Sun coding guidelines,
+  so this file is almost the same as Maven's sun_checks.xml file. The only
+  changes from that file are:
+
+    - Use a RegexpHeader check instead of a regular Header check, since we use
+      the Subversion 'Id' keyword in file headers, which needs to be ignored
+      in the header check.
+
+    - Disable the HiddenField module, since Struts has always used the
+      "this.foo = foo" pattern, which is not recognised by this module.
+
+    - Disable the DesignForExtension module, since fixing those complaints
+      would result in backwards incompatible API changes.
+
+    - Disable the FinalParameters module, since fixing those complaints
+      would result in backwards incompatible API changes.
+    
+    - Disable the InlineConditions modules, since Struts has always used 
+      this construct.
+    
+    - Increase LineLength max to 120 since Jalopy is set to format lines at 
+      column 80. Some lines are difficult to both indent and wrap at 80. 
+      
+    - Omit "ARRAY_INIT" from NoWhitespaceAfter to avoid conflict with Jalopy.
+        
+-->
+<!--
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+
+    <module name="TreeWalker">
+
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+        <module name="JavadocStyle"/>
+
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+
+        <!-- Checks for Headers                              -->
+        <!-- See http://checkstyle.sf.net/config_header.html -->
+        <!-- <module name="Header">                            -->
+        <!-- The follow property value demonstrates the ability     -->
+        <!-- to have access to ANT properties. In this case it uses -->
+        <!-- the ${basedir} property to allow Checkstyle to be run  -->
+        <!-- from any directory within a project. See property      -->
+        <!-- expansion,                                             -->
+        <!-- http://checkstyle.sf.net/config.html#properties        -->
+        <!-- <property                                              -->
+        <!--     name="headerFile"                                  -->
+        <!--     value="${basedir}/java.header"/>                   -->
+        <!-- </module> -->
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
+        <module name="RegexpHeader">
+            <property name="headerFile" value="${checkstyle.regexp.header}"/>
+        </module>
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/>
+        <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="FileLength"/>
+        <!-- Begin Custom for Struts -->
+        <module name="LineLength">
+          <property name="max" value="120"/>
+          <property name="ignorePattern" value="^ \* @version .*$"/>
+        </module>
+        <!-- End Custom for Struts -->
+        <module name="MethodLength"/>
+        <module name="ParameterNumber"/>
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <!-- Struts Custom begins (omit ARRAY_INIT) -->
+        <module name="NoWhitespaceAfter">
+        	<property name="tokens" 
+        	value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+        </module>
+        <!-- Struts Custom ends -->
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces"/>
+        <module name="RightCurly"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!-- Disabled for Struts: module name="AvoidInlineConditionals"/ -->
+        <module name="DoubleCheckedLocking"/>
+        <!-- MY FAVOURITE -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <!-- Disabled for Struts: module name="HiddenField"/ -->
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <!-- Disabled for Struts: module name="DesignForExtension"/ -->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier"/>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <!-- Disabled for Struts: module name="FinalParameters"/ -->
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>

Propchange: struts/build/trunk/struts_checks.xml
------------------------------------------------------------------------------
    svn:eol-style = native



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