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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.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.app2.services;
+package org.apache.tapestry5.integration.app2.services;
 
-import org.apache.tapestry.integration.app2.FortyTwo;
-import org.apache.tapestry.integration.app2.PlusOne;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.integration.app2.FortyTwo;
+import org.apache.tapestry5.integration.app2.PlusOne;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformMethodSignature;
 
 public class LocaleAppModule
 {

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

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

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

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.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.app4.services;
+package org.apache.tapestry5.integration.app4.services;
 
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.MappedConfiguration;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.MappedConfiguration;
 
 /**
  * A module that exists for testing the immediate response mode: sending markup in response to action requests, rather

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void submit_aso()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForASO");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -28,7 +28,7 @@
     @Test
     public void click_link()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForActionLink");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void submit_context_asset()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName, "src/test/app2");
         Document doc = tester.renderPage("TestPageForAsset");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -33,16 +33,16 @@
     {
         return new Object[][]
                 {
-                        {"DTDFromPage", FRAMESET, "slagheap",},
-                        {"DTDFromComponent", TRANSITIONAL, "flubber",},
-                        {"MultipleDTD", STRICT, "blubber",},
-                        {"NoDTD", "", "no_dtd_loser",}};
+                        { "DTDFromPage", FRAMESET, "slagheap", },
+                        { "DTDFromComponent", TRANSITIONAL, "flubber", },
+                        { "MultipleDTD", STRICT, "blubber", },
+                        { "NoDTD", "", "no_dtd_loser", } };
     }
 
     @Test(dataProvider = "dtd_page_provider")
     public void verify_correct_dtds(String pageName, String expectedDTD, String checkText)
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         PageTester tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage(pageName);

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
     @Test
     public void submit_form()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForForm");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void display()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForHead");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void render()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForIf");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -63,7 +63,7 @@
     @BeforeMethod
     public void before()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         // LocaleAppModule.java has configured support for a certain locales.
         String appName = "LocaleApp";
         tester = new PageTester(appPackage, appName);

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void render()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForLoop");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.integration.app2.services.LocaleAppModule;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.integration.app2.services.LocaleAppModule;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -28,7 +28,7 @@
     public void prefix_method() throws Exception
     {
         // REFACTOR this happens in a bunch of places
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName, PageTester.DEFAULT_CONTEXT_PATH, LocaleAppModule.class);
         Document doc = tester.renderPage("TestPrefixMethod");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -68,7 +68,7 @@
     @BeforeMethod
     public void before()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         doc = tester.renderPage("TestPageForSubmit");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void template_in_web_context()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName, "src/test/app2");
         Document doc = tester.renderPage("TestPageForTemplateInContext");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.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.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
     @Test
     public void render()
     {
-        String appPackage = "org.apache.tapestry.integration.app2";
+        String appPackage = "org.apache.tapestry5.integration.app2";
         String appName = "";
         tester = new PageTester(appPackage, appName);
         Document doc = tester.renderPage("TestPageForUnless");

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.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;
+package org.apache.tapestry5.internal;
 
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.ClassFactory;
 
 /**
- * Used as test when setting the order of properties via {@link TapestryInternalUtils#orderProperties(org.apache.tapestry.ioc.services.ClassPropertyAdapter,
+ * Used as test when setting the order of properties via {@link TapestryInternalUtils#orderProperties(org.apache.tapestry5.ioc.services.ClassPropertyAdapter,
  * ClassFactory, java.util.List)}.
  */
 public class DataBean

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

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

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

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.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;
+package org.apache.tapestry5.internal;
 
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.util.Transformer;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.util.Transformer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -26,7 +26,7 @@
     @Test
     public void testLoadAppModule()
     {
-        Registry registry = new TapestryAppInitializer("org.apache.tapestry.integration.app0",
+        Registry registry = new TapestryAppInitializer("org.apache.tapestry5.integration.app0",
                                                        "foo", "").getRegistry();
 
         Transformer<String> s1 = registry.getService("Service1", Transformer.class);

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java Tue May 20 11:51:35 2008
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.ComponentResourcesAware;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.ComponentResourcesAware;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.Event;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentEvent;
+import org.apache.tapestry5.runtime.Event;
 
 /**
  * For use in places where we don't want to have to transform a class just for testing purposes.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java Tue May 20 11:51:35 2008
@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.BeforeRenderBody;
-import org.apache.tapestry.beaneditor.OrderAfter;
-import org.apache.tapestry.beaneditor.OrderBefore;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.IntegerRange;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.BeforeRenderBody;
+import org.apache.tapestry5.beaneditor.OrderAfter;
+import org.apache.tapestry5.beaneditor.OrderBefore;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.IntegerRange;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingFactory;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
@@ -265,7 +265,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Expression stringHolderMethod().stringValue() for class org.apache.tapestry.internal.bindings.TargetBean is read-only.");
+                    "Expression stringHolderMethod().stringValue() for class org.apache.tapestry5.internal.bindings.TargetBean is read-only.");
             assertSame(ex.getLocation(), l);
         }
 
@@ -293,7 +293,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "No public method \'isThatRealBlood()\' in class org.apache.tapestry.internal.bindings.TargetBean (within property expression \'isThatRealBlood().value\').");
+                    "No public method \'isThatRealBlood()\' in class org.apache.tapestry5.internal.bindings.TargetBean (within property expression \'isThatRealBlood().value\').");
         }
 
         verify();
@@ -324,7 +324,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "No public method \'isThatRealBlood()\' in class org.apache.tapestry.internal.bindings.StringHolder (within property expression \'stringHolder.isThatRealBlood()\').");
+                    "No public method \'isThatRealBlood()\' in class org.apache.tapestry5.internal.bindings.StringHolder (within property expression \'stringHolder.isThatRealBlood()\').");
         }
 
         verify();
@@ -350,7 +350,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Method \'voidMethod()\' returns void (in class org.apache.tapestry.internal.bindings.TargetBean, within property expression \'voidMethod().value\').");
+                    "Method \'voidMethod()\' returns void (in class org.apache.tapestry5.internal.bindings.TargetBean, within property expression \'voidMethod().value\').");
         }
 
         verify();
@@ -376,7 +376,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Method \'voidMethod()\' returns void (in class org.apache.tapestry.internal.bindings.StringHolder, within property expression \'stringHolder.voidMethod()\').");
+                    "Method \'voidMethod()\' returns void (in class org.apache.tapestry5.internal.bindings.StringHolder, within property expression \'stringHolder.voidMethod()\').");
         }
 
         verify();
@@ -404,7 +404,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Class org.apache.tapestry.internal.bindings.StringHolder does not contain a property named \'missingProperty\' "
+                    "Class org.apache.tapestry5.internal.bindings.StringHolder does not contain a property named \'missingProperty\' "
                             + "(within property expression \'stringHolder.missingProperty.terminalProperty\').  Available properties: value.");
             assertSame(ex.getLocation(), l);
         }
@@ -434,7 +434,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Property \'writeOnly\' of class org.apache.tapestry.internal.bindings.TargetBean (within property expression \'writeOnly.terminalProperty\') is not readable (it has no read accessor method).");
+                    "Property \'writeOnly\' of class org.apache.tapestry5.internal.bindings.TargetBean (within property expression \'writeOnly.terminalProperty\') is not readable (it has no read accessor method).");
             assertSame(ex.getLocation(), l);
         }
 
@@ -488,7 +488,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Expression readOnly for class org.apache.tapestry.internal.bindings.TargetBean is read-only.");
+                    "Expression readOnly for class org.apache.tapestry5.internal.bindings.TargetBean is read-only.");
             assertEquals(ex.getLocation(), l);
         }
 
@@ -519,7 +519,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Expression writeOnly for class org.apache.tapestry.internal.bindings.TargetBean is write-only.");
+                    "Expression writeOnly for class org.apache.tapestry5.internal.bindings.TargetBean is write-only.");
             assertEquals(ex.getLocation(), l);
         }
 
@@ -546,7 +546,7 @@
         {
             assertEquals(
                     ex.getMessage(),
-                    "Class org.apache.tapestry.internal.bindings.TargetBean does not contain a property named \'missingProperty\' "
+                    "Class org.apache.tapestry5.internal.bindings.TargetBean does not contain a property named \'missingProperty\' "
                             + "(within property expression \'missingProperty\').  "
                             + "Available properties: class, componentResources, intValue, objectValue, readOnly, stringHolder, writeOnly.");
             assertSame(ex.getLocation(), l);

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.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.grid;
+package org.apache.tapestry5.internal.grid;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.grid.ColumnSort;
-import org.apache.tapestry.grid.SortConstraint;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.grid.ColumnSort;
+import org.apache.tapestry5.grid.SortConstraint;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.BeanModelSource;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;