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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.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.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
 
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
 
 import java.io.Serializable;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.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.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
 
-import org.apache.tapestry.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.NonVisual;
 
 /**
  * One track from a music library.

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.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.integration.app1.mixins;
+package org.apache.tapestry5.integration.app1.mixins;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.BeginRender;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.BeginRender;
+import org.apache.tapestry5.annotations.Parameter;
 
 /**
  * Mixin that adds emphasis to a component if a test is true.

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 public class ActionViaLinkDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
 
 import java.util.List;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 
 import java.util.Collections;
 import java.util.List;

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app1.data.BirthdayReminder;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app1.data.BirthdayReminder;
 
 public class BeanEditDateDemo
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
 
 public class BeanEditorDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.BeanEditor;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.BeanEditor;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
 
 public class BeanEditorOverride
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.InjectPage;
 
 /**
  * Part of testing for TAPESTRY-2044

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 
 import java.util.Map;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 public class BlockHolder
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java Tue May 20 11:51:35 2008
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
 
 public class BooleanDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java Tue May 20 11:51:35 2008
@@ -1,6 +1,6 @@
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Cached;
+import org.apache.tapestry5.annotations.Cached;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java Tue May 20 11:51:35 2008
@@ -12,13 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-public class CachedPage2 extends CachedPage {
+public class CachedPage2 extends CachedPage
+{
+
+    @Override
+    public int getValue()
+    {
+        return super.getValue() + 1;
+    }
 
-	@Override
-	public int getValue() {
-		return super.getValue()+1;
-	}
-	
 }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Cached;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Zone;
+import org.apache.tapestry5.annotations.Cached;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Zone;
 
 public class CleanCacheDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Request;
 
 public class ClientPersistenceDemo
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.integration.app1.components.Count;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.integration.app1.components.Count;
 
 public class Countdown
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.beaneditor.Validate;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
 /**
  * This isn't a page class and doesn't belong here.

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java Tue May 20 11:51:35 2008
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 import java.util.List;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.internal.services.StringValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.internal.services.StringValueEncoder;
 
 import java.util.Date;
 import java.util.List;

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.integration.app1.base.BaseEventHandlerDemo;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.integration.app1.base.BaseEventHandlerDemo;
 
 public class EventHandlerDemo extends BaseEventHandlerDemo
 {

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Meta;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.base.BaseComponent;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.base.BaseComponent;
 
 @Meta("tapestry.persistence-strategy=flash")
 public class FlashDemo extends BaseComponent

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.SubscribeData;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.SubscribeData;
 
 public class FormFragmentDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.SubscribeData;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.SubscribeData;
 
 public class FormFragmentOutput
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.Block;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.components.FormInjector;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.FormInjector;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 public class FormInjectorDemo
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 import java.util.List;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 /**
  * Used to demonstrate the built-in support for enum types.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
 import java.util.List;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 
 import java.util.Set;
 

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.corelib.components.Form;
 
 public class InjectComponentDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.corelib.components.Form;
 
 public class InjectComponentMismatch
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.Field;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
 
 public class InjectContainerMismatch
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.integration.app1.services.French;
-import org.apache.tapestry.integration.app1.services.Greeter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.integration.app1.services.French;
+import org.apache.tapestry5.integration.app1.services.Greeter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.Request;
 
 public class InjectDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
 import java.util.Date;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.integration.app1.components.Output;
-import org.apache.tapestry.integration.app1.mixins.Emphasis;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.integration.app1.components.Output;
+import org.apache.tapestry5.integration.app1.mixins.Emphasis;
 
 import java.sql.Date;
 import java.text.DateFormat;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.integration.app1.WrongPackageForBaseClass;
+import org.apache.tapestry5.integration.app1.WrongPackageForBaseClass;
 
 /**
  * TAPESTRY-1934: Check for invalid base classes.

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java Tue May 20 11:51:35 2008
@@ -11,9 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// package org.apache.tapestry.integration.app1.pages;
+// package org.apache.tapestry5.integration.app1.pages;
 
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
 public class LeanGridDemo extends GridDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
 import java.util.List;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.PersistentLocale;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PersistentLocale;
+import org.apache.tapestry5.services.Request;
 
 import java.util.Locale;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.integration.app1.services.DearGodWhyMeException;
-import org.apache.tapestry.integration.app1.services.ReverseStrings;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.integration.app1.services.DearGodWhyMeException;
+import org.apache.tapestry5.integration.app1.services.ReverseStrings;
 
 public class MethodAdviceDemo
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.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.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
 
 /**
  * A page that simple doesn't have a template.