svn commit: r658390 [6/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/j...

[hl...@apache.org]

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.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.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
 
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.beaneditor.RelativePosition;
-import org.apache.tapestry.internal.services.CoercingPropertyConduitWrapper;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.beaneditor.RelativePosition;
+import org.apache.tapestry5.internal.services.CoercingPropertyConduitWrapper;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.PropertyConduitSource;
 
 import java.util.List;
 import java.util.Map;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.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.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
 
-import org.apache.tapestry.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.BeanModel;
 
 /**
  * Utilities used in a few places to modify an existing {@link BeanModel}.
@@ -23,7 +23,7 @@
 {
 
     /**
-     * Performs standard set of modifications to a {@link org.apache.tapestry.beaneditor.BeanModel}. First new
+     * Performs standard set of modifications to a {@link org.apache.tapestry5.beaneditor.BeanModel}. First new
      * properties may be added, then properties removed, then properties reordered.
      *
      * @param model                to modifiy
@@ -47,7 +47,7 @@
 
     /**
      * Adds empty properties to the bean model.  New properties are added with a <em>null</em> {@link
-     * org.apache.tapestry.PropertyConduit}.
+     * org.apache.tapestry5.PropertyConduit}.
      *
      * @param model         to be modified
      * @param propertyNames comma-separated list of property names

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.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.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
 
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
 
 import java.util.Arrays;
 import java.util.List;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.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.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
 
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
 
 import java.lang.annotation.Annotation;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.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.Validate;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
 
 import java.util.Arrays;
 import java.util.List;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ioc.BaseLocatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
 
 import java.lang.annotation.Annotation;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.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.Asset;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.BindingFactory;
 
 /**
  * Binding factory where the expression is a reference to an asset.
@@ -58,7 +58,7 @@
          * Asset bindings are invariant only if full URIs are being used.  This is complicated ... basically, if the
          * Asset is invariant, then any value coerced from the Asset is also invariant (such as a String version of an
          * Asset's path).  Thus, the invariant String gets cached inside component parameter fields.  However, when the
-         * path is dynamic (i.e., because of {@link org.apache.tapestry.internal.services.RequestPathOptimizer}), we
+         * path is dynamic (i.e., because of {@link org.apache.tapestry5.internal.services.RequestPathOptimizer}), we
          * need to ensure that the Assets aren't cached.
          *
          * @return true if full URIs are enabled, false otherwise

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
 
 final class BindingsMessages
 {

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
 
 /**
  * Accesses a named block from the container. The block must exist.

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
 
 /**
  * The "component:" binding prefix, which allows access to a child component via its id.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.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.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
- * Binding type for literal, immutable values. Literal bindings are {@linkplain org.apache.tapestry.Binding#isInvariant()
- * invariant}; any value provided by a LiteralBinding, even if {@linkplain org.apache.tapestry.ioc.services.TypeCoercer#coerce(Object,
+ * Binding type for literal, immutable values. Literal bindings are {@linkplain org.apache.tapestry5.Binding#isInvariant()
+ * invariant}; any value provided by a LiteralBinding, even if {@linkplain org.apache.tapestry5.ioc.services.TypeCoercer#coerce(Object,
  * Class) coerced}, will be cached aggresively by Tapestry cmponent.
  * <p/>
  * <p>LiteralBindings are often used for literal string values supplied in-line in the component template, but is used

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.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.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
 
 /**
  * Binding factory that treats the expression as a literal string. The simplest form of binding.
  *
- * @see org.apache.tapestry.internal.bindings.LiteralBinding
+ * @see org.apache.tapestry5.internal.bindings.LiteralBinding
  */
 public class LiteralBindingFactory implements BindingFactory
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
 
 /**
  * Implementation of the message: binding prefix -- we simply get the message key and store it inside at {@link

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.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.NullFieldStrategy;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.NullFieldStrategySource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.NullFieldStrategySource;
 
 /**
- * Treats the expression as the name of a {@link org.apache.tapestry.NullFieldStrategy}, accessed via the {@link
- * org.apache.tapestry.services.NullFieldStrategySource} service.
+ * Treats the expression as the name of a {@link org.apache.tapestry5.NullFieldStrategy}, accessed via the {@link
+ * org.apache.tapestry5.services.NullFieldStrategySource} service.
  */
 public class NullFieldStrategyBindingFactory implements BindingFactory
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
 
 import java.lang.annotation.Annotation;
 
 /**
- * Base class for bindings created by the {@link org.apache.tapestry.internal.bindings.PropBindingFactory}. A subclass
+ * Base class for bindings created by the {@link org.apache.tapestry5.internal.bindings.PropBindingFactory}. A subclass
  * of this is created at runtime.
  */
 public class PropBinding extends AbstractBinding
@@ -98,4 +98,4 @@
         return conduit.getAnnotation(annotationClass);
     }
 
-}
\ No newline at end of file
+}

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.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.bindings;
+package org.apache.tapestry5.internal.bindings;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.PropertyConduitSource;
 
 /**
  * Binding factory for reading and updating JavaBean properties.

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

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.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.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.ioc.Location;
-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.ioc.Location;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.TranslatorSource;
 
 /**
  * Interprets the binding expression as the name of a {@link Translator} provided by the {@link TranslatorSource}.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.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.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.services.BindingFactory;
-import org.apache.tapestry.services.FieldValidatorSource;
+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.services.BindingFactory;
+import org.apache.tapestry5.services.FieldValidatorSource;
 
 /**
  * Factory for bindings that provide a {@link FieldValidator} based on a validator specification. This binding factory

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.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.event;
+package org.apache.tapestry5.internal.event;
 
-import org.apache.tapestry.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.events.InvalidationListener;
 
 /**
- * An object which manages a list of {@link org.apache.tapestry.internal.events.InvalidationListener}s.
+ * An object which manages a list of {@link org.apache.tapestry5.internal.events.InvalidationListener}s.
  * <p/>
  * TODO: This interface need to move to the public side (as it is extended by other public interfaces), or we need to
  * come up with an alternate mechanism for propogating invalidation data.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.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.event;
+package org.apache.tapestry5.internal.event;
 
-import org.apache.tapestry.internal.events.InvalidationListener;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newThreadSafeList;
 
 import java.util.List;
 
 /**
  * Base implementation class for classes (especially services) that need to manage a list of {@link
- * org.apache.tapestry.internal.events.InvalidationListener}s.
+ * org.apache.tapestry5.internal.events.InvalidationListener}s.
  */
 public class InvalidationEventHubImpl implements InvalidationEventHub
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.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.events;
+package org.apache.tapestry5.internal.events;
 
 /**
  * Interface for objects that may cache information that can be invalidated. Invalidation occurs when external files,

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.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.events;
+package org.apache.tapestry5.internal.events;
 
 /**
  * Interface for objects which can periodically check for updates.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.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.grid;
+package org.apache.tapestry5.internal.grid;
 
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.grid.ColumnSort;
-import org.apache.tapestry.grid.GridDataSource;
-import org.apache.tapestry.grid.SortConstraint;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.grid.ColumnSort;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.grid.SortConstraint;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.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.grid;
+package org.apache.tapestry5.internal.grid;
 
-import org.apache.tapestry.grid.GridDataSource;
-import org.apache.tapestry.grid.SortConstraint;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.grid.SortConstraint;
 
 import java.util.List;
 
 /**
- * An implementation of {@link org.apache.tapestry.grid.GridDataSource} used when the value null is provided as the
+ * An implementation of {@link org.apache.tapestry5.grid.GridDataSource} used when the value null is provided as the
  * source.
  */
 public class NullDataSource implements GridDataSource

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.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.model;
+package org.apache.tapestry5.internal.model;
 
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
 
 class ModelMessages
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.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.model;
+package org.apache.tapestry5.internal.model;
 
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.*;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.*;
 import org.slf4j.Logger;
 
 import java.util.Collections;
@@ -28,7 +28,7 @@
 import java.util.Map;
 
 /**
- * Internal implementation of {@link org.apache.tapestry.model.MutableComponentModel}.
+ * Internal implementation of {@link org.apache.tapestry5.model.MutableComponentModel}.
  */
 public final class MutableComponentModelImpl implements MutableComponentModel
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.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.model;
+package org.apache.tapestry5.internal.model;
 
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.MutableEmbeddedComponentModel;
+import org.apache.tapestry5.ioc.BaseLocatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
 
 import java.util.Collections;
 import java.util.List;

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Stores an attribute/value pair (as part of an XML element).

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * A block, used to enclose a chunk of template (including components) and control when or if the content is rendered.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Placeholder for a component's body (within the component's template).

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Literal text that was enclosed within a !CDATA in the input template (so we should do the same during output).

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * A node representing a comment embedded in the source input.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Resource;
 
 import java.util.List;
 import java.util.Set;
@@ -40,8 +40,8 @@
     List<TemplateToken> getTokens();
 
     /**
-     * Returns a set of strings corresponding to {@link org.apache.tapestry.internal.parser.StartComponentToken}s within
-     * the template that have a non-blank id attribute.
+     * Returns a set of strings corresponding to {@link org.apache.tapestry5.internal.parser.StartComponentToken}s
+     * within the template that have a non-blank id attribute.
      */
     Set<String> getComponentIds();
 }

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry5.ioc.Resource;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
 
 import java.util.List;
 import java.util.Set;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Represents the presence of a Document Type declaration within a template. The Document type declaration will be

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * A token from a template that defines a namespace prefix. This will always follow a {@link
- * org.apache.tapestry.internal.parser.StartComponentToken} or {@link org.apache.tapestry.internal.parser.StartElementToken}
- * (and come before {@link org.apache.tapestry.internal.parser.AttributeToken}) and applies to the component or
+ * org.apache.tapestry5.internal.parser.StartComponentToken} or {@link org.apache.tapestry5.internal.parser.StartElementToken}
+ * (and come before {@link org.apache.tapestry5.internal.parser.AttributeToken}) and applies to the component or
  * element.
  *
- * @see org.apache.tapestry.dom.Element#defineNamespace(String, String)
+ * @see org.apache.tapestry5.dom.Element#defineNamespace(String, String)
  */
 public class DefineNamespacePrefixToken extends TemplateToken
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Ends a previously started element (including components, parameters, blocks, etc.).

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * A token containing an expression expansion from the template. Expression expansions look like Ant variables, i.e.,

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * A parameter block to be passed to a component as a parameter.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * The start element of a component within the template. Will be followed by a series of {@link
- * org.apache.tapestry.internal.parser.AttributeToken}s for any attributes (outside of id and type), and eventually will
- * be balanced by an {@link org.apache.tapestry.internal.parser.EndElementToken}.
+ * org.apache.tapestry5.internal.parser.AttributeToken}s for any attributes (outside of id and type), and eventually
+ * will be balanced by an {@link org.apache.tapestry5.internal.parser.EndElementToken}.
  */
 public class StartComponentToken extends TemplateToken
 {

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
 
 /**
- * The start of an ordinary element within the template (as opposed to {@link org.apache.tapestry.internal.parser.StartComponentToken},
+ * The start of an ordinary element within the template (as opposed to {@link org.apache.tapestry5.internal.parser.StartComponentToken},
  * which represents an active Tapestry token. A start element token may be immediately followed by {@link
- * org.apache.tapestry.internal.parser.AttributeToken}s that represents the attributes associated with the element. A
- * start element token will always be balanced by a {@link org.apache.tapestry.internal.parser.EndElementToken} (though
+ * org.apache.tapestry5.internal.parser.AttributeToken}s that represents the attributes associated with the element. A
+ * start element token will always be balanced by a {@link org.apache.tapestry5.internal.parser.EndElementToken} (though
  * there will likely be some amount of intermediate tokens).
  */
 public class StartElementToken extends TemplateToken

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.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.parser;
+package org.apache.tapestry5.internal.parser;
 
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.BaseLocatable;
+import org.apache.tapestry5.ioc.Location;
 
 /**
  * Base class for tokens parsed out of a template. The set of classes rooted here are effectively object encapsulations

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.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.parser;
+package org.apache.tapestry5.internal.parser;
 
 /**
- * Defines the different types of {@link org.apache.tapestry.internal.parser.TemplateToken}s. Each value maps to a
+ * Defines the different types of {@link org.apache.tapestry5.internal.parser.TemplateToken}s. Each value maps to a
  * particular subclass of TemplateToken.
  */
 public enum TokenType

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.services.ObjectRenderer;
 
 /**
  * Renders {@link ComponentResources} instance, showing the complete id and the class name and the location (if a

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.services.ObjectRenderer;
 
 /**
  * Renders out the values stored inside a {@link EventContext}.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.services.ObjectRenderer;
 
 import java.util.List;
 

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.Element;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.Element;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.ObjectRenderer;
 
 import java.io.*;
 import java.util.Set;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.services.ObjectRenderer;
 
 import java.util.Arrays;
 import java.util.List;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.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.renderers;
+package org.apache.tapestry5.internal.renderers;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.services.ObjectRenderer;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.services.ObjectRenderer;
+import org.apache.tapestry5.services.Request;
 
 import java.util.List;
 

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

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.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.model.ComponentModel;
+import org.apache.tapestry5.model.ComponentModel;
 
 /**
  * Abstract base class for instantiators; for each component, a new subclass is created at runtime.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.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 static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.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.EventConstants;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
 
 /**
  * It represents an invocation target for an action link.

Modified: tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java?rev=658390&r1=658389&r2=658390&view=diff
==============================================================================
--- tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java (original)
+++ tapestry/tapestry5/branches/hlship-20080520/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.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.structure.Page;
+import org.apache.tapestry5.internal.structure.Page;
 
 import java.io.IOException;