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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java Tue May 20 11:51:35 2008
@@ -12,24 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.model;
+package org.apache.tapestry5.internal.model;
 
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.model.MutableEmbeddedComponentModel;
-import org.apache.tapestry.model.ParameterModel;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;
 
 /**
- * Tests {@link org.apache.tapestry.internal.model.MutableComponentModelImpl} and {@link
- * org.apache.tapestry.internal.model.MutableEmbeddedComponentModelImpl}.
+ * Tests {@link org.apache.tapestry5.internal.model.MutableComponentModelImpl} and {@link
+ * org.apache.tapestry5.internal.model.MutableEmbeddedComponentModelImpl}.
  */
 public class MutableComponentModelImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.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.internal.structure.ComponentPageElement;
-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.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+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.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
 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/AliasImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.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.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.Alias;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.Alias;
+import org.apache.tapestry5.services.AliasManager;
 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/AliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.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.AliasContribution;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.AliasContribution;
+import org.apache.tapestry5.services.AliasManager;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;
 
@@ -35,8 +35,8 @@
         replay();
 
         AliasContribution[] contributions =
-                {AliasContribution.create(String.class, "FRED"),
-                 AliasContribution.create(Runnable.class, r)};
+                { AliasContribution.create(String.class, "FRED"),
+                        AliasContribution.create(Runnable.class, r) };
         Collection<AliasContribution> configuration = Arrays.asList(contributions);
 
         AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -62,9 +62,9 @@
         replay();
 
         AliasContribution[] contributions =
-                {AliasContribution.create(String.class, "FRED"),
-                 AliasContribution.create(String.class, "FRED-CONFLICT"),
-                 AliasContribution.create(Runnable.class, r)};
+                { AliasContribution.create(String.class, "FRED"),
+                        AliasContribution.create(String.class, "FRED-CONFLICT"),
+                        AliasContribution.create(Runnable.class, r) };
         Collection<AliasContribution> configuration = Arrays.asList(contributions);
 
         AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -87,9 +87,9 @@
         replay();
 
         AliasContribution[] contributions =
-                {AliasContribution.create(String.class, "FRED"),
-                 AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
-                 AliasContribution.create(Runnable.class, r)};
+                { AliasContribution.create(String.class, "FRED"),
+                        AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+                        AliasContribution.create(Runnable.class, r) };
         Collection<AliasContribution> configuration = Arrays.asList(contributions);
 
         AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -112,9 +112,9 @@
         replay();
 
         AliasContribution[] contributions =
-                {AliasContribution.create(String.class, "FRED"),
-                 AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
-                 AliasContribution.create(Runnable.class, r)};
+                { AliasContribution.create(String.class, "FRED"),
+                        AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+                        AliasContribution.create(Runnable.class, r) };
         Collection<AliasContribution> configuration = Arrays.asList(contributions);
 
         AliasManager manager = new AliasManagerImpl(logger, configuration);

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.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.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.ReadOnlyBean;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.ReadOnlyBean;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.ioc.ObjectLocator;
+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/ApplicationStatePersistenceStrategySourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.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 static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategySource;
 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/AssetDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.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.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Dispatcher;
-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.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Dispatcher;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
 import static org.easymock.EasyMock.contains;
 import static org.easymock.EasyMock.eq;
 import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
 {
     private static final String SMILEY_CLIENT_URL = "/assets/app1/pages/smiley.png";
 
-    private static final String SMILEY_PATH = "org/apache/tapestry/integration/app1/pages/smiley.png";
+    private static final String SMILEY_PATH = "org/apache/tapestry5/integration/app1/pages/smiley.png";
 
     private static final Resource SMILEY = new ClasspathResource(SMILEY_PATH);
 
@@ -89,7 +89,7 @@
         ResourceStreamer streamer = mockResourceStreamer();
 
         String clientURL = "/assets/app1/pages/smiley_png";
-        String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley_png";
+        String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley_png";
 
         train_getPath(request, clientURL);
 
@@ -118,7 +118,7 @@
         ResourceStreamer streamer = mockResourceStreamer();
 
         String clientURL = "/assets/app1/pages/smiley.WRONG.png";
-        String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley.WRONG.png";
+        String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley.WRONG.png";
 
         train_getPath(request, clientURL);
 
@@ -149,7 +149,7 @@
         ResourceStreamer streamer = mockResourceStreamer();
 
         String clientURL = RequestConstants.ASSET_PATH_PREFIX + "app1/pages/smiley.RIGHT.png";
-        String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley.RIGHT.png";
+        String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley.RIGHT.png";
 
         train_getPath(request, clientURL);
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.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.annotation.Path;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
 import org.testng.annotations.Test;
 
 public class AssetInjectionProviderTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.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.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.AssetSource;
 import org.testng.annotations.Test;
 
 public class AssetObjectProviderTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.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.Asset;
-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.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+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.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.AssetSource;
 import org.testng.annotations.Test;
 
 import java.util.Collections;
@@ -30,7 +30,7 @@
 public class AssetSourceImplTest extends InternalBaseTestCase
 {
     private final Resource baseResource = new ClasspathResource(
-            "org/apache/tapestry/internal/services/SimpleComponent.class");
+            "org/apache/tapestry5/internal/services/SimpleComponent.class");
 
     private final Resource rootResource = new ClasspathResource("/");
 
@@ -86,7 +86,7 @@
         // First try creates it:
 
         assertSame(source.getClasspathAsset(
-                "org/apache/tapestry/internal/services/SimpleComponent.properties",
+                "org/apache/tapestry5/internal/services/SimpleComponent.properties",
                 Locale.UK), asset);
 
         verify();
@@ -116,7 +116,7 @@
 
         assertSame(
                 source
-                        .getClasspathAsset("org/apache/tapestry/internal/services/SimpleComponent.properties"),
+                        .getClasspathAsset("org/apache/tapestry5/internal/services/SimpleComponent.properties"),
                 asset);
 
         verify();
@@ -130,7 +130,7 @@
         Asset asset = mockAsset();
 
         Resource expectedResource = rootResource
-                .forFile("org/apache/tapestry/internal/services/SimpleComponent_en_GB.properties");
+                .forFile("org/apache/tapestry5/internal/services/SimpleComponent_en_GB.properties");
 
         train_getRootResource(factory, rootResource);
 
@@ -144,14 +144,14 @@
 
         assertSame(source.getAsset(
                 baseResource,
-                "classpath:org/apache/tapestry/internal/services/SimpleComponent.properties",
+                "classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties",
                 Locale.UK), asset);
 
         // Check that a leading slash is not a problem:
 
         assertSame(source.getAsset(
                 baseResource,
-                "classpath:/org/apache/tapestry/internal/services/SimpleComponent.properties",
+                "classpath:/org/apache/tapestry5/internal/services/SimpleComponent.properties",
                 Locale.UK), asset);
 
         verify();
@@ -172,7 +172,7 @@
         {
             source.getAsset(
                     baseResource,
-                    "classpath:org/apache/tapestry/internal/services/SimpleComponent.properties",
+                    "classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties",
                     Locale.UK);
             unreachable();
         }
@@ -180,7 +180,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Unknown prefix for asset path 'classpath:org/apache/tapestry/internal/services/SimpleComponent.properties'.");
+                    "Unknown prefix for asset path 'classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties'.");
         }
 
         verify();
@@ -206,7 +206,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Unable to locate asset 'classpath:org/apache/tapestry/internal/services/DoesNotExist.properties' (the file does not exist).");
+                    "Unable to locate asset 'classpath:org/apache/tapestry5/internal/services/DoesNotExist.properties' (the file does not exist).");
         }
 
         verify();

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.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.Block;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.BeanBlockContribution;
-import org.apache.tapestry.services.BeanBlockOverrideSource;
-import org.apache.tapestry.services.BeanBlockSource;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockOverrideSource;
+import org.apache.tapestry5.services.BeanBlockSource;
 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/BeanModelSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.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.PropertyConduit;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.beaneditor.RelativePosition;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.ReadOnlyBean;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.beaneditor.RelativePosition;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.ReadOnlyBean;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.BeanModelSource;
 import org.easymock.EasyMock;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -66,7 +66,7 @@
         assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
 
         assertEquals(model.toString(),
-                     "BeanModel[org.apache.tapestry.internal.services.SimpleBean properties:firstName, lastName, age]");
+                     "BeanModel[org.apache.tapestry5.internal.services.SimpleBean properties:firstName, lastName, age]");
 
         PropertyModel age = model.get("age");
 
@@ -314,7 +314,7 @@
         catch (RuntimeException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Bean editor model for org.apache.tapestry.internal.services.SimpleBean already contains a property model for property \'age\'.");
+                         "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean already contains a property model for property \'age\'.");
         }
 
         verify();
@@ -341,7 +341,7 @@
         catch (RuntimeException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Bean editor model for org.apache.tapestry.internal.services.SimpleBean does not contain a property named \'frobozz\'.  " + "Available properties: age, firstName, lastName.");
+                         "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean does not contain a property named \'frobozz\'.  " + "Available properties: age, firstName, lastName.");
         }
 
         verify();
@@ -370,7 +370,7 @@
         catch (RuntimeException ex)
         {
             assertEquals(ex.getMessage(),
-                         "Bean editor model for org.apache.tapestry.internal.services.SimpleBean does not contain a property with id \'frobozz\'.  "
+                         "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean does not contain a property with id \'frobozz\'.  "
                                  + "Available property ids: age, firstName, lastName, shrubfoo.");
         }
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.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.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.BindingSource;
 import org.testng.annotations.Test;
 
 import java.util.Map;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.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.Block;
-import org.apache.tapestry.annotation.Id;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Id;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
+import org.apache.tapestry5.services.TransformConstants;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 public class BlockInjectionProviderTest extends TapestryTestCase

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.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 static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Request;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -30,8 +30,8 @@
     {
         Map<String, String> configuration = newMap();
 
-        configuration.put("tapestry/", "org/apache/tapestry/");
-        configuration.put("tapestry-internal/", "org/apache/tapestry/internal/");
+        configuration.put("tapestry/", "org/apache/tapestry5/");
+        configuration.put("tapestry-internal/", "org/apache/tapestry5/internal/");
         configuration.put("mylib/", "com/example/mylib/");
 
         return configuration;
@@ -65,8 +65,8 @@
         return new Object[][] { { "foo/bar/Baz.txt", "foo/bar/Baz.txt" },
                 { "com/example/mylib/Foo.bar", "mylib/Foo.bar" },
                 { "com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar" },
-                { "org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar" },
-                { "org/apache/tapestry/Foo.bar", "tapestry/Foo.bar" }, };
+                { "org/apache/tapestry5/internal/Foo.bar", "tapestry-internal/Foo.bar" },
+                { "org/apache/tapestry5/Foo.bar", "tapestry/Foo.bar" }, };
     }
 
     @Test(dataProvider = "to_resource_path_data")

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.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.Link;
-import org.apache.tapestry.internal.util.Holder;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.util.Holder;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.test.TapestryTestCase;
 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/ComponentClassResolverImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.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.services.ClassNameLocator;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.LibraryMapping;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.LibraryMapping;
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.isA;
 import org.slf4j.Logger;
@@ -34,7 +34,7 @@
 
     private static final String CORE_PREFIX = "core";
 
-    private static final String CORE_ROOT_PACKAGE = "org.apache.tapestry.corelib";
+    private static final String CORE_ROOT_PACKAGE = "org.apache.tapestry5.corelib";
 
     private static final String LIB_PREFIX = "lib";
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.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.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.TranslatorSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.TranslatorSource;
 import org.testng.annotations.Test;
 
 public class ComponentDefaultProviderImplTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.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.EventConstants;
-import org.apache.tapestry.internal.EmptyEventContext;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.EmptyEventContext;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.*;
 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/ComponentEventImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.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.ComponentEventCallback;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.structure.PageResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.ComponentEvent;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.structure.PageResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.ComponentEvent;
 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/ComponentInstanceResultProcessorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.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.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+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.ComponentEventResultProcessor;
 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/ComponentInstantiatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.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 javassist.*;
-import org.apache.tapestry.internal.*;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.BasicComponent;
-import org.apache.tapestry.internal.transform.pages.BasicSubComponent;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.TapestryModule;
+import org.apache.tapestry5.internal.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.BasicComponent;
+import org.apache.tapestry5.internal.transform.pages.BasicSubComponent;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.RegistryBuilder;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.TapestryModule;
 import org.slf4j.Logger;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -40,14 +40,14 @@
 import java.util.UUID;
 
 /**
- * Tests for {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImpl}. Several of these tests are
+ * Tests for {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImpl}. Several of these tests are
  * more of the form of integration tests that instantiate the Tapestry IoC Registry.
  */
 public class ComponentInstantiatorSourceImplTest extends InternalBaseTestCase
 {
     private static final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
 
-    private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry.internal.transform.pages.SynthComponent";
+    private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry5.internal.transform.pages.SynthComponent";
 
     private File extraClasspath;
 
@@ -279,7 +279,7 @@
         source = registry.getService(ComponentInstantiatorSource.class);
         access = registry.getService(PropertyAccess.class);
 
-        source.addPackage("org.apache.tapestry.internal.transform.pages");
+        source.addPackage("org.apache.tapestry5.internal.transform.pages");
     }
 
     @AfterClass

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.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;
@@ -32,7 +32,7 @@
     public void context()
     {
         ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
-                                                                     new String[]{"x", "123"}, null);
+                                                                     new String[] { "x", "123" }, null);
         assertEquals(invocation.buildURI(false), "abc/x/123");
         assertEquals(invocation.buildURI(true), "abc/x/123");
     }
@@ -41,7 +41,7 @@
     public void parameters()
     {
         ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
-                                                                     new String[]{"x", "123"}, null);
+                                                                     new String[] { "x", "123" }, null);
         invocation.addParameter("p1", "foo");
         invocation.addParameter("p2", "bar");
         assertEquals(invocation.buildURI(false), "abc/x/123?p1=foo&p2=bar");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.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.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.model.ComponentModel;
 import org.apache.tapestry5.services.ComponentMessagesSource;
 import org.testng.annotations.Test;
 
@@ -34,12 +34,12 @@
 {
     // With control of the tracker, we can force changes as if underlying files were changed.
 
-    private static final String SIMPLE_COMPONENT_CLASS_NAME = "org.apache.tapestry.internal.services.SimpleComponent";
+    private static final String SIMPLE_COMPONENT_CLASS_NAME = "org.apache.tapestry5.internal.services.SimpleComponent";
 
     private final URLChangeTracker tracker = new URLChangeTracker();
 
     private final Resource simpleComponentResource = new ClasspathResource(
-            "org/apache/tapestry/internal/services/SimpleComponent.class");
+            "org/apache/tapestry5/internal/services/SimpleComponent.class");
 
     private final ComponentMessagesSourceImpl source = new ComponentMessagesSourceImpl(
             simpleComponentResource, "AppCatalog.properties", tracker);
@@ -144,10 +144,10 @@
 
         train_getComponentClassName(
                 model,
-                "org.apache.tapestry.internal.services.SubclassComponent");
+                "org.apache.tapestry5.internal.services.SubclassComponent");
 
         train_getBaseResource(model, new ClasspathResource(
-                "org/apache/tapestry/internal/services/SubclassComponent.class"));
+                "org/apache/tapestry5/internal/services/SubclassComponent.class"));
 
         train_getParentModel(model, parent);
 
@@ -188,10 +188,10 @@
 
         train_getComponentClassName(
                 model,
-                "org.apache.tapestry.internal.services.SubclassComponent");
+                "org.apache.tapestry5.internal.services.SubclassComponent");
 
         train_getBaseResource(model, new ClasspathResource(
-                "org/apache/tapestry/internal/services/SubclassComponent.class"));
+                "org/apache/tapestry5/internal/services/SubclassComponent.class"));
 
         train_getParentModel(model, parent);
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.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.internal.InternalConstants;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-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.model.ComponentModel;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+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.model.ComponentModel;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -32,9 +32,9 @@
 
 public class ComponentTemplateSourceImplTest extends InternalBaseTestCase
 {
-    private static final String PACKAGE = "org.apache.tapestry.internal.pageload";
+    private static final String PACKAGE = "org.apache.tapestry5.internal.pageload";
 
-    static public final String PATH = "org/apache/tapestry/internal/pageload";
+    static public final String PATH = "org/apache/tapestry5/internal/pageload";
 
     private final ClassLoader loader = Thread.currentThread().getContextClassLoader();
 

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.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.TestableRequestImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.internal.test.TestableRequestImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * Tests for {@link org.apache.tapestry.services.impl.CookiesImpl}.
+ * Tests for {@link org.apache.tapestry5.services.impl.CookiesImpl}.
  */
 @Test
 public class CookiesImplTest extends Assert
@@ -99,12 +99,12 @@
 
     public void test_Match()
     {
-        attempt("fred", "flintstone", new String[]{"barney", "rubble", "fred", "flintstone"});
+        attempt("fred", "flintstone", new String[] { "barney", "rubble", "fred", "flintstone" });
     }
 
     public void test_No_Match()
     {
-        attempt("foo", null, new String[]{"bar", "baz"});
+        attempt("foo", null, new String[] { "bar", "baz" });
     }
 
     public void test_Write_Cookie_Domain()
@@ -167,4 +167,4 @@
         assertEquals(cookies.size(), 1);
         assertEquals(cookies.get(0), expectedCookie);
     }
-}
\ No newline at end of file
+}

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.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.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.Request;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.isA;
 import org.testng.annotations.Test;

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.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.Location;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -128,7 +128,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "No object of type java.util.List is available from the Environment.  Available types are org.apache.tapestry.ioc.Location, org.apache.tapestry.runtime.Component.");
+                    "No object of type java.util.List is available from the Environment.  Available types are org.apache.tapestry5.ioc.Location, org.apache.tapestry5.runtime.Component.");
         }
 
         verify();

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