svn commit: r658390 [32/32] - in /tapestry/tapestry5/branches/hlship-20080520: ./ quickstart/src/main/resources/META-INF/ quickstart/src/main/resources/archetype-resources/src/main/java/pages/ quickstart/src/main/resources/archetype-resources/src/main/...

[hl...@apache.org]

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/webapp/WEB-INF/web.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-spring/src/test/webapp/WEB-INF/web.xml Tue May 20 11:51:35 2008
@@ -25,7 +25,7 @@
     <filter>
         <filter-name>app</filter-name>
         <!-- Special filter that adds in a T5 IoC module derived from the Spring WebApplicationContext. -->
-        <filter-class>org.apache.tapestry.spring.TapestrySpringFilter</filter-class>
+        <filter-class>org.apache.tapestry5.spring.TapestrySpringFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>app</filter-name>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/pom.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/pom.xml Tue May 20 11:51:35 2008
@@ -1,5 +1,6 @@
 <?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">
+<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-test</artifactId>
@@ -61,4 +62,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
\ No newline at end of file
+</project>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
 
 import com.thoughtworks.selenium.CommandProcessor;
 import com.thoughtworks.selenium.DefaultSelenium;
@@ -36,7 +36,7 @@
  * instance it creates. It also extends the normal exception reporting for any failed command or query to produce a more
  * detailed report to the main console.
  *
- * @see org.apache.tapestry.test.JettyRunner
+ * @see org.apache.tapestry5.test.JettyRunner
  */
 public class AbstractIntegrationTestSuite extends Assert implements Selenium
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
 
 import com.thoughtworks.selenium.CommandProcessor;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
 
 import org.mortbay.http.NCSARequestLog;
 import org.mortbay.http.SocketListener;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
 
 import java.io.*;
 import static java.lang.String.format;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
 
 import java.io.File;
 
@@ -23,10 +23,9 @@
      */
     public static final String CURRENT_DIR_PATH = System.getProperty("user.dir");
     /**
-     * The Surefire plugin sets basedir but DOES NOT change the current working directory.
-     * When building across modules, basedir changes for each module, but user.dir does not.
-     * This value should be used when referecing local files.  Outside of surefire, the
-     * "basedir" property will not be set, and the current working directory will be the
+     * The Surefire plugin sets basedir but DOES NOT change the current working directory. When building across modules,
+     * basedir changes for each module, but user.dir does not. This value should be used when referecing local files.
+     * Outside of surefire, the "basedir" property will not be set, and the current working directory will be the
      * default.
      */
     public static final String MODULE_BASE_DIR_PATH = System.getProperty("basedir", CURRENT_DIR_PATH);

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/site/apt/index.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-test/src/site/apt/index.apt Tue May 20 11:51:35 2008
@@ -18,7 +18,7 @@
 Usage and Configuration
 
   The core part of this library is a base class for you to extend your tests cases from: 
-  {{{../apidocs/org/apache/tapestry/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
+  {{{../apidocs/org/apache/tapestry5/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
   
   This class is responsible for starting an instance of Jetty to server your web application, as well
   as a copy of Selenium Server. It also implements the
@@ -32,9 +32,9 @@
   
      
 ----
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
 
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
 import org.testng.annotations.Test;
 
 public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/pom.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/pom.xml Tue May 20 11:51:35 2008
@@ -139,7 +139,7 @@
                 <artifactId>tapestry-component-report</artifactId>
                 <version>${project.version}</version>
                 <configuration>
-                    <rootPackage>org.apache.tapestry.tutorial</rootPackage>
+                    <rootPackage>org.apache.tapestry5.tutorial</rootPackage>
                 </configuration>
             </plugin>
         </plugins>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.data;
+package org.apache.tapestry5.tutorial.data;
 
 public enum Honorific
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
 
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.tutorial.data.Honorific;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java Tue May 20 11:51:35 2008
@@ -25,10 +25,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 
 public class GameOver
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 
 public class Guess
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
 import org.hibernate.Session;
 
 import java.util.List;
@@ -44,4 +44,4 @@
     {
         return session.createCriteria(Address.class).list();
     }
-}
\ No newline at end of file
+}

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java Tue May 20 11:51:35 2008
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
 
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
-import org.apache.tapestry.tutorial.pages.Index;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
+import org.apache.tapestry5.tutorial.pages.Index;
 import org.hibernate.Session;
 
 public class CreateAddress

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java Tue May 20 11:51:35 2008
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
 
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
 import org.slf4j.Logger;
 
 import java.io.IOException;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java Tue May 20 11:51:35 2008
@@ -15,7 +15,7 @@
 /**
  *
  */
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.FIELD;
@@ -25,9 +25,9 @@
 import java.lang.annotation.Target;
 
 @Target(
-        {PARAMETER, FIELD})
+        { PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
 public @interface Local
 {
-}
\ No newline at end of file
+}

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/log4j.properties?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/log4j.properties (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/log4j.properties Tue May 20 11:51:35 2008
@@ -21,17 +21,17 @@
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n
 
-log4j.category.org.apache.tapestry.TapestryFilter=info
-log4j.category.org.apache.tapestry.services.TapestryModule.ComponentClassResolver=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
+log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info
 
 log4j.category.org.apache.tapestry=error
 log4j.category.tapestry=error
 
-log4j.category.org.apache.tapestry.tutorial=error
+log4j.category.org.apache.tapestry5.tutorial=error
 log4j.category.app=error
 log4j.category.app.TimingFilter=info
 
 # Turning on debug mode for a page or component will show all of the code changes that occur when the
 # class is loaded.  Turning on debug mode for a page will enable verbose output about rendering
 # the page (and its components).
-# log4j.category.org.apache.tapestry.tutorial.pages.Index=debug
+# log4j.category.org.apache.tapestry5.tutorial.pages.Index=debug

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties Tue May 20 11:51:35 2008
@@ -25,4 +25,4 @@
 submit-label=Create Address
 
 zip-regexp=\\d{5}(-\\d{4})?
-zip-regexp-message=Zip Codes are five or nine digits.  Example: 02134 or 90125-1655.
\ No newline at end of file
+zip-regexp-message=Zip Codes are five or nine digits.  Example: 02134 or 90125-1655.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml Tue May 20 11:51:35 2008
@@ -24,15 +24,15 @@
         <!-- 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>
+        <param-value>org.apache.tapestry5.tutorial</param-value>
     </context-param>
     <filter>
         <filter-name>app</filter-name>
-        <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+        <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>app</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 </web-app>
-      
\ No newline at end of file
+      

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/first.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/first.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/first.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/first.apt Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
   
   Maven uses the group id and artifact id to provide a unique identity for the application, and Tapestry needs to have a base package name so it knows where to look for pages and components.
   
-  For this example, we'll use the group id <<org.apache.tapestry>> and the artifact id <<tapestry-tutorial1>>, and we'll use <<org.apache.tapestry.tutorial>> as the base package.
+  For this example, we'll use the group id <<org.apache.tapestry>> and the artifact id <<tapestry-tutorial1>>, and we'll use <<org.apache.tapestry5.tutorial>> as the base package.
   
   Our final command line is thus:
 
@@ -22,7 +22,7 @@
   -DarchetypeArtifactId=quickstart
   -DgroupId=org.apache.tapestry
   -DartifactId=tutorial1
-  -DpackageName=org.apache.tapestry.tutorial
+  -DpackageName=org.apache.tapestry5.tutorial
 ----
 
   We've shown this as several lines, but it would normally be entered as a single long line.
@@ -126,11 +126,11 @@
               <!-- 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>
+              <param-value>org.apache.tapestry5.tutorial</param-value>
           </context-param>
           <filter>
               <filter-name>app</filter-name>
-              <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+              <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
           </filter>
           <filter-mapping>
               <filter-name>app</filter-name>
@@ -216,12 +216,12 @@
   re-used to generate the HTML sent to the browser, which results in the updated time showing up in the web browser.
   
   The final piece of the puzzle is the Java class for the page.  Tapestry has very specific rules for where page classes go.  Remember the package name (configured inside web.xml)?  Tapestry adds a
-  sub-package, "pages", to it and the Java class goes there. Thus the full Java class name is org.apache.tapestry.tutorial.pages.Index.
+  sub-package, "pages", to it and the Java class goes there. Thus the full Java class name is org.apache.tapestry5.tutorial.pages.Index.
   
-  <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java>>
+  <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java>>
 
 ---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
 import java.util.Date;
 
@@ -240,7 +240,7 @@
   That's pretty darn simple: No classes to extend, no interfaces to implement, just a very pure POJO (Plain Old Java Object). You do have to meet the Tapestry framework
   halfway:
   
-  * You need to put the Java class in the expected package, org.apache.tapestry.tutorial.pages
+  * You need to put the Java class in the expected package, org.apache.tapestry5.tutorial.pages
   
   * The class must be public
   

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms.apt Tue May 20 11:51:35 2008
@@ -15,12 +15,12 @@
   as we'll see shortly, a handy one).
   
   
-  <<src/main/java/org/apache/tapestry/tutorial/entities/Address.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/entities/Address.java:>>
   
 ----
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
 
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.tutorial.data.Honorific;
 
 public class Address
 {
@@ -148,10 +148,10 @@
 
   It's just a collection of getter and setter methods.  We also need to define the enum type, Honorific:
   
-  <<src/main/java/org/apache/tapestry/tutorial/data/Honorific.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java:>>
   
 ---
-package org.apache.tapestry.tutorial.data;
+package org.apache.tapestry5.tutorial.data;
 
 public enum Honorific
 {
@@ -198,10 +198,10 @@
 
   And the corresponding class:
   
-  <<src/main/java/org/apache/tapestry/tutorial1/pages/address/CreateAddress.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial1/pages/address/CreateAddress.java:>>
   
 ----
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
 
 public class CreateAddress
 {
@@ -211,7 +211,7 @@
    
    So ... why is the class named "CreateAddress" and not simply "Create"?  Actually, we could have named it "Create", and 
    the application would still work, but the longer <class> name is equally valid.  Tapestry noticed the redundancy in the
-   class name:  <<<org.apache.tapestry.tutorial.pages.>>><address><<<.Create>>><Address> and just stripped it out.
+   class name:  <<<org.apache.tapestry5.tutorial.pages.>>><address><<<.Create>>><Address> and just stripped it out.
    
    Eventually, your application will probably have more entities:  perhaps you'll have a "user/Create" page and a "payment/Create" page and an "account/Create" page.
    Now, you <could> have a bunch of different classes named <<<Create>>> spread across a number of different packages.  That's legal Java, but it isn't ideal.  You may find yourself
@@ -220,7 +220,7 @@
    Tapestry is encouraging you to use a more descriptive name: <<<Create>>><Address> not just <<<Create>>>, but it isn't making you pay the cost (in terms of longer,
    uglier URLs).  The URL to access the page will still be http://localhost:8080/tutorial1/address/create.
 
-   Another note:  Index pages work in folders as well.  A class named org.apache.tapestry.tutorial.pages.address.AddressIndex would be given the name
+   Another note:  Index pages work in folders as well.  A class named org.apache.tapestry5.tutorial.pages.address.AddressIndex would be given the name
    "address/Index".  However, Tapestry has special rules for pages named "Index" and the render URL would be
    http://localhost:8080/tutorial1/address/ .  In other words, you can place Index pages in any folder and Tapestry will
    build a short URL for that page ... and you <don't> have to keep naming the classes Index (it's confusing to have many classes with the same
@@ -308,7 +308,7 @@
   
   All it takes is to create a message entry with a particular name:  the name of the property suffixed with "-label". As elsewhere, Tapestry is forgiving of case.
   
-  <<src/main/resources/org/apache/tapestry/tutorial/pages/address/CreateAddress.properties:>>
+  <<src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties:>>
   
 ----
 street1-label=Street 1
@@ -381,7 +381,7 @@
   Before we worry about storing the Address object, we should make sure that the user provides reasonable values. For example,several of the fields should be required,
   and phone numbers and email address have specific formats.
   
-  The BeanEditForm checks for a Tapestry-specific annotation, @org.apache.tapestry.beaneditor.Validate, on the getter <or> setter method of each property.   
+  The BeanEditForm checks for a Tapestry-specific annotation, @org.apache.tapestry5.beaneditor.Validate, on the getter <or> setter method of each property.
 
   Update the getter methods for the lastName, firstName, street1, city, state and zip fields, 
   adding a @Validate annotation to each:

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms2.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms2.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms2.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/forms2.apt Tue May 20 11:51:35 2008
@@ -166,14 +166,14 @@
   annotations can be applied to fields or to accessor methods, but the Tapestry annotations we use below
   are for methods only.
 
-  <<src/main/java/org/apache/tapestry/tutorial/entities/Address.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/entities/Address.java:>>
 
 ----
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
 
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.tutorial.data.Honorific;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -345,17 +345,17 @@
 
   []
 
-  <<src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java:>>
 
 ----
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
 
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
-import org.apache.tapestry.tutorial.pages.Index;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
+import org.apache.tapestry5.tutorial.pages.Index;
 import org.hibernate.Session;
 
 public class CreateAddress
@@ -379,7 +379,7 @@
 }
 ----
 
-  The {{{../apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject}} annotation tells Tapestry to inject a service into the
+  The {{{../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation tells Tapestry to inject a service into the
   annotated field; 
   Tapestry includes a sophisticated
   Inversion of Control container (similar in many ways to Spring) that is very good at locating available services
@@ -390,7 +390,7 @@
   of the request.  If we make changes to persistent objects, such as adding a new Address object,
   then it is necessary to commit the transaction.
 
-  The {{{../apidocs/org/apache/tapestry/hibernate/annotations/CommitAfter.html}CommitAfter}} annotation can be applied to any component method; if the method completes normally, the transaction
+  The {{{../apidocs/org/apache/tapestry5/hibernate/annotations/CommitAfter.html}CommitAfter}} annotation can be applied to any component method; if the method completes normally, the transaction
   will be committed (and a new transaction started to replace the committed transaction).
 
   After persisting the new address, we return to the main Index page of the application.
@@ -407,7 +407,7 @@
 [index-grid-v1.png] Adding the Grid to the Index page
 
   So, how is this implemented?  Primarily, its accomplished by the
-  {{{../tapestry-core/ref/org/apache/tapestry/corelib/components/Grid.html}Grid}} component.
+  {{{../tapestry-core/ref/org/apache/tapestry5/corelib/components/Grid.html}Grid}} component.
 
   The Grid component is based on the same concepts as the BeanEditForm component; it can pull apart
   a bean into columns. The columns are sortable, and when there are more entries than will fit on a single
@@ -423,7 +423,7 @@
 
   And all we have to do is supply the addresses property in the Java code:
 
-  <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java (partial):>>
+  <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java (partial):>>
 
 ----
     @Inject

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/hilo.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/hilo.apt?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/hilo.apt (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/site/apt/hilo.apt Tue May 20 11:51:35 2008
@@ -73,7 +73,7 @@
   On the Java side, the Guess page needs to have a target property:
   
 ----
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
 public class Guess
 {
@@ -101,14 +101,14 @@
   
   Let's start with the code, and break it down:
   
-  <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java>>
+  <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java>>
 
 ----
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
 import java.util.Random;
 
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
 
 public class Start
 {
@@ -134,7 +134,7 @@
   The Tapestry way is very object oriented: everything is done in terms of objects and methods and properties of those objects.
   
   This communication starts with the connection between the two pages:  in this case, the
-  {{{../apidocs/org/apache/tapestry/annotations/InjectPage.html}InjectPage}} annotation allows another page in the application
+  {{{../apidocs/org/apache/tapestry5/annotations/InjectPage.html}InjectPage}} annotation allows another page in the application
   to be injected into the Index page.
 
   Injection can be a somewhat nebulous concept.  In terms of Tapestry, it means that some cooperating object needed by one class is provided to it.  The other
@@ -249,7 +249,7 @@
   at the end of that request, the value was lost, and in the subsequent render request for the Guess page,
   the value was zero.
   
-  Fortunately, it is very easy to transcend this behavior.  We'll use an annotation, {{{../apidocs/org/apache/tapestry/annotations/Persist.html}Persist}},
+  Fortunately, it is very easy to transcend this behavior.  We'll use an annotation, {{{../apidocs/org/apache/tapestry5/annotations/Persist.html}Persist}},
   on the instance variable:
   
 ----
@@ -393,10 +393,10 @@
 </html>
 ---
 
-  <<src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java:>>
 
 ---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
 public class GameOver
 {
@@ -459,13 +459,13 @@
   
   Lastly, we need to make some changes to the GameOver class.
   
-  <<src/main/java/org/apache/tapestry/tutorial/GameOver.java:>>
+  <<src/main/java/org/apache/tapestry5/tutorial/GameOver.java:>>
   
 ---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
 
 public class GameOver
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/conf/testng.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/conf/testng.xml Tue May 20 11:51:35 2008
@@ -18,7 +18,7 @@
 <suite name="Tapestry Tutorial #1" annotations="1.5" verbose="2">
     <test name="Services">
         <packages>
-            <package name="org.apache.tapestry.tutorial.services"/>
+            <package name="org.apache.tapestry5.tutorial.services"/>
         </packages>
     </test>
 </suite>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
 
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
 import org.testng.annotations.Test;
 
 public class AppSuite extends TestBase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/pom.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/pom.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/pom.xml Tue May 20 11:51:35 2008
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -85,7 +86,7 @@
                     <archive>
                         <manifestEntries>
                             <Tapestry-Module-Classes>
-                                org.apache.tapestry.upload.services.UploadModule
+                                org.apache.tapestry5.upload.services.UploadModule
                             </Tapestry-Module-Classes>
                         </manifestEntries>
                     </archive>
@@ -117,7 +118,7 @@
                 <artifactId>tapestry-component-report</artifactId>
                 <version>${project.version}</version>
                 <configuration>
-                    <rootPackage>org.apache.tapestry.upload</rootPackage>
+                    <rootPackage>org.apache.tapestry5.upload</rootPackage>
                     <apidocs>../apidocs</apidocs>
                 </configuration>
             </plugin>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java Tue May 20 11:51:35 2008
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.components;
+package org.apache.tapestry5.upload.components;
 
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadedFile;
 
 import java.util.Locale;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java Tue May 20 11:51:35 2008
@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 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 org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadSymbols;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadSymbols;
+import org.apache.tapestry5.upload.services.UploadedFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java Tue May 20 11:51:35 2008
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.upload.services.MultipartDecoder;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
 
 import java.util.List;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.Dispatcher;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.Dispatcher;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.upload.services.UploadedFile;
 
 import java.io.File;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java Tue May 20 11:51:35 2008
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.upload.services.UploadedFile;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * Implentation of {@link org.apache.tapestry.upload.services.UploadedFile} for FileItems.
+ * Implentation of {@link org.apache.tapestry5.upload.services.UploadedFile} for FileItems.
  */
 public class UploadedFileItem implements UploadedFile
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java Tue May 20 11:51:35 2008
@@ -1,24 +1,24 @@
-// Copyright 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.
-
-package org.apache.tapestry.upload.services;
+// Copyright 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.
+
+package org.apache.tapestry5.upload.services;
 
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Responsible for detecting and processing file upload requests, using Jakarta Commons FileUpload.
- * Implementations of this service typically use the threaded service lifecycle model.
+ * Responsible for detecting and processing file upload requests, using Jakarta Commons FileUpload. Implementations of
+ * this service typically use the threaded service lifecycle model.
  */
 public interface MultipartDecoder
 {
@@ -30,9 +30,8 @@
     UploadedFile getFileUpload(String parameterName);
 
     /**
-     * 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).
+     * 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
      * @return decoded http request

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java Tue May 20 11:51:35 2008
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
 
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.io.FileCleaner;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.services.PerthreadManager;
-import org.apache.tapestry.ioc.services.RegistryShutdownHub;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.LibraryMapping;
-import org.apache.tapestry.upload.internal.services.MultipartDecoderImpl;
-import org.apache.tapestry.upload.internal.services.MultipartServletRequestFilter;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.services.PerthreadManager;
+import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.LibraryMapping;
+import org.apache.tapestry5.upload.internal.services.MultipartDecoderImpl;
+import org.apache.tapestry5.upload.internal.services.MultipartServletRequestFilter;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -37,7 +37,7 @@
     {
         // Add the component to the "core" library.
 
-        configuration.add(new LibraryMapping("core", "org.apache.tapestry.upload"));
+        configuration.add(new LibraryMapping("core", "org.apache.tapestry5.upload"));
     }
 
     @Scope(IOCConstants.PERTHREAD_SCOPE)

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
 
 /**
  * Configuration symbols.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
 
-import org.apache.tapestry.upload.components.Upload;
+import org.apache.tapestry5.upload.components.Upload;
 
 import java.io.File;
 import java.io.InputStream;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/conf/testng.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/conf/testng.xml Tue May 20 11:51:35 2008
@@ -19,10 +19,10 @@
     <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.internal.services"/>
+            <package name="org.apache.tapestry5.upload.components"/>
+            <package name="org.apache.tapestry5.upload.internal.services"/>
             <!-- One day might be able to run this too -->
-            <!--package name="org.apache.tapestry.upload.integration"/-->
+            <!--package name="org.apache.tapestry5.upload.integration"/-->
         </packages>
     </test>
 </suite>

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload;
+package org.apache.tapestry5.upload;
 
-import org.apache.tapestry.test.JettyRunner;
+import org.apache.tapestry5.test.JettyRunner;
 
 import java.io.File;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java Tue May 20 11:51:35 2008
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.components;
+package org.apache.tapestry5.upload.components;
 
-import org.apache.tapestry.*;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.test.TapestryTestCase;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadedFile;
 import static org.easymock.EasyMock.expectLastCall;
 import org.testng.annotations.Test;
 
@@ -145,7 +145,7 @@
 
     }
 
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings({ "unchecked" })
     @Test
     public void process_submission_extracts_value_from_decoder() throws Exception
     {
@@ -171,7 +171,7 @@
         assertSame(component.getValue(), uploadedFile);
     }
 
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings({ "unchecked" })
     @Test
     public void process_submission_ignores_null_value() throws Exception
     {
@@ -222,7 +222,7 @@
         verify();
     }
 
-    @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+    @SuppressWarnings({ "unchecked", "ThrowableInstanceNeverThrown" })
     @Test
     public void process_submission_tracks_validator_errors() throws Exception
     {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.integration;
+package org.apache.tapestry5.upload.integration;
 
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
 import org.example.upload.pages.Start;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import javax.servlet.http.HttpServletRequest;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.apache.tapestry.upload.services.MultipartDecoder;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.test.TapestryTestCase;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
 import org.testng.annotations.Test;
 
 import javax.servlet.http.HttpServletRequest;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
     public void multiReturnsArrayWithConstructedParameterByDefault() throws Exception
     {
         ParameterValue value = new ParameterValue("foo");
-        assertEquals(value.multi(), new String[]{"foo"});
+        assertEquals(value.multi(), new String[] { "foo" });
     }
 
     @Test
@@ -46,7 +46,7 @@
     {
         ParameterValue value = new ParameterValue("foo");
         value.add("blah");
-        assertEquals(value.multi(), new String[]{"foo", "blah"});
+        assertEquals(value.multi(), new String[] { "foo", "blah" });
     }
 
     @Test

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import static org.easymock.EasyMock.*;
 import static org.testng.Assert.*;
@@ -126,7 +126,7 @@
         wrapper.addParameter("foo", "blah");
         wrapper.addParameter("foo", "another");
 
-        assertEquals(wrapper.getParameterValues("foo"), new String[]{"blah", "another"});
+        assertEquals(wrapper.getParameterValues("foo"), new String[] { "blah", "another" });
         verify(request);
     }
 
@@ -166,7 +166,7 @@
         Map parameters = wrapper.getParameterMap();
         assertEquals(parameters.size(), 2);
         assertEquals(parameters.get("single"), "blah");
-        assertEquals((String[]) parameters.get("multi"), new String[]{"one", "two"});
+        assertEquals((String[]) parameters.get("multi"), new String[] { "one", "two" });
 
         verify(request);
     }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import org.apache.commons.fileupload.FileItem;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java Tue May 20 11:51:35 2008
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.input.NullInputStream;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import java.io.File;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/pages/Start.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/pages/Start.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/pages/Start.java Tue May 20 11:51:35 2008
@@ -14,8 +14,8 @@
 
 package org.example.upload.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.upload.services.UploadedFile;
 
 import java.io.File;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java Tue May 20 11:51:35 2008
@@ -14,8 +14,8 @@
 
 package org.example.upload.services;
 
-import org.apache.tapestry.ioc.annotation.SubModule;
-import org.apache.tapestry.upload.services.UploadModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
+import org.apache.tapestry5.upload.services.UploadModule;
 
 /**
  * The SubModule is not normally needed, except that during tests of tapestry-upload, the necessary JAR Manifest does

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/webapp/WEB-INF/web.xml?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-upload/src/test/webapp/WEB-INF/web.xml Tue May 20 11:51:35 2008
@@ -26,7 +26,7 @@
     </context-param>
     <filter>
         <filter-name>app</filter-name>
-        <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+        <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>app</filter-name>