svn commit: r658390 [21/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-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.*;
-import org.apache.tapestry.corelib.internal.InternalMessages;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.corelib.internal.InternalMessages;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.ValidationMessagesSource;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
 import org.testng.annotations.BeforeClass;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
 import org.testng.annotations.Test;
 
 import java.util.Locale;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java Tue May 20 11:51:35 2008
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
 import org.testng.annotations.Test;
 
 /**

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.ValidationMessagesSource;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java Tue May 20 11:51:35 2008
@@ -12,21 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
 import org.testng.annotations.Test;
 
 import java.util.Collection;
 import java.util.Iterator;
 
 /**
- * A more minimal test, since common behavior is already tested by
- * {@link SessionPersistentFieldStrategyTest}.
+ * A more minimal test, since common behavior is already tested by {@link SessionPersistentFieldStrategyTest}.
  */
 public class FlashPersistentFieldStrategyTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 public interface FooBarInterface extends FooInterface, BarInterface
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 /**
  *

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 public class GenericBean<T>
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 /**
  *

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Heartbeat;
 import org.testng.annotations.Test;
 
 public class HeartbeatImplTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import javax.servlet.http.HttpServletRequest;

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java Tue May 20 11:51:35 2008
@@ -12,31 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
 import javassist.*;
-import org.apache.tapestry.annotation.Meta;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.model.MutableComponentModelImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.FieldRemoval;
-import org.apache.tapestry.internal.transform.InheritedAnnotation;
-import org.apache.tapestry.internal.transform.TestPackageAwareLoader;
-import org.apache.tapestry.internal.transform.pages.*;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentResourcesAware;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.model.MutableComponentModelImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.FieldRemoval;
+import org.apache.tapestry5.internal.transform.InheritedAnnotation;
+import org.apache.tapestry5.internal.transform.TestPackageAwareLoader;
+import org.apache.tapestry5.internal.transform.pages.*;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryClassPool;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentResourcesAware;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.MethodFilter;
+import org.apache.tapestry5.services.TransformMethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;
@@ -193,7 +193,7 @@
         catch (RuntimeException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Class org.apache.tapestry.internal.transform.pages.ParentClass does not contain a field named 'unknownField'.");
+                         "Class org.apache.tapestry5.internal.transform.pages.ParentClass does not contain a field named 'unknownField'.");
         }
 
         verify();
@@ -339,7 +339,7 @@
         catch (RuntimeException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Field _field4 of class org.apache.tapestry.internal.transform.pages.ClaimedFields is already claimed by Fred and can not be claimed by Barney.");
+                         "Field _field4 of class org.apache.tapestry5.internal.transform.pages.ClaimedFields is already claimed by Fred and can not be claimed by Barney.");
         }
 
         verify();
@@ -635,7 +635,7 @@
             // The PropertyAccess layer adds a wrapper exception around the real one.
 
             assertEquals(ex.getCause().getMessage(),
-                         "Field org.apache.tapestry.internal.transform.pages.ReadOnlyBean._value is read-only.");
+                         "Field org.apache.tapestry5.internal.transform.pages.ReadOnlyBean._value is read-only.");
         }
 
         verify();
@@ -720,7 +720,7 @@
             // The PropertyAccess layer adds a wrapper exception around the real one.
 
             assertEquals(ex.getCause().getMessage(),
-                         "Field org.apache.tapestry.internal.transform.pages.ReadOnlyBean._value is read-only.");
+                         "Field org.apache.tapestry5.internal.transform.pages.ReadOnlyBean._value is read-only.");
         }
 
         verify();
@@ -827,7 +827,7 @@
 
         assertEquals(l.size(), 2);
         assertEquals(l.get(0).toString(), "void beforeRender()");
-        assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry.MarkupWriter)");
+        assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry5.MarkupWriter)");
 
         // Check up on cacheing
 
@@ -865,7 +865,7 @@
 
         assertEquals(l.size(), 2);
         assertEquals(l.get(0).toString(), "void beforeRender()");
-        assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry.MarkupWriter)");
+        assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry5.MarkupWriter)");
 
         // Check up on cacheing
 
@@ -968,7 +968,7 @@
         catch (IllegalArgumentException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Class org.apache.tapestry.internal.transform.pages.ParentClass does not declare method 'public void foo()'.");
+                         "Class org.apache.tapestry5.internal.transform.pages.ParentClass does not declare method 'public void foo()'.");
         }
 
         verify();
@@ -1164,7 +1164,7 @@
         TransformMethodSignature sig = sigs.get(0);
 
         assertEquals(ct.getMethodIdentifier(sig),
-                     "org.apache.tapestry.internal.transform.pages.MethodIdentifier.makeWaves(java.lang.String, int[]) (at MethodIdentifier.java:24)");
+                     "org.apache.tapestry5.internal.transform.pages.MethodIdentifier.makeWaves(java.lang.String, int[]) (at MethodIdentifier.java:24)");
 
         verify();
     }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.*;
 import org.easymock.IAnswer;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Response;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java Tue May 20 11:51:35 2008
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-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.tapestry.test.TapestryTestCase;
+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.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import java.io.IOException;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.PersistentLocale;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.MetaDataLocator;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 /**
- * Used by {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImplTest}.
+ * Used by {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImplTest}.
  */
 public interface Named
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.services.Cookies;
+import org.apache.tapestry5.services.Cookies;
 
 public class NoOpCookieSource implements Cookies
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.NonVisual;
 
 public class NonVisualBean
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.NullFieldStrategy;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.NullFieldStrategySource;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.NullFieldStrategySource;
 import org.testng.annotations.Test;
 
 import java.util.Collections;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java Tue May 20 11:51:35 2008
@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.MarkupModel;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.parser.AttributeToken;
-import org.apache.tapestry.internal.structure.PageElement;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.parser.AttributeToken;
+import org.apache.tapestry5.internal.structure.PageElement;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentClassResolver;
 import org.apache.tapestry5.services.ComponentMessagesSource;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.EndElementToken;
-import org.apache.tapestry.internal.parser.StartComponentToken;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.structure.PageElement;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.internal.parser.EndElementToken;
+import org.apache.tapestry5.internal.parser.StartComponentToken;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.structure.PageElement;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.services.ComponentClassResolver;
 import org.easymock.EasyMock;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
 import org.testng.annotations.Test;
 
 import java.util.Locale;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.ComponentClassResolver;
 import static org.easymock.EasyMock.contains;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.*;
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.isA;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.ComponentClassResolver;
 import org.testng.annotations.Test;
 
 import java.util.Locale;
@@ -71,8 +71,8 @@
     }
 
     /**
-     * Because of how Tapestry maps class names to logical page names, part of the name may be have
-     * been stripped off and we want to make sure we get it back.
+     * Because of how Tapestry maps class names to logical page names, part of the name may be have been stripped off
+     * and we want to make sure we get it back.
      */
     @Test
     public void uses_simple_class_name_in_folders()

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java Tue May 20 11:51:35 2008
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
 import org.testng.annotations.Test;
 
 import java.util.Collection;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Cookies;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.Cookies;
+import org.apache.tapestry5.services.PersistentLocale;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -35,7 +35,7 @@
             @Override
             public String readCookieValue(String name)
             {
-                return name.equals("org.apache.tapestry.locale") ? "fr" : null;
+                return name.equals("org.apache.tapestry5.locale") ? "fr" : null;
             }
 
         };
@@ -76,7 +76,7 @@
         PersistentLocale persistentLocale = new PersistentLocaleImpl(cookieSource);
         persistentLocale.set(Locale.CANADA_FRENCH);
         assertEquals(cookies.size(), 1);
-        assertEquals(cookies.get("org.apache.tapestry.locale"), "fr_CA");
+        assertEquals(cookies.get("org.apache.tapestry5.locale"), "fr_CA");
     }
 
 }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.internal.bindings.PropBindingFactoryTest;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.internal.bindings.PropBindingFactoryTest;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.services.PropertyConduitSource;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
 public class RemoveFieldBean
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java Tue May 20 11:51:35 2008
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.services.AssetSource;
 import org.testng.annotations.Test;
 
 public class RenderSupportImplTest extends InternalBaseTestCase
 {
     private static final String CORE_ASSET_PATH_UNEXPANDED = "${core}";
 
-    private static final String CORE_ASSET_PATH = "/org/apache/tapestry/core/core.png";
+    private static final String CORE_ASSET_PATH = "/org/apache/tapestry5/core/core.png";
 
     private static final String CORE_ASSET_URL = "/assets/core/core.png";
 
@@ -99,7 +99,7 @@
     public void add_classpath_script_link()
     {
         String path = "${root}/foo/bar.pdf";
-        String expanded = "org/apache/tapestry/foo/bar.pdf";
+        String expanded = "org/apache/tapestry5/foo/bar.pdf";
 
         DocumentLinker linker = mockDocumentLinker();
         Asset asset = mockAsset();

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
 import org.testng.annotations.Test;
 
 public class RequestEncodingInitializerImplTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -123,7 +123,8 @@
     @DataProvider(name = "xhr_inputs")
     public Object[][] xhr_inputs()
     {
-        return new Object[][]{{null, false}, {"", false}, {"some other value", false}, {"XMLHttpRequest", true}};
+        return new Object[][] { { null, false }, { "", false }, { "some other value", false },
+                { "XMLHttpRequest", true } };
     }
 
     @Test

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
 import org.testng.annotations.Test;
 
 public class RequestPageCacheImplTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Request;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -24,74 +24,74 @@
     @DataProvider(name = "uri_optimization")
     public Object[][] uri_optimization_data()
     {
-        return new Object[][]{{"/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png"},
+        return new Object[][] { { "/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png" },
 
-                {"/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif"},
+                { "/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif" },
 
-                {"/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css"},
+                { "/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css" },
 
-                {"", "/foo/bar.css", "/foo/baz.css", "baz.css"},
+                { "", "/foo/bar.css", "/foo/baz.css", "baz.css" },
 
-                {"/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif",
-                        "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif"},
+                { "/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif",
+                        "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif" },
 
-                {"", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop",
-                        "/gnip/gnop"},
+                { "", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop",
+                        "/gnip/gnop" },
 
-                {"", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif"},
+                { "", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif" },
 
-                {"", "/foo/bar/baz/bif", "/foo", "/foo"},
+                { "", "/foo/bar/baz/bif", "/foo", "/foo" },
 
-                {"/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo"},
+                { "/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo" },
 
-                {"/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif",
-                        "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo"},
+                { "/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif",
+                        "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo" },
 
                 // A couple of better examples, see TAPESTRY-2033
 
-                {"/manager", "", "/manager/asset/foo.gif", "asset/foo.gif"},
+                { "/manager", "", "/manager/asset/foo.gif", "asset/foo.gif" },
 
-                {"", "", "/asset/foo.gif", "asset/foo.gif"},
+                { "", "", "/asset/foo.gif", "asset/foo.gif" },
 
-                {"", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css"},
+                { "", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css" },
 
-                {"/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css"},
+                { "/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css" },
 
-                {"/example", "/newaccount", "/example/assets/tapestry/default.css",
-                        "assets/tapestry/default.css"},
+                { "/example", "/newaccount", "/example/assets/tapestry/default.css",
+                        "assets/tapestry/default.css" },
 
-                {"/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif",
-                        "../asset/foo.gif"},
+                { "/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif",
+                        "../asset/foo.gif" },
 
-                {"", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything",
-                        "/eventhandlerdemo.clear/anything"},
+                { "", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything",
+                        "/eventhandlerdemo.clear/anything" },
 
-                {"/verylongcontextname", "/eventhandlerdemo.barney/one",
+                { "/verylongcontextname", "/eventhandlerdemo.barney/one",
                         "/verylongcontextname/eventhandlerdemo.clear/anything",
-                        "../eventhandlerdemo.clear/anything"},
+                        "../eventhandlerdemo.clear/anything" },
 
-                {"/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo",
-                        "./page:sort/foo"},
+                { "/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo",
+                        "./page:sort/foo" },
 
-                {"", "/page", "/page:sort/foo", "/page:sort/foo"},
+                { "", "/page", "/page:sort/foo", "/page:sort/foo" },
 
                 // TAPESTRY-2046
 
-                {"/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js",
-                        "../assets/tapestry/tapestry.js"},
+                { "/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js",
+                        "../assets/tapestry/tapestry.js" },
 
                 // TAPESTRY-2095
 
-                {"", "/", "/component:event", "/component:event"},
-                
+                { "", "/", "/component:event", "/component:event" },
+
                 // TAPESTRY-2333
-                
-                {"", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2"},
+
+                { "", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2" },
 
                 // Make sure the ./ prefix is added even when the relative path doesn't contain
                 // a slash ... otherwise, invalid URL component:event (i.e., "component" protocol, not "http").
 
-                {"/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event"}
+                { "/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event" }
 
         };
     }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BaseURLSource;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BaseURLSource;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
 import org.testng.annotations.Test;
 
 import java.io.File;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
 import org.testng.annotations.Test;
 
 import java.io.*;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.Request;
 import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.Response;
 import static org.easymock.EasyMock.*;
 import org.testng.annotations.Test;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.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.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.Response;
 import org.testng.annotations.Test;
 
 public class ResponseRendererImplTest extends InternalBaseTestCase