tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [39/40] - in /tapestry/tapestry5/trunk: ./ tapestry-annotations/ tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/ tapestry-annotations/src/site/ tapestry-component-report/ tapestry-component-report/src/main/java/or...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java Mon Nov 12 14:22:31 2007
@@ -22,144 +22,144 @@
  */
 public class ErrorReportingCommandProcessor implements CommandProcessor
 {
-  private final CommandProcessor _delegate;
+    private final CommandProcessor _delegate;
 
-  public ErrorReportingCommandProcessor(final CommandProcessor delegate)
-  {
-    _delegate = delegate;
-  }
-
-  private static final String BORDER = "**********************************************************************";
-  
-  private void reportError(String command, String[] args, RuntimeException ex)
-  {
-    StringBuilder builder = new StringBuilder();
+    public ErrorReportingCommandProcessor(final CommandProcessor delegate)
+    {
+        _delegate = delegate;
+    }
 
-    builder.append(BORDER);
-    builder.append("\nSeleninum failure processing comamnd ");
-    builder.append(command);
-    builder.append("(");
+    private static final String BORDER = "**********************************************************************";
 
-    for (int i = 0; i < args.length; i++)
+    private void reportError(String command, String[] args, RuntimeException ex)
     {
-      if (i > 0) builder.append(", ");
-      builder.append('"');
-      builder.append(args[i]);
-      builder.append('"');
-    }
+        StringBuilder builder = new StringBuilder();
 
-    builder.append("): ");
-    builder.append(ex.toString());
+        builder.append(BORDER);
+        builder.append("\nSeleninum failure processing comamnd ");
+        builder.append(command);
+        builder.append("(");
 
-    builder.append("\n\nPage source:\n\n");
+        for (int i = 0; i < args.length; i++)
+        {
+            if (i > 0) builder.append(", ");
+            builder.append('"');
+            builder.append(args[i]);
+            builder.append('"');
+        }
 
-    builder.append(_delegate.getString("getHtmlSource", new String[] {}));
+        builder.append("): ");
+        builder.append(ex.toString());
 
-    builder.append("\n");
-    builder.append(BORDER);
-        
-    System.err.println(builder.toString());
-  }
+        builder.append("\n\nPage source:\n\n");
 
-  public String doCommand(String command, String[] args)
-  {
-    try
-    {
-      return _delegate.doCommand(command, args);
-    }
-    catch (RuntimeException ex)
-    {
-      reportError(command, args, ex);
-      throw ex;
-    }
-  }
+        builder.append(_delegate.getString("getHtmlSource", new String[]{}));
 
-  public boolean getBoolean(String string, String[] strings)
-  {
-    try
-    {
-      return _delegate.getBoolean(string, strings);
-    }
-    catch (RuntimeException ex)
-    {
-      reportError(string, strings, ex);
-      throw ex;
-    }
-  }
+        builder.append("\n");
+        builder.append(BORDER);
 
-  public boolean[] getBooleanArray(String string, String[] strings)
-  {
-    try
-    {
-      return _delegate.getBooleanArray(string, strings);
+        System.err.println(builder.toString());
     }
-    catch (RuntimeException ex)
+
+    public String doCommand(String command, String[] args)
     {
-      reportError(string, strings, ex);
-      throw ex;
+        try
+        {
+            return _delegate.doCommand(command, args);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(command, args, ex);
+            throw ex;
+        }
     }
-  }
 
-  public Number getNumber(String string, String[] strings)
-  {
-    try
+    public boolean getBoolean(String string, String[] strings)
     {
-      return _delegate.getNumber(string, strings);
+        try
+        {
+            return _delegate.getBoolean(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-    catch (RuntimeException ex)
+
+    public boolean[] getBooleanArray(String string, String[] strings)
     {
-      reportError(string, strings, ex);
-      throw ex;
+        try
+        {
+            return _delegate.getBooleanArray(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-  }
 
-  public Number[] getNumberArray(String string, String[] strings)
-  {
-    try
+    public Number getNumber(String string, String[] strings)
     {
-      return _delegate.getNumberArray(string, strings);
+        try
+        {
+            return _delegate.getNumber(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-    catch (RuntimeException ex)
+
+    public Number[] getNumberArray(String string, String[] strings)
     {
-      reportError(string, strings, ex);
-      throw ex;
+        try
+        {
+            return _delegate.getNumberArray(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-  }
 
-  public String getString(String string, String[] strings)
-  {
-    try
+    public String getString(String string, String[] strings)
     {
-      return _delegate.getString(string, strings);
+        try
+        {
+            return _delegate.getString(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-    catch (RuntimeException ex)
+
+    public String[] getStringArray(String string, String[] strings)
     {
-      reportError(string, strings, ex);
-      throw ex;
+        try
+        {
+            return _delegate.getStringArray(string, strings);
+        }
+        catch (RuntimeException ex)
+        {
+            reportError(string, strings, ex);
+            throw ex;
+        }
     }
-  }
 
-  public String[] getStringArray(String string, String[] strings)
-  {
-    try
+    public void start()
     {
-      return _delegate.getStringArray(string, strings);
+        _delegate.start();
     }
-    catch (RuntimeException ex)
+
+    public void stop()
     {
-      reportError(string, strings, ex);
-      throw ex;
+        _delegate.stop();
     }
-  }
-
-  public void start()
-  {
-    _delegate.start();
-  }
-
-  public void stop()
-  {
-    _delegate.stop();
-  }
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,17 @@
 
 package org.apache.tapestry.test;
 
-import static java.lang.String.format;
-
 import org.mortbay.http.NCSARequestLog;
 import org.mortbay.http.SocketListener;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.WebApplicationContext;
 
+import static java.lang.String.format;
+
 /**
  * Used to start up an instance of the Jetty servlet container in-process, as part of an integration
  * test suite. The started Jetty is reliant on the file <code>src/test/conf/webdefault.xml</code>.
- * 
+ *
  * @see AbstractIntegrationTestSuite
  */
 public class JettyRunner
@@ -41,7 +41,9 @@
 
     private final Server _jetty;
 
-    /** Defaults the context path to "/" and the port to 80. */
+    /**
+     * Defaults the context path to "/" and the port to 80.
+     */
     public JettyRunner(String warPath)
     {
         this(DEFAULT_CONTEXT_PATH, DEFAULT_PORT, warPath);
@@ -50,13 +52,10 @@
     /**
      * Creates and starts a new instance of Jetty. This should be done from a test case setup
      * method.
-     * 
-     * @param contextPath
-     *            the context path for the deployed application
-     * @param port
-     *            the port number used to access the application
-     * @param warPath
-     *            the path to the exploded web application (typically, "src/main/webapp")
+     *
+     * @param contextPath the context path for the deployed application
+     * @param port        the port number used to access the application
+     * @param warPath     the path to the exploded web application (typically, "src/main/webapp")
      */
     public JettyRunner(String contextPath, int port, String warPath)
     {
@@ -67,7 +66,9 @@
         _jetty = createAndStart();
     }
 
-    /** Stops the Jetty instance. This should be called from a test case tear down method. */
+    /**
+     * Stops the Jetty instance. This should be called from a test case tear down method.
+     */
     public void stop()
     {
         try

Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,8 @@
 
 package org.apache.tapestry.test;
 
+import java.io.*;
 import static java.lang.String.format;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -97,7 +92,9 @@
         return _random.nextInt(max - min + 1) + min;
     }
 
-    /** Returns a random word frm the dictionary. These words are usually all lowercase. */
+    /**
+     * Returns a random word frm the dictionary. These words are usually all lowercase.
+     */
     public String word()
     {
         int index = _random.nextInt(_words.size());
@@ -105,7 +102,9 @@
         return _words.get(index);
     }
 
-    /** Returns a random word, capitalized. Useful when create random names. */
+    /**
+     * Returns a random word, capitalized. Useful when create random names.
+     */
     public String capitalizedWord()
     {
         String word = word();
@@ -117,7 +116,9 @@
         return new String(chars);
     }
 
-    /** Returns a word that is "safe" for use in an email address. */
+    /**
+     * Returns a word that is "safe" for use in an email address.
+     */
     public String safeWord()
     {
         String word = word();
@@ -127,7 +128,9 @@
         return x < 0 ? word : word.substring(0, x);
     }
 
-    /** Returns a random value from the list of values supplied. */
+    /**
+     * Returns a random value from the list of values supplied.
+     */
     public <T> T oneOf(T... values)
     {
         assert values.length > 0;
@@ -137,7 +140,9 @@
         return values[index];
     }
 
-    /** Returns a random enum value, given the enum type. */
+    /**
+     * Returns a random enum value, given the enum type.
+     */
     public <T extends Enum> T oneOf(Class<T> enumClass)
     {
         return oneOf(enumClass.getEnumConstants());
@@ -146,13 +151,10 @@
     /**
      * Creates a space-separated list of random words. If in sentence form, then the first word is
      * capitalized, and a period is appended.
-     * 
-     * @param minWords
-     *            minimun number of words in the list
-     * @param maxWords
-     *            maximum number of words in the list
-     * @param asSentence
-     *            if true, the output is "dressed up" as a non-sensical sentence
+     *
+     * @param minWords   minimun number of words in the list
+     * @param maxWords   maximum number of words in the list
+     * @param asSentence if true, the output is "dressed up" as a non-sensical sentence
      * @return the word list / sentence
      */
     public String wordList(int minWords, int maxWords, boolean asSentence)
@@ -183,15 +185,11 @@
     /**
      * Strings together a random number of word lists (in sentence form) to create something that
      * looks like a paragraph.
-     * 
-     * @param minSentences
-     *            per paragraph
-     * @param maxSentences
-     *            per paragraph
-     * @param minWords
-     *            per sentence
-     * @param maxWords
-     *            per sentence
+     *
+     * @param minSentences per paragraph
+     * @param maxSentences per paragraph
+     * @param minWords     per sentence
+     * @param maxWords     per sentence
      * @return the random paragraph
      */
     public String paragraph(int minSentences, int maxSentences, int minWords, int maxWords)

Modified: tapestry/tapestry5/trunk/tapestry-test/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
-   Copyright 2006, 2007 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.
--->
-
+<!-- 
+   Copyright 2006, 2007 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.
+-->
+
 <project name="Tapestry Core">
     <bannerLeft>
         <name>Tapestry 5</name>
-        <href>http://tapestry.apache.org/tapestry5/</href>
+        <href>http://tapestry.apache.org/tapestry5/</href>
         <src>images/tapestry_banner.gif</src>
     </bannerLeft>
     <bannerRight>
         <name>Apache</name>
         <href>http://www.apache.org</href>
         <src>images/asf_logo_wide.gif</src>
-    </bannerRight>
-    <skin>
-        <groupId>org.apache.tapestry</groupId>
-        <artifactId>maven-skin</artifactId>
-        <version>1.1</version>
-    </skin>
-    
-    <publishDate format="dd MMM yyyy" />
-    
-    <body>
-
-                        
-        <menu ref="reports"/>
-        
-    </body>
+    </bannerRight>
+    <skin>
+        <groupId>org.apache.tapestry</groupId>
+        <artifactId>maven-skin</artifactId>
+        <version>1.1</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <body>
+
+
+        <menu ref="reports"/>
+
+    </body>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath Mon Nov 12 14:22:31 2007
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" output="bin"  path="src/main/java"/>
-  <classpathentry kind="src" output="bin-test"  path="src/test/java"/>
-  <classpathentry kind="lib" path="src/main/resources"/> 
-  <classpathentry kind="lib" path="src/test/resources"/> 
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
-  <classpathentry kind="output" path="bin"/>
+    <classpathentry kind="src" output="bin" path="src/main/java"/>
+    <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+    <classpathentry kind="lib" path="src/main/resources"/>
+    <classpathentry kind="lib" path="src/test/resources"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+    <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
 <projectDescription>
-  <name>tapestry-tutorial1</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.maven.ide.eclipse.maven2Builder</name>
-      <arguments>
-      </arguments>
-     </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.maven.ide.eclipse.maven2Nature</nature>
-  </natures>
+    <name>tapestry-tutorial1</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.maven.ide.eclipse.maven2Builder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.maven.ide.eclipse.maven2Nature</nature>
+    </natures>
 </projectDescription>

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,101 +1,102 @@
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tapestry</groupId>
-  <artifactId>tutorial1</artifactId>
-  <packaging>war</packaging>
-  <name>Tapestry 5 Tutorial</name>
-  <description>Introductory topics in Tapestry application development.</description>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <scm>
-    <connection> scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/tapestry-tutorial1/ </connection>
-    <url> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/ </url>
-  </scm>
-  
-  <parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tapestry</groupId>
-    <artifactId>tapestry-project</artifactId>
-    <version>5.0.7-SNAPSHOT</version>
-  </parent>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tapestry</groupId>
-      <artifactId>tapestry-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the tests)
-             will fail, preventing Maven from packaging the WAR. Tapestry includes a large number
-             of testing facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>5.1</version>
-      <classifier>jdk15</classifier>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <finalName>tapestry-tutorial1</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <optimize>true</optimize>
-        </configuration>
-      </plugin>
-
-      <!-- Run the application using "mvn jetty:run" -->
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <!-- Log to the console. -->
-          <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
-            <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug
-                             that prevents the requestLog from being set. -->
-            <append>true</append>
-          </requestLog>
-        </configuration>
-      </plugin>
-
-
-      <!-- This changes the WAR file packaging so that what would normally go into WEB-INF/classes
-             is instead packaged as WEB-INF/lib/tutorial1.jar.  This is necessary for Tapestry
-             to be able to search for page and component classes at startup. Only
-             certain application servers require this configuration, please see the documentation
-             at the Tapestry 5 project page (http://tapestry.apache.org/tapestry5/). -->
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <archiveClasses>true</archiveClasses>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-
-    <!-- Adds a report detailing the components, mixins and base classes defined by this module. -->
-    <plugins>
-      <plugin>
+    <artifactId>tutorial1</artifactId>
+    <packaging>war</packaging>
+    <name>Tapestry 5 Tutorial</name>
+    <description>Introductory topics in Tapestry application development.</description>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/tapestry-tutorial1/</connection>
+        <url>http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/</url>
+    </scm>
+
+    <parent>
         <groupId>org.apache.tapestry</groupId>
-        <artifactId>tapestry-component-report</artifactId>
-        <version>${project.version}</version>
-        <configuration>
-          <rootPackage>org.apache.tapestry.tutorial</rootPackage>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  
+        <artifactId>tapestry-project</artifactId>
+        <version>5.0.7-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tapestry</groupId>
+            <artifactId>tapestry-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- A dependency on either JUnit or TestNG is required, or the surefire plugin (which runs the tests)
+will fail, preventing Maven from packaging the WAR. Tapestry includes a large number
+of testing facilities designed for use with TestNG (http://testng.org/), so it's recommended. -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.1</version>
+            <classifier>jdk15</classifier>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <finalName>tapestry-tutorial1</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                    <optimize>true</optimize>
+                </configuration>
+            </plugin>
+
+            <!-- Run the application using "mvn jetty:run" -->
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <configuration>
+                    <!-- Log to the console. -->
+                    <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
+                        <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug
+                 that prevents the requestLog from being set. -->
+                        <append>true</append>
+                    </requestLog>
+                </configuration>
+            </plugin>
+
+
+            <!-- This changes the WAR file packaging so that what would normally go into WEB-INF/classes
+     is instead packaged as WEB-INF/lib/tutorial1.jar.  This is necessary for Tapestry
+     to be able to search for page and component classes at startup. Only
+     certain application servers require this configuration, please see the documentation
+     at the Tapestry 5 project page (http://tapestry.apache.org/tapestry5/). -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archiveClasses>true</archiveClasses>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+
+        <!-- Adds a report detailing the components, mixins and base classes defined by this module. -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tapestry</groupId>
+                <artifactId>tapestry-component-report</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <rootPackage>org.apache.tapestry.tutorial</rootPackage>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Address.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Address.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Address.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Address.java Mon Nov 12 14:22:31 2007
@@ -4,128 +4,128 @@
 
 public class Address
 {
-  private Honorific _honorific;
+    private Honorific _honorific;
 
-  private String _firstName;
+    private String _firstName;
 
-  private String _lastName;
+    private String _lastName;
 
-  private String _street1;
+    private String _street1;
 
-  private String _street2;
-
-  private String _city;
-
-  private String _state;
-
-  private String _zip;
-
-  private String _email;
-
-  private String _phone;
-
-  public Honorific getHonorific()
-  {
-    return _honorific;
-  }
-
-  @Validate("required")
-  public String getFirstName()
-  {
-    return _firstName;
-  }
-
-  public String getLastName()
-  {
-    return _lastName;
-  }
-
-  @Validate("required")
-  public String getStreet1()
-  {
-    return _street1;
-  }
-
-  public String getStreet2()
-  {
-    return _street2;
-  }
-
-  @Validate("required")
-  public String getCity()
-  {
-    return _city;
-  }
-
-  @Validate("required")
-  public String getState()
-  {
-    return _state;
-  }
-
-  @Validate("required,regexp")
-  public String getZip()
-  {
-    return _zip;
-  }
-
-  public String getEmail()
-  {
-    return _email;
-  }
-
-  public String getPhone()
-  {
-    return _phone;
-  }
-
-  public void setCity(String city)
-  {
-    _city = city;
-  }
-
-  public void setEmail(String email)
-  {
-    _email = email;
-  }
-
-  public void setFirstName(String firstName)
-  {
-    _firstName = firstName;
-  }
-
-  public void setHonorific(Honorific honorific)
-  {
-    _honorific = honorific;
-  }
-
-  public void setLastName(String lastName)
-  {
-    _lastName = lastName;
-  }
-
-  public void setPhone(String phone)
-  {
-    _phone = phone;
-  }
-
-  public void setState(String state)
-  {
-    _state = state;
-  }
-
-  public void setStreet1(String street1)
-  {
-    _street1 = street1;
-  }
-
-  public void setStreet2(String street2)
-  {
-    _street2 = street2;
-  }
-
-  public void setZip(String zip)
-  {
-    _zip = zip;
-  }
+    private String _street2;
+
+    private String _city;
+
+    private String _state;
+
+    private String _zip;
+
+    private String _email;
+
+    private String _phone;
+
+    public Honorific getHonorific()
+    {
+        return _honorific;
+    }
+
+    @Validate("required")
+    public String getFirstName()
+    {
+        return _firstName;
+    }
+
+    public String getLastName()
+    {
+        return _lastName;
+    }
+
+    @Validate("required")
+    public String getStreet1()
+    {
+        return _street1;
+    }
+
+    public String getStreet2()
+    {
+        return _street2;
+    }
+
+    @Validate("required")
+    public String getCity()
+    {
+        return _city;
+    }
+
+    @Validate("required")
+    public String getState()
+    {
+        return _state;
+    }
+
+    @Validate("required,regexp")
+    public String getZip()
+    {
+        return _zip;
+    }
+
+    public String getEmail()
+    {
+        return _email;
+    }
+
+    public String getPhone()
+    {
+        return _phone;
+    }
+
+    public void setCity(String city)
+    {
+        _city = city;
+    }
+
+    public void setEmail(String email)
+    {
+        _email = email;
+    }
+
+    public void setFirstName(String firstName)
+    {
+        _firstName = firstName;
+    }
+
+    public void setHonorific(Honorific honorific)
+    {
+        _honorific = honorific;
+    }
+
+    public void setLastName(String lastName)
+    {
+        _lastName = lastName;
+    }
+
+    public void setPhone(String phone)
+    {
+        _phone = phone;
+    }
+
+    public void setState(String state)
+    {
+        _state = state;
+    }
+
+    public void setStreet1(String street1)
+    {
+        _street1 = street1;
+    }
+
+    public void setStreet2(String street2)
+    {
+        _street2 = street2;
+    }
+
+    public void setZip(String zip)
+    {
+        _zip = zip;
+    }
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Honorific.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Honorific.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Honorific.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Honorific.java Mon Nov 12 14:22:31 2007
@@ -2,5 +2,5 @@
 
 public enum Honorific
 {
-  MR, MRS, MISS, DR
+    MR, MRS, MISS, DR
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java Mon Nov 12 14:22:31 2007
@@ -18,16 +18,16 @@
 
 public class GameOver
 {
-  @Persist
-  private int _count;
+    @Persist
+    private int _count;
 
-  public int getCount()
-  {
-    return _count;
-  }
+    public int getCount()
+    {
+        return _count;
+    }
 
-  void setup(int count)
-  {
-    _count = count;
-  }
+    void setup(int count)
+    {
+        _count = count;
+    }
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java Mon Nov 12 14:22:31 2007
@@ -19,61 +19,61 @@
 
 public class Guess
 {
-  @Persist
-  private int _target;
+    @Persist
+    private int _target;
 
-  private int _guess;
+    private int _guess;
 
-  @Persist
-  private String _message;
+    @Persist
+    private String _message;
 
-  @Persist
-  private int _count;
+    @Persist
+    private int _count;
 
-  public String getMessage()
-  {
-    return _message;
-  }
-
-  @InjectPage
-  private GameOver _gameOver;
+    public String getMessage()
+    {
+        return _message;
+    }
 
-  Object onActionFromLink(int guess)
-  {
-    _count++;
+    @InjectPage
+    private GameOver _gameOver;
 
-    if (guess == _target)
+    Object onActionFromLink(int guess)
     {
-      _gameOver.setup(_count);
-      return _gameOver;
-    }
+        _count++;
 
-    if (guess < _target)
-      _message = String.format("%d is too low.", guess);
-    else
-      _message = String.format("%d is too high.", guess);
+        if (guess == _target)
+        {
+            _gameOver.setup(_count);
+            return _gameOver;
+        }
+
+        if (guess < _target)
+            _message = String.format("%d is too low.", guess);
+        else
+            _message = String.format("%d is too high.", guess);
 
-    return null;
-  }
+        return null;
+    }
 
-  public int getGuess()
-  {
-    return _guess;
-  }
+    public int getGuess()
+    {
+        return _guess;
+    }
 
-  public void setGuess(int guess)
-  {
-    _guess = guess;
-  }
+    public void setGuess(int guess)
+    {
+        _guess = guess;
+    }
 
-  void setup(int target)
-  {
-    _target = target;
-    _count = 0;
-  }
+    void setup(int target)
+    {
+        _target = target;
+        _count = 0;
+    }
 
-  public int getTarget()
-  {
-    return _target;
-  }
+    public int getTarget()
+    {
+        return _target;
+    }
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Start.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Start.java Mon Nov 12 14:22:31 2007
@@ -14,23 +14,23 @@
 
 package org.apache.tapestry.tutorial.pages;
 
-import java.util.Random;
-
 import org.apache.tapestry.annotations.InjectPage;
 
+import java.util.Random;
+
 public class Start
 {
-  private final Random _random = new Random();
+    private final Random _random = new Random();
 
-  @InjectPage
-  private Guess _guess;
+    @InjectPage
+    private Guess _guess;
 
-  Object onAction()
-  {
-    int target = _random.nextInt(10) + 1;
+    Object onAction()
+    {
+        int target = _random.nextInt(10) + 1;
 
-    _guess.setup(target);
+        _guess.setup(target);
 
-    return _guess;
-  }
+        return _guess;
+    }
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java Mon Nov 12 14:22:31 2007
@@ -4,16 +4,16 @@
 
 public class CreateAddress
 {
-  private Address _address;
+    private Address _address;
 
-  public Address getAddress()
-  {
-    return _address;
-  }
+    public Address getAddress()
+    {
+        return _address;
+    }
 
-  public void setAddress(Address address)
-  {
-    _address = address;
-  }
+    public void setAddress(Address address)
+    {
+        _address = address;
+    }
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/AppModule.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.tutorial.services;
 
-import java.io.IOException;
-
 import org.apache.tapestry.ioc.MappedConfiguration;
 import org.apache.tapestry.ioc.OrderedConfiguration;
 import org.apache.tapestry.ioc.annotations.Marker;
@@ -25,6 +23,8 @@
 import org.apache.tapestry.services.Response;
 import org.slf4j.Logger;
 
+import java.io.IOException;
+
 /**
  * This module is automatically included as part of the Tapestry IoC Registry, it's a good place to
  * configure and extend Tapestry, or to place your own services.
@@ -85,8 +85,8 @@
      */
     public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
 
-    @Local
-    RequestFilter filter)
+                                         @Local
+                                         RequestFilter filter)
     {
         // Each contribution to an ordered configuration has a name, When necessary, you may
         // set constraints to precisely control the invocation order of the contributed filter

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/Local.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/Local.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/Local.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/services/Local.java Mon Nov 12 14:22:31 2007
@@ -1,18 +1,17 @@
 /**
- * 
+ *
  */
 package org.apache.tapestry.tutorial.services;
 
+import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
 
 @Target(
-{ PARAMETER, FIELD })
+        {PARAMETER, FIELD})
 @Retention(RUNTIME)
 @Documented
 public @interface Local

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml Mon Nov 12 14:22:31 2007
@@ -16,23 +16,23 @@
 -->
 
 <!DOCTYPE web-app
-      PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-      "http://java.sun.com/dtd/web-app_2_3.dtd">
-      <web-app>
-          <display-name>Tapestry 5 Tutorial #1</display-name>
-          <context-param>
-              <!-- The only significant configuration for Tapestry 5, this informs Tapestry
-                   of where to look for pages, components and mixins. -->
-              <param-name>tapestry.app-package</param-name>
-              <param-value>org.apache.tapestry.tutorial</param-value>
-          </context-param>
-          <filter>
-              <filter-name>app</filter-name>
-              <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
-          </filter>
-          <filter-mapping>
-              <filter-name>app</filter-name>
-              <url-pattern>/*</url-pattern>
-          </filter-mapping>
-      </web-app>
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+    <display-name>Tapestry 5 Tutorial #1</display-name>
+    <context-param>
+        <!-- The only significant configuration for Tapestry 5, this informs Tapestry
+of where to look for pages, components and mixins. -->
+        <param-name>tapestry.app-package</param-name>
+        <param-value>org.apache.tapestry.tutorial</param-value>
+    </context-param>
+    <filter>
+        <filter-name>app</filter-name>
+        <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>app</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+</web-app>
       

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -16,42 +16,42 @@
 -->
 
 <project name="Tapestry 5 Tutorial #1">
-  <bannerLeft>
-    <name>Tapestry 5</name>
-    <href>http://tapestry.apache.org/tapestry5/</href>
-    <src>images/tapestry_banner.gif</src>
-  </bannerLeft>
-  <bannerRight>
-    <name>Apache</name>
-    <href>http://www.apache.org</href>
-    <src>images/asf_logo_wide.gif</src>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.tapestry</groupId>
-    <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
-  </skin>
-  
-  <publishDate format="dd MMM yyyy" />
-  
-  <body>
-
-    
-    <menu name="Quick Links">
-      <item name="Download" href="http://tapestry.apache.org/download.html"/>
-    </menu>
-        
-    <menu name="Tutorial">
-      <item name="Introduction" href="index.html"/>
-      <item name="Environment" href="env.html"/>
-      <item name="Your First Application" href="first.html"/> 
-      <item name="Hi/Lo Game" href="hilo.html"/>
-      <item name="Forms" href="forms.html"/>
-      <item name="Forms, pt 2" href="forms2.html"/>
-    </menu>    
-        
-        
-    <menu ref="reports"/>
-    
-  </body>
+    <bannerLeft>
+        <name>Tapestry 5</name>
+        <href>http://tapestry.apache.org/tapestry5/</href>
+        <src>images/tapestry_banner.gif</src>
+    </bannerLeft>
+    <bannerRight>
+        <name>Apache</name>
+        <href>http://www.apache.org</href>
+        <src>images/asf_logo_wide.gif</src>
+    </bannerRight>
+    <skin>
+        <groupId>org.apache.tapestry</groupId>
+        <artifactId>maven-skin</artifactId>
+        <version>1.1</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <body>
+
+
+        <menu name="Quick Links">
+            <item name="Download" href="http://tapestry.apache.org/download.html"/>
+        </menu>
+
+        <menu name="Tutorial">
+            <item name="Introduction" href="index.html"/>
+            <item name="Environment" href="env.html"/>
+            <item name="Your First Application" href="first.html"/>
+            <item name="Hi/Lo Game" href="hilo.html"/>
+            <item name="Forms" href="forms.html"/>
+            <item name="Forms, pt 2" href="forms2.html"/>
+        </menu>
+
+
+        <menu ref="reports"/>
+
+    </body>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-upload/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/.classpath?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/.classpath Mon Nov 12 14:22:31 2007
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" output="bin"  path="src/main/java"/>
-  <classpathentry kind="src" output="bin-test"  path="src/test/java"/>
-  <classpathentry kind="lib" path="src/main/resources"/> 
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
-  <classpathentry kind="output" path="bin"/>
+    <classpathentry kind="src" output="bin" path="src/main/java"/>
+    <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+    <classpathentry kind="lib" path="src/main/resources"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+    <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: tapestry/tapestry5/trunk/tapestry-upload/.project
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/.project?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/.project Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
 <projectDescription>
-  <name>tapestry-upload</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.maven.ide.eclipse.maven2Builder</name>
-      <arguments>
-      </arguments>
-     </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.maven.ide.eclipse.maven2Nature</nature>
-  </natures>
+    <name>tapestry-upload</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.maven.ide.eclipse.maven2Builder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.maven.ide.eclipse.maven2Nature</nature>
+    </natures>
 </projectDescription>

Modified: tapestry/tapestry5/trunk/tapestry-upload/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/pom.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/pom.xml Mon Nov 12 14:22:31 2007
@@ -1,131 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.tapestry</groupId>
-  <artifactId>tapestry-upload</artifactId>
-  <name>Tapestry File Upload Component Library</name>
-  <packaging>jar</packaging>
-  <description>
-    Provides a file upload component for Tapestry, based on Jakarta
-    commons-fileupload.
-  </description>
-  <parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tapestry</groupId>
-    <artifactId>tapestry-project</artifactId>
-    <version>5.0.7-SNAPSHOT</version>
-  </parent>
-  <inceptionYear>2007</inceptionYear>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.tapestry</groupId>
-      <artifactId>tapestry-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tapestry</groupId>
-      <artifactId>tapestry-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
-
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-      <!-- This gets the plugin to clean up the cobertura.ser file left
-        in the root directory. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${cobertura-plugin-version}</version>
-        <executions>
-          <execution>
-            <id>clean</id>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Tapestry-Module-Classes>
-                org.apache.tapestry.upload.services.UploadModule
-              </Tapestry-Module-Classes>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>summary</report>
-              <report>dependencies</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>${cobertura-plugin-version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-
-      <plugin>
+    <artifactId>tapestry-upload</artifactId>
+    <name>Tapestry File Upload Component Library</name>
+    <packaging>jar</packaging>
+    <description>
+        Provides a file upload component for Tapestry, based on Jakarta
+        commons-fileupload.
+    </description>
+    <parent>
         <groupId>org.apache.tapestry</groupId>
-        <artifactId>tapestry-component-report</artifactId>
-        <version>${project.version}</version>
-        <configuration>
-          <rootPackage>org.apache.tapestry.upload</rootPackage>
-          <apidocs>../apidocs</apidocs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+        <artifactId>tapestry-project</artifactId>
+        <version>5.0.7-SNAPSHOT</version>
+    </parent>
+    <inceptionYear>2007</inceptionYear>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tapestry</groupId>
+            <artifactId>tapestry-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tapestry</groupId>
+            <artifactId>tapestry-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <!-- This gets the plugin to clean up the cobertura.ser file left
+        in the root directory. -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-plugin-version}</version>
+                <executions>
+                    <execution>
+                        <id>clean</id>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Tapestry-Module-Classes>
+                                org.apache.tapestry.upload.services.UploadModule
+                            </Tapestry-Module-Classes>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-plugin-version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.tapestry</groupId>
+                <artifactId>tapestry-component-report</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <rootPackage>org.apache.tapestry.upload</rootPackage>
+                    <apidocs>../apidocs</apidocs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,7 @@
 
 package org.apache.tapestry.upload.components;
 
-import java.util.Locale;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ValidationTracker;
+import org.apache.tapestry.*;
 import org.apache.tapestry.annotations.Environmental;
 import org.apache.tapestry.annotations.Parameter;
 import org.apache.tapestry.corelib.base.AbstractField;
@@ -32,6 +24,8 @@
 import org.apache.tapestry.upload.services.MultipartDecoder;
 import org.apache.tapestry.upload.services.UploadedFile;
 
+import java.util.Locale;
+
 /**
  * A component to upload a file.
  */
@@ -97,7 +91,7 @@
 
     // For testing
     Upload(UploadedFile value, FieldValidator<Object> validate, MultipartDecoder decoder,
-            ValidationTracker tracker, ComponentResources resources)
+           ValidationTracker tracker, ComponentResources resources)
     {
         _value = value;
         if (validate != null) _validate = validate;
@@ -131,9 +125,8 @@
 
     /**
      * Render the upload tags.
-     * 
-     * @param writer
-     *            Writer to output markup
+     *
+     * @param writer Writer to output markup
      */
     protected void beginRender(MarkupWriter writer)
     {

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoder.java Mon Nov 12 14:22:31 2007
@@ -23,8 +23,7 @@
 {
 
     /**
-     * @param parameterName
-     *            Name of the query parameter associated with the uploaded file
+     * @param parameterName Name of the query parameter associated with the uploaded file
      * @return a file upload with the given name, or null if no such file upload was in the request.
      */
     UploadedFile getFileUpload(String parameterName);
@@ -33,9 +32,8 @@
      * Decodes the request, returning a new {@link javax.servlet.http.HttpServletRequest}
      * implementation that will allow access to the form fields submitted in the request (but omits
      * uploaded files).
-     * 
-     * @param request
-     *            The incoming servlet request
+     *
+     * @param request The incoming servlet request
      * @return decoded http request
      */
     HttpServletRequest decode(HttpServletRequest request);

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,19 @@
 
 package org.apache.tapestry.upload.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import org.apache.tapestry.ioc.services.ThreadCleanupListener;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Implementation of multipart decoder for servlets.
  */
@@ -45,7 +43,7 @@
     private final long _maxFileSize;
 
     public MultipartDecoderImpl(String repositoryLocation, int repositoryThreshold,
-            long maxRequestSize, long maxFileSize)
+                                long maxRequestSize, long maxFileSize)
     {
         _repositoryLocation = repositoryLocation;
         _repositoryThreshold = repositoryThreshold;
@@ -101,9 +99,12 @@
     }
 
     protected HttpServletRequest processFileItems(HttpServletRequest request,
-            List<FileItem> fileItems)
+                                                  List<FileItem> fileItems)
     {
-        if (fileItems == null || fileItems.isEmpty()) { return request; }
+        if (fileItems == null || fileItems.isEmpty())
+        {
+            return request;
+        }
 
         ParametersServletRequestWrapper wrapper = new ParametersServletRequestWrapper(request);
 

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
 
 package org.apache.tapestry.upload.services;
 
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.tapestry.services.HttpServletRequestFilter;
 import org.apache.tapestry.services.HttpServletRequestHandler;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * Filter that decodes an incoming multipart request.
  */
@@ -36,7 +35,7 @@
     }
 
     public boolean service(HttpServletRequest request, HttpServletResponse response,
-            HttpServletRequestHandler handler) throws IOException
+                           HttpServletRequestHandler handler) throws IOException
     {
         if (ServletFileUpload.isMultipartContent(request)) request = _decoder.decode(request);
 

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java Mon Nov 12 14:22:31 2007
@@ -15,16 +15,14 @@
 package org.apache.tapestry.upload.services;
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.services.Dispatcher;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import java.io.UnsupportedEncodingException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-import org.apache.tapestry.services.Dispatcher;
 
 /**
  * Wrapper for HttpServletRequest that overrides the parameter methods of the wrapped request. i.e.

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
 
 package org.apache.tapestry.upload.services;
 
-import java.io.File;
-
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.internal.util.MessagesImpl;
 
+import java.io.File;
+
 class UploadMessages
 {
     private static final Messages MESSAGES = MessagesImpl.forClass(UploadMessages.class);
@@ -54,7 +54,7 @@
     }
 
     static String encodingTypeAlreadySet(String formId, String requiredEncType,
-            String existingEncType)
+                                         String existingEncType)
     {
         return MESSAGES.format("enctype-already-set", formId, requiredEncType, existingEncType);
     }

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java Mon Nov 12 14:22:31 2007
@@ -62,7 +62,8 @@
             SymbolSource symbolSource)
     {
         MultipartDecoderImpl multipartDecoder = new MultipartDecoderImpl(repositoryPath,
-                repositoryThreshold, maxRequestSize, maxFileSize);
+                                                                         repositoryThreshold, maxRequestSize,
+                                                                         maxFileSize);
 
         // This is proabably overkill since the FileCleaner should catch temporary files, but lets
         // be safe.

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFile.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFile.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFile.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
 
 package org.apache.tapestry.upload.services;
 
+import org.apache.tapestry.upload.components.Upload;
+
 import java.io.File;
 import java.io.InputStream;
 
-import org.apache.tapestry.upload.components.Upload;
-
 /**
  * Represents an uploaded file.
- * 
+ *
  * @see Upload
  */
 public interface UploadedFile
@@ -58,9 +58,8 @@
 
     /**
      * Writes the content of the file to a known location.
-     * 
-     * @param file
-     *            Location to write file to
+     *
+     * @param file Location to write file to
      */
     void write(File file);
 }

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.upload.services;
 
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.FilenameUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.io.FilenameUtils;
 
 /**
  * Implentation of {@link UploadedFile} for FileItems.

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -16,36 +16,36 @@
 -->
 
 <project name="Tapestry File Upload">
-  <bannerLeft>
-    <name>Tapestry 5</name>
-    <href>http://tapestry.apache.org/tapestry5/</href>
-    <src>images/tapestry_banner.gif</src>
-  </bannerLeft>
-  <bannerRight>
-    <name>Apache</name>
-    <href>http://www.apache.org</href>
-    <src>images/asf_logo_wide.gif</src>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.tapestry</groupId>
-    <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
-  </skin>
-
-  <publishDate format="dd MMM yyyy"/>
-
-  <body>
-
-
-    <menu name="Quick Links">
-      <item name="Download" href="http://tapestry.apache.org/download.html"/>
-    </menu>
-
-    <menu name="Documentation">
-      <item name="Reference" href="index.html"/>
-    </menu>
+    <bannerLeft>
+        <name>Tapestry 5</name>
+        <href>http://tapestry.apache.org/tapestry5/</href>
+        <src>images/tapestry_banner.gif</src>
+    </bannerLeft>
+    <bannerRight>
+        <name>Apache</name>
+        <href>http://www.apache.org</href>
+        <src>images/asf_logo_wide.gif</src>
+    </bannerRight>
+    <skin>
+        <groupId>org.apache.tapestry</groupId>
+        <artifactId>maven-skin</artifactId>
+        <version>1.1</version>
+    </skin>
 
-    <menu ref="reports"/>
+    <publishDate format="dd MMM yyyy"/>
 
-  </body>
+    <body>
+
+
+        <menu name="Quick Links">
+            <item name="Download" href="http://tapestry.apache.org/download.html"/>
+        </menu>
+
+        <menu name="Documentation">
+            <item name="Reference" href="index.html"/>
+        </menu>
+
+        <menu ref="reports"/>
+
+    </body>
 </project>

Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml Mon Nov 12 14:22:31 2007
@@ -16,13 +16,13 @@
 -->
 
 <suite name="Tapesty Upload Component" parallel="false" annotations="1.5" verbose="2">
-  <test name="Tapesty Upload Component">
-    <parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
-    <packages>
-      <package name="org.apache.tapestry.upload.components"/>
-      <package name="org.apache.tapestry.upload.services"/>
-      <!-- One day might be able to run this too -->
-      <!--package name="org.apache.tapestry.upload.integration"/-->
-    </packages>
-  </test>
+    <test name="Tapesty Upload Component">
+        <parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
+        <packages>
+            <package name="org.apache.tapestry.upload.components"/>
+            <package name="org.apache.tapestry.upload.services"/>
+            <!-- One day might be able to run this too -->
+            <!--package name="org.apache.tapestry.upload.integration"/-->
+        </packages>
+    </test>
 </suite>



Mime
View raw message