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

[hl...@apache.org]

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

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

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java Tue May 20 11:51:35 2008
@@ -17,7 +17,7 @@
  * 
  * 
  */
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
 public class SimpleLayoutComponent
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java Tue May 20 11:51:35 2008
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.beaneditor.OrderAfter;
-import org.apache.tapestry.beaneditor.OrderBefore;
+import org.apache.tapestry5.beaneditor.OrderAfter;
+import org.apache.tapestry5.beaneditor.OrderBefore;
 
 public class StoogeBean
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.util.Holder;
+import org.apache.tapestry5.internal.util.Holder;
 
 public class StringHolder extends Holder<String>
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java Tue May 20 11:51:35 2008
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
 public class StringHolderBean extends GenericBean<StringHolder>
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java Tue May 20 11:51:35 2008
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.internal.parser.*;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.test.TapestryTestConstants;
+import org.apache.tapestry5.internal.parser.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.test.TapestryTestConstants;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -32,8 +32,7 @@
 import java.util.Set;
 
 /**
- * This is used to test the template parser ... and in some cases, the underlying behavior of the
- * SAX APIs.
+ * This is used to test the template parser ... and in some cases, the underlying behavior of the SAX APIs.
  */
 public class TemplateParserImplTest extends InternalBaseTestCase
 {
@@ -208,7 +207,7 @@
 
         TextToken t = get(tokens, 1);
 
-        // This is OK because the org.apache.tapestry.dom.Text will convert the characters back into
+        // This is OK because the org.apache.tapestry5.dom.Text will convert the characters back into
         // XML entities.
 
         assertEquals(t.getText().trim(), "lt:< gt:> amp:&");
@@ -611,28 +610,28 @@
     @DataProvider(name = "parse_failure_data")
     public Object[][] parse_failure_data()
     {
-        return new Object[][]{
+        return new Object[][] {
 
-                {"mixin_requires_id_or_type.tml",
-                 "You may not specify mixins for element <span> because it does not represent a component (which requires either an id attribute or a type attribute).",
-                 2},
+                { "mixin_requires_id_or_type.tml",
+                        "You may not specify mixins for element <span> because it does not represent a component (which requires either an id attribute or a type attribute).",
+                        2 },
 
-                {"illegal_nesting_within_body_element.tml", "Element 'xyz' is nested within a Tapestry body element",
-                 2},
+                { "illegal_nesting_within_body_element.tml", "Element 'xyz' is nested within a Tapestry body element",
+                        2 },
 
-                {"unexpected_attribute_in_parameter_element.tml",
-                 "Element <parameter> does not support an attribute named 'grok'. The only allowed attribute name is 'name'.",
-                 4},
+                { "unexpected_attribute_in_parameter_element.tml",
+                        "Element <parameter> does not support an attribute named 'grok'. The only allowed attribute name is 'name'.",
+                        4 },
 
-                {"name_attribute_of_parameter_element_omitted.tml",
-                 "The name attribute of the <parameter> element must be specified.", 4},
+                { "name_attribute_of_parameter_element_omitted.tml",
+                        "The name attribute of the <parameter> element must be specified.", 4 },
 
-                {"name_attribute_of_parameter_element_blank.tml",
-                 "The name attribute of the <parameter> element must be specified.", 4},
+                { "name_attribute_of_parameter_element_blank.tml",
+                        "The name attribute of the <parameter> element must be specified.", 4 },
 
-                {"unexpected_attribute_in_block_element.tml",
-                 "Element <block> does not support an attribute named 'name'. The only allowed attribute name is 'id'.",
-                 3},
+                { "unexpected_attribute_in_block_element.tml",
+                        "Element <block> does not support an attribute named 'name'. The only allowed attribute name is 'id'.",
+                        3 },
 
         };
     }
@@ -660,8 +659,8 @@
     @DataProvider(name = "doctype_parsed_correctly_data")
     public Object[][] doctype_parsed_correctly_data()
     {
-        return new Object[][]{{"xhtml1_strict_doctype.tml"}, {"xhtml1_transitional_doctype.tml"},
-                              {"xhtml1_frameset_doctype.tml"}};
+        return new Object[][] { { "xhtml1_strict_doctype.tml" }, { "xhtml1_transitional_doctype.tml" },
+                { "xhtml1_frameset_doctype.tml" } };
     }
 
     @Test(dataProvider = "doctype_parsed_correctly_data")
@@ -676,28 +675,28 @@
     @DataProvider(name = "doctype_token_added_correctly_data")
     public Object[][] doctype_token_added_correctly_data()
     {
-        return new Object[][]{
+        return new Object[][] {
 
-                {"xhtml1_strict_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Strict//EN",
-                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"},
+                { "xhtml1_strict_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Strict//EN",
+                        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" },
 
-                {"xhtml1_transitional_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Transitional//EN",
-                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"},
+                { "xhtml1_transitional_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Transitional//EN",
+                        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" },
 
-                {"xhtml1_frameset_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Frameset//EN",
-                 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"},
+                { "xhtml1_frameset_doctype.tml", "html", "-//W3C//DTD XHTML 1.0 Frameset//EN",
+                        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd" },
 
-                {"html4_strict_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01//EN",
-                 "http://www.w3.org/TR/html4/strict.dtd"},
+                { "html4_strict_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01//EN",
+                        "http://www.w3.org/TR/html4/strict.dtd" },
 
-                {"html4_transitional_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01 Transitional//EN",
-                 "http://www.w3.org/TR/html4/loose.dtd"},
+                { "html4_transitional_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01 Transitional//EN",
+                        "http://www.w3.org/TR/html4/loose.dtd" },
 
-                {"html4_frameset_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01 Frameset//EN",
-                 "http://www.w3.org/TR/html4/frameset.dtd"},
+                { "html4_frameset_doctype.tml", "HTML", "-//W3C//DTD HTML 4.01 Frameset//EN",
+                        "http://www.w3.org/TR/html4/frameset.dtd" },
 
-                {"system_doctype.xml", "foo", null,
-                 "src/test/resources/org/apache/tapestry/internal/services/simple.dtd"}};
+                { "system_doctype.xml", "foo", null,
+                        "src/test/resources/org/apache/tapestry5/internal/services/simple.dtd" } };
     }
 
     @Test(dataProvider = "doctype_token_added_correctly_data")

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java Tue May 20 11:51:35 2008
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.ValidationMessagesSource;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -35,8 +35,8 @@
     {
         Resource rootResource = new ClasspathResource("/");
         source = new ValidationMessagesSourceImpl(Arrays.asList(
-                "org/apache/tapestry/internal/ValidationMessages",
-                "org/apache/tapestry/internal/ValidationTestMessages"), rootResource);
+                "org/apache/tapestry5/internal/ValidationMessages",
+                "org/apache/tapestry5/internal/ValidationTestMessages"), rootResource);
     }
 
     @Test

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java Tue May 20 11:51:35 2008
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
 
-import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry5.annotations.Retain;
 
 /**
  * Used to test some issues related to visibility.

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java Tue May 20 11:51:35 2008
@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.structure;
+package org.apache.tapestry5.internal.structure;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.BlockNotFoundException;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.BlockNotFoundException;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
+import org.apache.tapestry5.runtime.Component;
 import org.easymock.EasyMock;
 import org.testng.annotations.Test;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.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.structure;
+package org.apache.tapestry5.internal.structure;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
 import org.testng.annotations.Test;
 
 public class InternalComponentResourcesImplTest extends InternalBaseTestCase

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.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.test;
+package org.apache.tapestry5.internal.test;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -31,11 +31,11 @@
     {
         return new Object[][]
                 {
-                        {"foo", "foo"},
-                        {" foo\n", "foo"},
-                        {"  foo \nbar\n\n  \tbaz", "foo bar baz"},
-                        {"{\n  bar();\n  baz();\n  if (gnip())\n  {\n    gnop();\n  }\n}\n",
-                         "{bar(); baz(); if (gnip()){gnop();}}"}};
+                        { "foo", "foo" },
+                        { " foo\n", "foo" },
+                        { "  foo \nbar\n\n  \tbaz", "foo bar baz" },
+                        { "{\n  bar();\n  baz();\n  if (gnip())\n  {\n    gnop();\n  }\n}\n",
+                                "{bar(); baz(); if (gnip()){gnop();}}" } };
     }
 
     @Test(enabled = false)
@@ -63,7 +63,7 @@
     {
         return new Object[][]
                 {
-                        {"{ foo(); }", "{\n  foo();\n}", true},
-                        {" foo();", "foo ();", false},};
+                        { "{ foo(); }", "{\n  foo();\n}", true },
+                        { " foo();", "foo ();", false }, };
     }
 }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java Tue May 20 11:51:35 2008
@@ -12,38 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.test;
+package org.apache.tapestry5.internal.test;
 
-import org.apache.tapestry.*;
-import org.apache.tapestry.internal.*;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.TemplateToken;
-import org.apache.tapestry.internal.services.*;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.structure.PageElement;
-import org.apache.tapestry.internal.structure.PageResources;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.internal.InternalRegistry;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.TapestryModule;
-import org.apache.tapestry.services.TranslatorSource;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.internal.*;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.internal.parser.TemplateToken;
+import org.apache.tapestry5.internal.services.*;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.structure.PageElement;
+import org.apache.tapestry5.internal.structure.PageResources;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.internal.InternalRegistry;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.TapestryModule;
+import org.apache.tapestry5.services.TranslatorSource;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.easymock.EasyMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.isA;
@@ -419,7 +419,7 @@
         if (validationMessages == null)
         {
             ResourceBundle bundle = ResourceBundle
-                    .getBundle("org.apache.tapestry.internal.ValidationMessages");
+                    .getBundle("org.apache.tapestry5.internal.ValidationMessages");
 
             validationMessages = new MessagesImpl(Locale.ENGLISH, bundle);
         }

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java Tue May 20 11:51:35 2008
@@ -12,27 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry5.internal.transform;
 
 import javassist.CtClass;
 import javassist.Loader;
 import javassist.LoaderClassPath;
 import javassist.NotFoundException;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.services.*;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.MaybeStateHolder;
-import org.apache.tapestry.internal.transform.pages.StateHolder;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.internal.services.PropertyAccessImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ApplicationStateManager;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.services.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.MaybeStateHolder;
+import org.apache.tapestry5.internal.transform.pages.StateHolder;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryClassPool;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.internal.services.PropertyAccessImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ApplicationStateManager;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterClass;

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry5.internal.transform;
 
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.services.TransformMethodSignature;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
+import org.apache.tapestry5.services.TransformMethodSignature;
+import org.apache.tapestry5.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
 /**

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.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.transform;
+package org.apache.tapestry5.internal.transform;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.TYPE;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java Tue May 20 11:51:35 2008
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry5.internal.transform;
 
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
+import org.apache.tapestry5.test.TapestryTestCase;
 import static org.easymock.EasyMock.contains;
 import static org.easymock.EasyMock.same;
 import org.testng.annotations.Test;

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java Tue May 20 11:51:35 2008
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry5.internal.transform;
 
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.TransformConstants;
 import org.testng.annotations.Test;
 
 public class MixinWorkerTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java Tue May 20 11:51:35 2008
@@ -12,35 +12,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.transform;
+package org.apache.tapestry5.internal.transform;
 
 import javassist.CtClass;
 import javassist.Loader;
 import javassist.LoaderClassPath;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.internal.services.InternalClassTransformation;
-import org.apache.tapestry.internal.services.InternalClassTransformationImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.components.DefaultParameterBindingMethodComponent;
-import org.apache.tapestry.internal.transform.components.DefaultParameterComponent;
-import org.apache.tapestry.internal.transform.components.ParameterComponent;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.internal.services.PropertyAccessImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.internal.services.InternalClassTransformation;
+import org.apache.tapestry5.internal.services.InternalClassTransformationImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.components.DefaultParameterBindingMethodComponent;
+import org.apache.tapestry5.internal.transform.components.DefaultParameterComponent;
+import org.apache.tapestry5.internal.transform.components.ParameterComponent;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryClassPool;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.internal.services.PropertyAccessImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingSource;
 import org.slf4j.Logger;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 /**
- * There's no point in trying to unit test the code generated by {@link org.apache.tapestry.internal.transform.ParameterWorker}.
+ * There's no point in trying to unit test the code generated by {@link org.apache.tapestry5.internal.transform.ParameterWorker}.
  * Instead, we excercize ParameterWorker, and test that the generated code works correctly in a number of scenarios.
  */
 public class ParameterWorkerTest extends InternalBaseTestCase

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.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.transform;
+package org.apache.tapestry5.internal.transform;
 
 import javassist.ClassPool;
 import javassist.Loader;
@@ -30,7 +30,7 @@
         int lastdotx = className.lastIndexOf('.');
         String packageName = className.substring(0, lastdotx);
 
-        if (packageName.startsWith("org.apache.tapestry.internal.transform.")) return super.findClass(className);
+        if (packageName.startsWith("org.apache.tapestry5.internal.transform.")) return super.findClass(className);
 
         // Returning null forces delegation to the parent class loader.
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.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.transform;
+package org.apache.tapestry5.internal.transform;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
-import static org.apache.tapestry.services.TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import static org.apache.tapestry5.services.TransformConstants.CONTAINING_PAGE_DID_DETACH_SIGNATURE;
+import static org.apache.tapestry5.services.TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Modifier;

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

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

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

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.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.transform.pages;
+package org.apache.tapestry5.internal.transform.pages;
 
-import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry5.annotations.Retain;
 
 /**
  * Used to test retained vs. discard properties.